r24531 by jghali - #16489: Unify margins and spacing for properties palette, set 1 <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Sat Feb 27 21:44:16 UTC 2021
Author: jghali
Date: Sat Feb 27 21:44:16 2021
New Revision: 24531
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24531
Log:
#16489: Unify margins and spacing for properties palette, set 1 <bubu>
Modified:
trunk/Scribus/scribus/ui/colorpalette.ui
trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui
trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui
trunk/Scribus/scribus/ui/propertiespalette_xyzbase.ui
trunk/Scribus/scribus/ui/transparencypalette.ui
Modified: trunk/Scribus/scribus/ui/colorpalette.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24531&path=/trunk/Scribus/scribus/ui/colorpalette.ui
==============================================================================
--- trunk/Scribus/scribus/ui/colorpalette.ui (original)
+++ trunk/Scribus/scribus/ui/colorpalette.ui Sat Feb 27 21:44:16 2021
@@ -14,17 +14,20 @@
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<property name="leftMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<widget class="QTabWidget" name="tabFillStroke">
@@ -37,22 +40,25 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>2</number>
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="fillModeLabel">
<property name="text">
@@ -80,7 +86,7 @@
<widget class="QWidget" name="solidFillPage">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
@@ -99,6 +105,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="fillShadeLabel">
<property name="text">
@@ -126,7 +135,7 @@
<widget class="QWidget" name="gradientFillPage">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
@@ -142,6 +151,9 @@
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QComboBox" name="gradientType">
<item>
@@ -200,6 +212,21 @@
</property>
<widget class="QWidget" name="page_3">
<layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <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="QComboBox" name="namedGradient"/>
</item>
@@ -221,6 +248,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="gradientExtendLabel">
<property name="text">
@@ -248,6 +278,9 @@
</widget>
<widget class="QWidget" name="page_4">
<layout class="QVBoxLayout" name="verticalLayout_8">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -262,6 +295,9 @@
</property>
<item>
<layout class="QGridLayout" name="gridLayout_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="colorPointLabel">
<property name="text">
@@ -482,8 +518,26 @@
</widget>
<widget class="QWidget" name="page_5">
<layout class="QVBoxLayout" name="verticalLayout_9">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <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" name="gridLayout_5">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="colorMeshPointLabel">
<property name="text">
@@ -563,6 +617,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QToolButton" name="editMeshColors">
<property name="text">
@@ -609,8 +666,26 @@
</widget>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_12">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <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" name="gridLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="hatchDistLabel">
<property name="text">
@@ -704,7 +779,7 @@
<widget class="QWidget" name="patternFillPage">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
@@ -743,7 +818,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<widget class="QToolButton" name="editPatternProps">
@@ -779,22 +854,25 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_11">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>2</number>
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="strokeModeLabel">
<property name="text">
@@ -822,7 +900,7 @@
<widget class="QWidget" name="solidStrokePage">
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
@@ -841,6 +919,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="strokeShadeLabel">
<property name="text">
@@ -867,8 +948,26 @@
</widget>
<widget class="QWidget" name="gradientStrokePage">
<layout class="QVBoxLayout" name="verticalLayout_10">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <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="QHBoxLayout" name="horizontalLayout_9">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QComboBox" name="gradientTypeStroke">
<item>
@@ -916,6 +1015,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="GradientExtendSLabel">
<property name="text">
@@ -944,7 +1046,7 @@
<widget class="QWidget" name="patternStrokePage">
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
@@ -983,7 +1085,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="spacing">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<widget class="QToolButton" name="editPatternPropsStroke">
@@ -1027,6 +1129,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="overPrintLabel">
<property name="text">
Modified: trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24531&path=/trunk/Scribus/scribus/ui/propertiespalette_linebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_linebase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_linebase.ui Sat Feb 27 21:44:16 2021
@@ -14,6 +14,21 @@
<string notr="true">Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="lineModeLabel">
<property name="text">
Modified: trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24531&path=/trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shadowbase.ui Sat Feb 27 21:44:16 2021
@@ -14,6 +14,21 @@
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QCheckBox" name="hasSoftShadow">
<property name="text">
@@ -23,6 +38,9 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
Modified: trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24531&path=/trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui Sat Feb 27 21:44:16 2021
@@ -15,22 +15,25 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>2</number>
+ <number>3</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
@@ -40,6 +43,9 @@
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QToolButton" name="textFlowDisabled">
<property name="sizePolicy">
@@ -227,6 +233,9 @@
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="Autoforms" name="customShape">
<property name="toolTip">
@@ -304,6 +313,9 @@
</item>
<item row="5" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QToolButton" name="evenOdd">
<property name="toolTip">
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyzbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24531&path=/trunk/Scribus/scribus/ui/propertiespalette_xyzbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyzbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyzbase.ui Sat Feb 27 21:44:16 2021
@@ -15,19 +15,19 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
- <number>5</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>0</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>0</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>0</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>0</number>
+ <number>3</number>
</property>
<item>
<widget class="QGroupBox" name="nameGroup">
@@ -42,19 +42,19 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>2</number>
+ <number>6</number>
</property>
<property name="topMargin">
- <number>2</number>
+ <number>6</number>
</property>
<property name="rightMargin">
- <number>2</number>
+ <number>6</number>
</property>
<property name="bottomMargin">
- <number>2</number>
+ <number>6</number>
</property>
<item>
<widget class="NameWidget" name="nameEdit">
@@ -81,34 +81,37 @@
<string>Geometry</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<property name="leftMargin">
- <number>2</number>
+ <number>6</number>
</property>
<property name="topMargin">
- <number>2</number>
+ <number>6</number>
</property>
<property name="rightMargin">
- <number>2</number>
+ <number>6</number>
</property>
<property name="bottomMargin">
- <number>2</number>
+ <number>6</number>
</property>
<item>
<layout class="QGridLayout" name="geoGroupLayout">
<property name="leftMargin">
- <number>5</number>
+ <number>0</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>0</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>0</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>0</number>
</property>
<property name="spacing">
- <number>4</number>
+ <number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="xposLabel">
@@ -243,6 +246,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QGroupBox" name="levelGroup">
<property name="title">
@@ -250,19 +256,19 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
- <number>5</number>
+ <number>6</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>6</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>6</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>6</number>
</property>
<property name="spacing">
- <number>4</number>
+ <number>3</number>
</property>
<item row="0" column="0">
<widget class="QToolButton" name="levelUp">
@@ -356,6 +362,9 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QToolButton" name="doGroup">
<property name="toolTip">
Modified: trunk/Scribus/scribus/ui/transparencypalette.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24531&path=/trunk/Scribus/scribus/ui/transparencypalette.ui
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.ui (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.ui Sat Feb 27 21:44:16 2021
@@ -15,13 +15,25 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
- <property name="margin">
- <number>2</number>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QToolButton" name="editLineSelector">
<property name="toolTip">
@@ -77,13 +89,25 @@
<widget class="QWidget" name="pageS">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>5</number>
+ <number>3</number>
+ </property>
+ <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" name="gridLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
@@ -220,6 +244,21 @@
</widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <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="QTabWidget" name="tabWidget">
<property name="currentIndex">
@@ -231,13 +270,25 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>5</number>
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
@@ -287,13 +338,25 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>5</number>
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QComboBox" name="gradientType">
<item>
@@ -362,6 +425,21 @@
<string>Pattern</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QListWidget" name="patternBox">
<property name="movement">
@@ -387,7 +465,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<widget class="QToolButton" name="editPatternProps">
@@ -431,6 +509,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
More information about the scribus-commit
mailing list