r24524 by jghali - #16486: Unify margins and spacing for dialogs, set 12 <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Tue Feb 23 22:33:11 UTC 2021
Author: jghali
Date: Tue Feb 23 22:33:11 2021
New Revision: 24524
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24524
Log:
#16486: Unify margins and spacing for dialogs, set 12 <bubu>
Modified:
trunk/Scribus/scribus/ui/colorsandfillsbase.ui
trunk/Scribus/scribus/ui/prefs_externaltoolsbase.ui
trunk/Scribus/scribus/ui/smcstylewidget.ui
trunk/Scribus/scribus/ui/smlinestylewidget.ui
trunk/Scribus/scribus/ui/smpstylewidget.ui
trunk/Scribus/scribus/ui/smstyleimport.ui
trunk/Scribus/scribus/ui/stylemanager.ui
Modified: trunk/Scribus/scribus/ui/colorsandfillsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/colorsandfillsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfillsbase.ui (original)
+++ trunk/Scribus/scribus/ui/colorsandfillsbase.ui Tue Feb 23 22:33:11 2021
@@ -11,9 +11,9 @@
</rect>
</property>
<property name="windowTitle">
- <string>Colors and Fills</string>
- </property>
- <property name="sizeGripEnabled">
+ <string>Colors and Fills</string>
+ </property>
+ <property name="sizeGripEnabled">
<bool>false</bool>
</property>
<property name="modal">
@@ -39,9 +39,9 @@
</property>
<attribute name="headerVisible">
<bool>false</bool>
- </attribute>
- <column>
- <property name="text">
+ </attribute>
+ <column>
+ <property name="text">
<string>1</string>
</property>
</column>
@@ -112,9 +112,9 @@
</property>
<property name="text">
<string>&Remove Unused</string>
- </property>
- </widget>
- </item>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
@@ -127,9 +127,9 @@
<string>Current Color Set:</string>
</property>
</widget>
- </item>
- <item>
- <widget class="SwatchCombo" name="LoadColSet">
+ </item>
+ <item>
+ <widget class="SwatchCombo" name="LoadColSet">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -169,15 +169,12 @@
</size>
</property>
</spacer>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <property name="spacing">
- <number>5</number>
- </property>
- <item>
- <widget class="QPushButton" name="okButton">
- <property name="toolTip">
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QPushButton" name="okButton">
+ <property name="toolTip">
<string>Make the current colorset the default color set</string>
</property>
<property name="text">
Modified: trunk/Scribus/scribus/ui/prefs_externaltoolsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/prefs_externaltoolsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_externaltoolsbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_externaltoolsbase.ui Tue Feb 23 22:33:11 2021
@@ -541,9 +541,6 @@
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>6</number>
- </property>
<item>
<widget class="QPushButton" name="latexConfigUpButton">
<property name="text">
Modified: trunk/Scribus/scribus/ui/smcstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/smcstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.ui Tue Feb 23 22:33:11 2021
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>402</width>
- <height>624</height>
+ <height>563</height>
</rect>
</property>
<property name="sizePolicy">
@@ -77,21 +77,6 @@
<string>Basic Formatting</string>
</property>
<layout class="QVBoxLayout" name="_4">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<widget class="SMFontComboH" name="fontFace_" native="true">
<property name="sizePolicy">
@@ -103,7 +88,7 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>62</height>
+ <height>20</height>
</size>
</property>
</widget>
@@ -249,8 +234,8 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>40</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
@@ -282,21 +267,6 @@
<string>Advanced Formatting</string>
</property>
<layout class="QVBoxLayout" name="_7">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<layout class="QHBoxLayout" name="_8">
<item>
@@ -564,21 +534,6 @@
<string>Colors</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<layout class="QHBoxLayout" name="_2">
<item>
Modified: trunk/Scribus/scribus/ui/smlinestylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/smlinestylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.ui Tue Feb 23 22:33:11 2021
@@ -8,24 +8,24 @@
<y>0</y>
<width>469</width>
<height>298</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="margin">
- <number>5</number>
- </property>
- <item>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
<widget class="QPushButton" name="addButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -92,16 +92,22 @@
</spacer>
</item>
</layout>
- </item>
- <item>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
<widget class="QListWidget" name="lineStyles">
<property name="maximumSize">
<size>
@@ -110,25 +116,37 @@
</size>
</property>
</widget>
- </item>
- <item>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <layout class="QGridLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- <item row="1" column="0">
- <widget class="QComboBox" name="endCombo">
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <layout class="QGridLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="1" column="0">
+ <widget class="QComboBox" name="endCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -151,17 +169,23 @@
<widget class="LineCombo" name="dashCombo"/>
</item>
</layout>
- </item>
- <item>
- <layout class="QGridLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- <item row="1" column="1">
- <widget class="QSpinBox" name="shadeBox">
+ </item>
+ <item>
+ <layout class="QGridLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="shadeBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -266,18 +290,18 @@
</property>
</spacer>
</item>
- </layout>
- </item>
- </layout>
+ </layout>
+ </item>
+ </layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LineCombo</class>
- <extends>QComboBox</extends>
- <header>ui/linecombo.h</header>
- </customwidget>
+ <extends>QComboBox</extends>
+ <header>ui/linecombo.h</header>
+ </customwidget>
<customwidget>
<class>ColorCombo</class>
<extends>QComboBox</extends>
Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Tue Feb 23 22:33:11 2021
@@ -23,9 +23,6 @@
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
<item>
<widget class="QLabel" name="parentLabel">
<property name="text">
@@ -66,7 +63,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="SMAlignSelect" name="alignment" native="true">
<property name="sizePolicy">
@@ -81,7 +78,7 @@
<widget class="SMDirectionSelect" name="direction" native="true"/>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -96,7 +93,7 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="lineSpacingLabel">
<property name="minimumSize">
@@ -146,7 +143,7 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -195,7 +192,7 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -240,7 +237,7 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -619,7 +616,7 @@
</property>
<layout class="QVBoxLayout">
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" name="tabsBoxLayout">
<item>
<widget class="SMTabruler" name="tabList" native="true">
<property name="sizePolicy">
@@ -631,7 +628,7 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -654,23 +651,8 @@
<string>Colors</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
- <layout class="QHBoxLayout" name="_6">
+ <layout class="QHBoxLayout" name="smColorGroupLayout">
<item>
<widget class="QLabel" name="backIcon">
<property name="minimumSize">
@@ -727,7 +709,7 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -1071,7 +1053,7 @@
</property>
<layout class="QVBoxLayout" name="_2">
<item>
- <layout class="QHBoxLayout" name="_3">
+ <layout class="QHBoxLayout" name="dropCapsBoxLayout">
<item>
<widget class="QLabel" name="dropCapsLineLabel">
<property name="text">
@@ -1178,7 +1160,7 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -1252,9 +1234,6 @@
<string>Character Style</string>
</attribute>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
<property name="leftMargin">
<number>0</number>
</property>
Modified: trunk/Scribus/scribus/ui/smstyleimport.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/smstyleimport.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smstyleimport.ui (original)
+++ trunk/Scribus/scribus/ui/smstyleimport.ui Tue Feb 23 22:33:11 2021
@@ -1,75 +1,88 @@
-<ui version="4.0" >
- <class>SMStyleImport</class>
- <widget class="QDialog" name="SMStyleImport" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SMStyleImport</class>
+ <widget class="QDialog" name="SMStyleImport">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
<width>304</width>
- <height>444</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Choose Styles</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <item>
- <widget class="QTreeWidget" name="styleWidget" >
- <property name="selectionMode" >
- <enum>QAbstractItemView::NoSelection</enum>
- </property>
- <property name="selectionBehavior" >
- <enum>QAbstractItemView::SelectItems</enum>
- </property>
- <column>
- <property name="text" >
- <string>Available Styles</string>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="importAllCheckBox" >
- <property name="text" >
- <string>Select or Unselect All</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
- <string>In case of a name clash</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="renameButton" >
- <property name="text" >
- <string>&Rename Imported Style</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QRadioButton" name="replaceButton" >
- <property name="text" >
- <string>R&eplace Existing Style</string>
- </property>
- </widget>
+ <height>444</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Choose Styles</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <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>
+ <widget class="QTreeWidget" name="styleWidget">
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectItems</enum>
+ </property>
+ <column>
+ <property name="text">
+ <string>Available Styles</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="importAllCheckBox">
+ <property name="text">
+ <string>Select or Unselect All</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>In case of a name clash</string>
+ </property>
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="renameButton">
+ <property name="text">
+ <string>&Rename Imported Style</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="replaceButton">
+ <property name="text">
+ <string>R&eplace Existing Style</string>
+ </property>
+ </widget>
</item>
</layout>
- </widget>
- </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>
+ </widget>
+ </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>
@@ -78,33 +91,33 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>SMStyleImport</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>252</x>
- <y>419</y>
- </hint>
- <hint type="destinationlabel" >
- <x>157</x>
- <y>274</y>
- </hint>
+ <receiver>SMStyleImport</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>252</x>
+ <y>419</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>SMStyleImport</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>299</x>
- <y>419</y>
- </hint>
- <hint type="destinationlabel" >
- <x>286</x>
- <y>274</y>
- </hint>
+ <receiver>SMStyleImport</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>299</x>
+ <y>419</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
</hints>
</connection>
</connections>
Modified: trunk/Scribus/scribus/ui/stylemanager.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24524&path=/trunk/Scribus/scribus/ui/stylemanager.ui
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.ui (original)
+++ trunk/Scribus/scribus/ui/stylemanager.ui Tue Feb 23 22:33:11 2021
@@ -359,9 +359,6 @@
</item>
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -446,7 +443,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>StyleView</class>
More information about the scribus-commit
mailing list