r24389 by jghali - #16419: Unify margin and spacing for Replace Colors dialog <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Sat Jan 9 13:57:29 UTC 2021
Author: jghali
Date: Sat Jan 9 13:57:28 2021
New Revision: 24389
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24389
Log:
#16419: Unify margin and spacing for Replace Colors dialog <bubu>
Modified:
trunk/Scribus/scribus/ui/replacecolors.ui
trunk/Scribus/scribus/ui/replaceonecolor.ui
Modified: trunk/Scribus/scribus/ui/replacecolors.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24389&path=/trunk/Scribus/scribus/ui/replacecolors.ui
==============================================================================
--- trunk/Scribus/scribus/ui/replacecolors.ui (original)
+++ trunk/Scribus/scribus/ui/replacecolors.ui Sat Jan 9 13:57:28 2021
@@ -1,106 +1,119 @@
-<ui version="4.0" >
- <class>replaceColorsDialog</class>
- <widget class="QDialog" name="replaceColorsDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>replaceColorsDialog</class>
+ <widget class="QDialog" name="replaceColorsDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
<width>500</width>
- <height>400</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Replace Colors</string>
- </property>
- <property name="sizeGripEnabled" >
- <bool>true</bool>
- </property>
- <property name="modal" >
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QTableWidget" name="replacementTable" >
- <property name="minimumSize" >
- <size>
- <width>150</width>
- <height>150</height>
- </size>
- </property>
- <property name="selectionBehavior" >
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <property name="columnCount" >
- <number>2</number>
- </property>
+ <height>400</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Replace Colors</string>
+ </property>
+ <property name="sizeGripEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="modal">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QTableWidget" name="replacementTable">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>150</height>
+ </size>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
+ </property>
+ <column/>
<column/>
- <column/>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QPushButton" name="addButton" >
- <property name="text" >
- <string>Add ...</string>
- </property>
- <property name="autoDefault" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="removeButton" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Remove</string>
- </property>
- <property name="autoDefault" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="editButton" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Edit...</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>75</width>
- <height>41</height>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QPushButton" name="addButton">
+ <property name="text">
+ <string>Add ...</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="removeButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="editButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Edit...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>75</width>
+ <height>41</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- </layout>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
@@ -108,33 +121,33 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>replaceColorsDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>248</x>
- <y>254</y>
- </hint>
- <hint type="destinationlabel" >
- <x>157</x>
- <y>274</y>
- </hint>
+ <receiver>replaceColorsDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>replaceColorsDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>316</x>
- <y>260</y>
- </hint>
- <hint type="destinationlabel" >
- <x>286</x>
- <y>274</y>
- </hint>
+ <receiver>replaceColorsDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
</hints>
</connection>
</connections>
Modified: trunk/Scribus/scribus/ui/replaceonecolor.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24389&path=/trunk/Scribus/scribus/ui/replaceonecolor.ui
==============================================================================
--- trunk/Scribus/scribus/ui/replaceonecolor.ui (original)
+++ trunk/Scribus/scribus/ui/replaceonecolor.ui Sat Jan 9 13:57:28 2021
@@ -1,91 +1,83 @@
-<ui version="4.0" >
- <class>replaceColorDialog</class>
- <widget class="QDialog" name="replaceColorDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>500</width>
- <height>106</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Replace Color</string>
- </property>
- <property name="sizeGripEnabled" >
- <bool>true</bool>
- </property>
- <property name="modal" >
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>5</number>
- </property>
- <property name="leftMargin" >
- <number>10</number>
- </property>
- <property name="topMargin" >
- <number>10</number>
- </property>
- <property name="rightMargin" >
- <number>10</number>
- </property>
- <property name="bottomMargin" >
- <number>10</number>
- </property>
- <item>
- <layout class="QGridLayout" >
- <property name="horizontalSpacing" >
- <number>5</number>
- </property>
- <property name="verticalSpacing" >
- <number>5</number>
- </property>
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Replace:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="ColorCombo" name="originalColor" />
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>with:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="ColorCombo" name="replacementColor" />
- </item>
- </layout>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>replaceColorDialog</class>
+ <widget class="QDialog" name="replaceColorDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>500</width>
+ <height>107</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Replace Color</string>
+ </property>
+ <property name="sizeGripEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="modal">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Replace:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ColorCombo" name="originalColor"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>with:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ColorCombo" name="replacementColor"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
@@ -100,33 +92,33 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>replaceColorDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>248</x>
- <y>254</y>
- </hint>
- <hint type="destinationlabel" >
- <x>157</x>
- <y>274</y>
- </hint>
+ <receiver>replaceColorDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>replaceColorDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>316</x>
- <y>260</y>
- </hint>
- <hint type="destinationlabel" >
- <x>286</x>
- <y>274</y>
- </hint>
+ <receiver>replaceColorDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
</hints>
</connection>
</connections>
More information about the scribus-commit
mailing list