0016466: Remove Qt 3/4 layoutdefault tags from .ui files

ID	Project	Category	View Status	Date Submitted	Last Update

0016466	Scribus	User Interface	public	2021-02-08 22:52	2024-11-26 21:48

Reporter	bubu	Assigned To
Priority	normal	Severity	minor	Reproducibility	always
Status	new	Resolution	open
Product Version	1.5.7.svn

Summary	0016466: Remove Qt 3/4 layoutdefault tags from .ui files
Description	In some .ui files there are declared layoutdefault tags. I find Qt 3/4 style layoutdefault tags rather confusing than useful. I suggest to remove them all. See the attached patch. In some files already I removed them one by one, but it is better to remove them at once.
Tags	No tags attached.

Patch

bubu 2021-02-09 05:54 reporter	0001-Remove-Qt-3-4-layoutdefault-from-.ui-files.patch (40,990 bytes) From 24c81cac0a2c07ebd39a65574439d24175a05cde Mon Sep 17 00:00:00 2001 Message-Id: <24c81cac0a2c07ebd39a65574439d24175a05cde.1612824125.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Mon, 8 Feb 2021 23:41:50 +0100 Subject: [PATCH] Remove Qt 3/4 layoutdefault from .ui files --- .../barcodegenerator/barcodegenerator.ui \| 1 - scribus/plugins/colorwheel/cwdialog.ui \| 1 - .../tools/pathfinder/pathfinderbase.ui \| 93 +- scribus/ui/arcvectorbase.ui \| 1 - scribus/ui/createrange.ui \| 1 - scribus/ui/gradientvectorbase.ui \| 939 +++++++++--------- scribus/ui/multipleduplicate.ui \| 1 - scribus/ui/multiprogressdialog.ui \| 1 - scribus/ui/smreplacedia.ui \| 1 - scribus/ui/spiralvectorbase.ui \| 1 - scribus/ui/stylemanager.ui \| 1 - scribus/ui/transformdialogbase.ui \| 1 - 12 files changed, 515 insertions(+), 527 deletions(-) diff --git a/scribus/plugins/barcodegenerator/barcodegenerator.ui b/scribus/plugins/barcodegenerator/barcodegenerator.ui index da590ab13..e1e0d214f 100644 --- a/scribus/plugins/barcodegenerator/barcodegenerator.ui +++ b/scribus/plugins/barcodegenerator/barcodegenerator.ui @@ -456,7 +456,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>bgColorButton</tabstop> <tabstop>lnColorButton</tabstop> diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui index b1962d9d5..6fcedbfcc 100644 --- a/scribus/plugins/colorwheel/cwdialog.ui +++ b/scribus/plugins/colorwheel/cwdialog.ui @@ -1240,7 +1240,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ColorWheel</class> diff --git a/scribus/plugins/tools/pathfinder/pathfinderbase.ui b/scribus/plugins/tools/pathfinder/pathfinderbase.ui index 307422c19..ff391bc7a 100644 --- a/scribus/plugins/tools/pathfinder/pathfinderbase.ui +++ b/scribus/plugins/tools/pathfinder/pathfinderbase.ui @@ -11,28 +11,28 @@ </rect> </property> <property name="windowTitle"> - <string>Boolean Path Operations</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <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> - <layout class="QVBoxLayout"> - <item> - <widget class="QLabel" name="sourceShape"> - <property name="minimumSize"> + <string>Boolean Path Operations</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <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> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="sourceShape"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -85,12 +85,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <spacer> - <property name="orientation"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <spacer> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> @@ -132,12 +132,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <widget class="QLabel" name="sourceShape2"> - <property name="minimumSize"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="sourceShape2"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -190,12 +190,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <spacer> - <property name="orientation"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <spacer> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> @@ -295,12 +295,12 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string>Operation</string> - </property> - <layout class="QHBoxLayout"> - <item> - <widget class="QToolButton" name="opCombine"> - <property name="toolTip"> + <string>Operation</string> + </property> + <layout class="QHBoxLayout"> + <item> + <widget class="QToolButton" name="opCombine"> + <property name="toolTip"> <string>Unites the shapes</string> </property> <property name="text"> @@ -542,7 +542,6 @@ The result is a combination of "Intersection" and "Exclusion&quot </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ColorCombo</class> diff --git a/scribus/ui/arcvectorbase.ui b/scribus/ui/arcvectorbase.ui index e264d90d4..5caa40fe2 100644 --- a/scribus/ui/arcvectorbase.ui +++ b/scribus/ui/arcvectorbase.ui @@ -136,7 +136,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/createrange.ui b/scribus/ui/createrange.ui index 6f30f7594..d931a49aa 100644 --- a/scribus/ui/createrange.ui +++ b/scribus/ui/createrange.ui @@ -434,7 +434,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/gradientvectorbase.ui b/scribus/ui/gradientvectorbase.ui index cc7689e52..c461aea87 100644 --- a/scribus/ui/gradientvectorbase.ui +++ b/scribus/ui/gradientvectorbase.ui @@ -6,64 +6,64 @@ <bool>true</bool> </property> <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>267</width> - <height>178</height> - </rect> - </property> - <property name="minimumSize"> + <rect> + <x>0</x> + <y>0</y> + <width>267</width> + <height>178</height> + </rect> + </property> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> <property name="windowTitle"> - <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> - <property name="currentIndex"> + <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> + <property name="currentIndex"> <number>0</number> - </property> - <widget class="QWidget" name="pageLinear"> - <layout class="QGridLayout" name="gridLayout_3"> - <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="0" column="3"> - <widget class="ScrSpinBox" name="gY1"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> + </property> + <widget class="QWidget" name="pageLinear"> + <layout class="QGridLayout" name="gridLayout_3"> + <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="0" column="3"> + <widget class="ScrSpinBox" name="gY1"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="ScrSpinBox" name="gX1"> <property name="minimum"> @@ -71,33 +71,33 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gX2"> <property name="minimum"> @@ -105,163 +105,163 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gSk"> - <property name="minimum"> - <double>-89.000000000000000</double> - </property> - <property name="maximum"> - <double>89.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageRadial"> - <layout class="QGridLayout" name="gridLayout"> - <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="4" column="1"> - <widget class="ScrSpinBox" name="gSc"> - <property name="minimum"> - <double>0.010000000000000</double> - </property> - <property name="maximum"> - <double>100.000000000000000</double> - </property> - <property name="value"> - <double>100.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="ScrSpinBox" name="gX2_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gSk"> + <property name="minimum"> + <double>-89.000000000000000</double> + </property> + <property name="maximum"> + <double>89.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageRadial"> + <layout class="QGridLayout" name="gridLayout"> + <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="4" column="1"> + <widget class="ScrSpinBox" name="gSc"> + <property name="minimum"> + <double>0.010000000000000</double> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="value"> + <double>100.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="ScrSpinBox" name="gX2_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gX1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gX1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Focal:</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Focal:</string> + </property> + </widget> + </item> <item row="1" column="2"> <widget class="QLabel" name="label_10"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2_2"> + <property name="minimum"> <double>-3000.000000000000000</double> </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gY1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gY1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gFX"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gFX"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gSk_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gSk_2"> + <property name="minimum"> <double>-89.000000000000000</double> </property> <property name="maximum"> @@ -273,124 +273,124 @@ <widget class="QLabel" name="label_13"> <property name="text"> <string>Scale:</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gFY"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <spacer name="verticalSpacer_5"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageFourColor"> - <layout class="QGridLayout" name="gridLayout_4"> - <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="2"> - <widget class="QLabel" name="label_17"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>3. Point:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gC2Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gFY"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageFourColor"> + <layout class="QGridLayout" name="gridLayout_4"> + <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="2"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>3. Point:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gC2Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_21"> - <property name="text"> - <string>4. Point:</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_18"> - <property name="text"> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string>4. Point:</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_18"> + <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gC3X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gC3X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gC2X"> <property name="minimum"> @@ -398,51 +398,51 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_19"> - <property name="text"> - <string>1. Point:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gC3Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_19"> + <property name="text"> + <string>1. Point:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gC3Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gC4X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gC4X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="ScrSpinBox" name="gC4Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="ScrSpinBox" name="gC4Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gC1X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gC1X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> </property> @@ -452,58 +452,58 @@ <widget class="QLabel" name="label_20"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gC1Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gC1Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>2. Point:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageDiamond"> - <layout class="QGridLayout" name="gridLayout_2"> - <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="0" column="0"> - <widget class="QLabel" name="label_23"> - <property name="text"> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>2. Point:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageDiamond"> + <layout class="QGridLayout" name="gridLayout_2"> + <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="0" column="0"> + <widget class="QLabel" name="label_23"> + <property name="text"> <string>1. Point:</string> </property> </widget> @@ -672,24 +672,24 @@ </widget> </item> </layout> - </widget> - <widget class="QWidget" name="pageMesh"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <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"> - <item> + </widget> + <widget class="QWidget" name="pageMesh"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <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"> + <item> <layout class="QGridLayout" name="gridLayout_5"> <item row="0" column="0"> <widget class="QToolButton" name="editPoints"> @@ -849,33 +849,33 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> - </widget> - <widget class="QWidget" name="pagePatch"> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <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_3"> - <item> + </widget> + <widget class="QWidget" name="pagePatch"> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <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_3"> + <item> <layout class="QGridLayout" name="gridLayout_7"> <item row="0" column="0"> <widget class="QToolButton" name="editPPoint"> @@ -1040,13 +1040,13 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> </widget> @@ -1054,7 +1054,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/multipleduplicate.ui b/scribus/ui/multipleduplicate.ui index fce61038f..fb7ac9a1e 100644 --- a/scribus/ui/multipleduplicate.ui +++ b/scribus/ui/multipleduplicate.ui @@ -464,7 +464,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/multiprogressdialog.ui b/scribus/ui/multiprogressdialog.ui index 48b603072..08345f170 100644 --- a/scribus/ui/multiprogressdialog.ui +++ b/scribus/ui/multiprogressdialog.ui @@ -78,7 +78,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> <includes> <include location="local" >scribusapi.h</include> </includes> diff --git a/scribus/ui/smreplacedia.ui b/scribus/ui/smreplacedia.ui index 40230fb84..f8d34e32e 100644 --- a/scribus/ui/smreplacedia.ui +++ b/scribus/ui/smreplacedia.ui @@ -92,7 +92,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> <customwidgets> </customwidgets> <resources/> diff --git a/scribus/ui/spiralvectorbase.ui b/scribus/ui/spiralvectorbase.ui index dfde7766e..8bb88f798 100644 --- a/scribus/ui/spiralvectorbase.ui +++ b/scribus/ui/spiralvectorbase.ui @@ -113,7 +113,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/stylemanager.ui b/scribus/ui/stylemanager.ui index 1ad16b74f..8b78b3eb2 100644 --- a/scribus/ui/stylemanager.ui +++ b/scribus/ui/stylemanager.ui @@ -446,7 +446,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>StyleView</class> diff --git a/scribus/ui/transformdialogbase.ui b/scribus/ui/transformdialogbase.ui index 9c7337a11..2db4bc9cc 100644 --- a/scribus/ui/transformdialogbase.ui +++ b/scribus/ui/transformdialogbase.ui @@ -501,7 +501,6 @@ </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> -- 2.27.0 0001-Remove-Qt-3-4-layoutdefault-from-.ui-files.patch (40,990 bytes)

bubu 2021-02-16 22:18 reporter ~0048841	New patch after 0016472 is committed. 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files_2.patch (40,961 bytes) From 2cedcdae2bff8778376a9dd507737bc68e2743c7 Mon Sep 17 00:00:00 2001 Message-Id: <2cedcdae2bff8778376a9dd507737bc68e2743c7.1613513830.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Tue, 16 Feb 2021 23:13:36 +0100 Subject: [PATCH] Remove Qt 3/4 layoutdefault tags from .ui files --- .../barcodegenerator/barcodegenerator.ui \| 1 - scribus/plugins/colorwheel/cwdialog.ui \| 1 - .../tools/pathfinder/pathfinderbase.ui \| 93 +- scribus/ui/arcvectorbase.ui \| 37 +- scribus/ui/gradientvectorbase.ui \| 939 +++++++++--------- scribus/ui/multipleduplicate.ui \| 1 - scribus/ui/smreplacedia.ui \| 1 - scribus/ui/stylemanager.ui \| 1 - scribus/ui/transformdialogbase.ui \| 1 - 9 files changed, 533 insertions(+), 542 deletions(-) diff --git a/scribus/plugins/barcodegenerator/barcodegenerator.ui b/scribus/plugins/barcodegenerator/barcodegenerator.ui index da590ab13..e1e0d214f 100644 --- a/scribus/plugins/barcodegenerator/barcodegenerator.ui +++ b/scribus/plugins/barcodegenerator/barcodegenerator.ui @@ -456,7 +456,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>bgColorButton</tabstop> <tabstop>lnColorButton</tabstop> diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui index b1962d9d5..6fcedbfcc 100644 --- a/scribus/plugins/colorwheel/cwdialog.ui +++ b/scribus/plugins/colorwheel/cwdialog.ui @@ -1240,7 +1240,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ColorWheel</class> diff --git a/scribus/plugins/tools/pathfinder/pathfinderbase.ui b/scribus/plugins/tools/pathfinder/pathfinderbase.ui index 307422c19..ff391bc7a 100644 --- a/scribus/plugins/tools/pathfinder/pathfinderbase.ui +++ b/scribus/plugins/tools/pathfinder/pathfinderbase.ui @@ -11,28 +11,28 @@ </rect> </property> <property name="windowTitle"> - <string>Boolean Path Operations</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <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> - <layout class="QVBoxLayout"> - <item> - <widget class="QLabel" name="sourceShape"> - <property name="minimumSize"> + <string>Boolean Path Operations</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <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> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="sourceShape"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -85,12 +85,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <spacer> - <property name="orientation"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <spacer> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> @@ -132,12 +132,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <widget class="QLabel" name="sourceShape2"> - <property name="minimumSize"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="sourceShape2"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -190,12 +190,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <spacer> - <property name="orientation"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <spacer> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> @@ -295,12 +295,12 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string>Operation</string> - </property> - <layout class="QHBoxLayout"> - <item> - <widget class="QToolButton" name="opCombine"> - <property name="toolTip"> + <string>Operation</string> + </property> + <layout class="QHBoxLayout"> + <item> + <widget class="QToolButton" name="opCombine"> + <property name="toolTip"> <string>Unites the shapes</string> </property> <property name="text"> @@ -542,7 +542,6 @@ The result is a combination of "Intersection" and "Exclusion&quot </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ColorCombo</class> diff --git a/scribus/ui/arcvectorbase.ui b/scribus/ui/arcvectorbase.ui index 3a434aa27..995259e17 100644 --- a/scribus/ui/arcvectorbase.ui +++ b/scribus/ui/arcvectorbase.ui @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Arc</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Arc</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -148,7 +148,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/gradientvectorbase.ui b/scribus/ui/gradientvectorbase.ui index cc7689e52..c461aea87 100644 --- a/scribus/ui/gradientvectorbase.ui +++ b/scribus/ui/gradientvectorbase.ui @@ -6,64 +6,64 @@ <bool>true</bool> </property> <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>267</width> - <height>178</height> - </rect> - </property> - <property name="minimumSize"> + <rect> + <x>0</x> + <y>0</y> + <width>267</width> + <height>178</height> + </rect> + </property> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> <property name="windowTitle"> - <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> - <property name="currentIndex"> + <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> + <property name="currentIndex"> <number>0</number> - </property> - <widget class="QWidget" name="pageLinear"> - <layout class="QGridLayout" name="gridLayout_3"> - <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="0" column="3"> - <widget class="ScrSpinBox" name="gY1"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> + </property> + <widget class="QWidget" name="pageLinear"> + <layout class="QGridLayout" name="gridLayout_3"> + <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="0" column="3"> + <widget class="ScrSpinBox" name="gY1"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="ScrSpinBox" name="gX1"> <property name="minimum"> @@ -71,33 +71,33 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gX2"> <property name="minimum"> @@ -105,163 +105,163 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gSk"> - <property name="minimum"> - <double>-89.000000000000000</double> - </property> - <property name="maximum"> - <double>89.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageRadial"> - <layout class="QGridLayout" name="gridLayout"> - <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="4" column="1"> - <widget class="ScrSpinBox" name="gSc"> - <property name="minimum"> - <double>0.010000000000000</double> - </property> - <property name="maximum"> - <double>100.000000000000000</double> - </property> - <property name="value"> - <double>100.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="ScrSpinBox" name="gX2_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gSk"> + <property name="minimum"> + <double>-89.000000000000000</double> + </property> + <property name="maximum"> + <double>89.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageRadial"> + <layout class="QGridLayout" name="gridLayout"> + <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="4" column="1"> + <widget class="ScrSpinBox" name="gSc"> + <property name="minimum"> + <double>0.010000000000000</double> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="value"> + <double>100.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="ScrSpinBox" name="gX2_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gX1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gX1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Focal:</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Focal:</string> + </property> + </widget> + </item> <item row="1" column="2"> <widget class="QLabel" name="label_10"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2_2"> + <property name="minimum"> <double>-3000.000000000000000</double> </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gY1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gY1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gFX"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gFX"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gSk_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gSk_2"> + <property name="minimum"> <double>-89.000000000000000</double> </property> <property name="maximum"> @@ -273,124 +273,124 @@ <widget class="QLabel" name="label_13"> <property name="text"> <string>Scale:</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gFY"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <spacer name="verticalSpacer_5"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageFourColor"> - <layout class="QGridLayout" name="gridLayout_4"> - <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="2"> - <widget class="QLabel" name="label_17"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>3. Point:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gC2Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gFY"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageFourColor"> + <layout class="QGridLayout" name="gridLayout_4"> + <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="2"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>3. Point:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gC2Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_21"> - <property name="text"> - <string>4. Point:</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_18"> - <property name="text"> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string>4. Point:</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_18"> + <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gC3X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gC3X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gC2X"> <property name="minimum"> @@ -398,51 +398,51 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_19"> - <property name="text"> - <string>1. Point:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gC3Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_19"> + <property name="text"> + <string>1. Point:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gC3Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gC4X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gC4X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="ScrSpinBox" name="gC4Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="ScrSpinBox" name="gC4Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gC1X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gC1X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> </property> @@ -452,58 +452,58 @@ <widget class="QLabel" name="label_20"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gC1Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gC1Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>2. Point:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageDiamond"> - <layout class="QGridLayout" name="gridLayout_2"> - <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="0" column="0"> - <widget class="QLabel" name="label_23"> - <property name="text"> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>2. Point:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageDiamond"> + <layout class="QGridLayout" name="gridLayout_2"> + <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="0" column="0"> + <widget class="QLabel" name="label_23"> + <property name="text"> <string>1. Point:</string> </property> </widget> @@ -672,24 +672,24 @@ </widget> </item> </layout> - </widget> - <widget class="QWidget" name="pageMesh"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <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"> - <item> + </widget> + <widget class="QWidget" name="pageMesh"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <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"> + <item> <layout class="QGridLayout" name="gridLayout_5"> <item row="0" column="0"> <widget class="QToolButton" name="editPoints"> @@ -849,33 +849,33 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> - </widget> - <widget class="QWidget" name="pagePatch"> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <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_3"> - <item> + </widget> + <widget class="QWidget" name="pagePatch"> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <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_3"> + <item> <layout class="QGridLayout" name="gridLayout_7"> <item row="0" column="0"> <widget class="QToolButton" name="editPPoint"> @@ -1040,13 +1040,13 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> </widget> @@ -1054,7 +1054,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/multipleduplicate.ui b/scribus/ui/multipleduplicate.ui index fce61038f..fb7ac9a1e 100644 --- a/scribus/ui/multipleduplicate.ui +++ b/scribus/ui/multipleduplicate.ui @@ -464,7 +464,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/smreplacedia.ui b/scribus/ui/smreplacedia.ui index 40230fb84..f8d34e32e 100644 --- a/scribus/ui/smreplacedia.ui +++ b/scribus/ui/smreplacedia.ui @@ -92,7 +92,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> <customwidgets> </customwidgets> <resources/> diff --git a/scribus/ui/stylemanager.ui b/scribus/ui/stylemanager.ui index 1ad16b74f..8b78b3eb2 100644 --- a/scribus/ui/stylemanager.ui +++ b/scribus/ui/stylemanager.ui @@ -446,7 +446,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>StyleView</class> diff --git a/scribus/ui/transformdialogbase.ui b/scribus/ui/transformdialogbase.ui index 0a08fbd43..1e5515604 100644 --- a/scribus/ui/transformdialogbase.ui +++ b/scribus/ui/transformdialogbase.ui @@ -513,7 +513,6 @@ </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> -- 2.27.0 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files_2.patch (40,961 bytes)

bubu 2021-03-06 10:41 reporter ~0048916	Updated patch to current branch. I ask this patch to cleanup .ui files because Qt Designer ignores values specified in 'layoutdefault' tag, but in building process they are applied. So it is very confusing. Please see: https://bugreports.qt.io/browse/QTBUG-68096 So this is a simple cleanup for .ui files. 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files-3.patch (42,183 bytes) From 6e1a6e3afcadc06f38ad99e139b5730adc2ff41f Mon Sep 17 00:00:00 2001 Message-Id: <6e1a6e3afcadc06f38ad99e139b5730adc2ff41f.1615024895.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Sat, 6 Mar 2021 11:01:22 +0100 Subject: [PATCH] Remove Qt 3/4 layoutdefault tags from .ui files --- .../barcodegenerator/barcodegenerator.ui \| 1 - scribus/plugins/colorwheel/cwdialog.ui \| 1 - .../tools/pathfinder/pathfinderbase.ui \| 93 +- scribus/ui/arcvectorbase.ui \| 37 +- scribus/ui/createrange.ui \| 1 - scribus/ui/gradientvectorbase.ui \| 939 +++++++++--------- scribus/ui/multipleduplicate.ui \| 1 - scribus/ui/spiralvectorbase.ui \| 37 +- scribus/ui/transformdialogbase.ui \| 1 - 9 files changed, 551 insertions(+), 560 deletions(-) diff --git a/scribus/plugins/barcodegenerator/barcodegenerator.ui b/scribus/plugins/barcodegenerator/barcodegenerator.ui index da590ab13..e1e0d214f 100644 --- a/scribus/plugins/barcodegenerator/barcodegenerator.ui +++ b/scribus/plugins/barcodegenerator/barcodegenerator.ui @@ -456,7 +456,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>bgColorButton</tabstop> <tabstop>lnColorButton</tabstop> diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui index 74c2a94a9..0f643d995 100644 --- a/scribus/plugins/colorwheel/cwdialog.ui +++ b/scribus/plugins/colorwheel/cwdialog.ui @@ -1120,7 +1120,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ColorWheel</class> diff --git a/scribus/plugins/tools/pathfinder/pathfinderbase.ui b/scribus/plugins/tools/pathfinder/pathfinderbase.ui index 307422c19..ff391bc7a 100644 --- a/scribus/plugins/tools/pathfinder/pathfinderbase.ui +++ b/scribus/plugins/tools/pathfinder/pathfinderbase.ui @@ -11,28 +11,28 @@ </rect> </property> <property name="windowTitle"> - <string>Boolean Path Operations</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <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> - <layout class="QVBoxLayout"> - <item> - <widget class="QLabel" name="sourceShape"> - <property name="minimumSize"> + <string>Boolean Path Operations</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <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> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="sourceShape"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -85,12 +85,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <spacer> - <property name="orientation"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <spacer> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> @@ -132,12 +132,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <widget class="QLabel" name="sourceShape2"> - <property name="minimumSize"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <widget class="QLabel" name="sourceShape2"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -190,12 +190,12 @@ </spacer> </item> </layout> - </item> - <item> - <layout class="QVBoxLayout"> - <item> - <spacer> - <property name="orientation"> + </item> + <item> + <layout class="QVBoxLayout"> + <item> + <spacer> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> @@ -295,12 +295,12 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string>Operation</string> - </property> - <layout class="QHBoxLayout"> - <item> - <widget class="QToolButton" name="opCombine"> - <property name="toolTip"> + <string>Operation</string> + </property> + <layout class="QHBoxLayout"> + <item> + <widget class="QToolButton" name="opCombine"> + <property name="toolTip"> <string>Unites the shapes</string> </property> <property name="text"> @@ -542,7 +542,6 @@ The result is a combination of "Intersection" and "Exclusion&quot </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ColorCombo</class> diff --git a/scribus/ui/arcvectorbase.ui b/scribus/ui/arcvectorbase.ui index 3a434aa27..995259e17 100644 --- a/scribus/ui/arcvectorbase.ui +++ b/scribus/ui/arcvectorbase.ui @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Arc</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Arc</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -148,7 +148,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/createrange.ui b/scribus/ui/createrange.ui index 6f30f7594..d931a49aa 100644 --- a/scribus/ui/createrange.ui +++ b/scribus/ui/createrange.ui @@ -434,7 +434,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/gradientvectorbase.ui b/scribus/ui/gradientvectorbase.ui index cc7689e52..c461aea87 100644 --- a/scribus/ui/gradientvectorbase.ui +++ b/scribus/ui/gradientvectorbase.ui @@ -6,64 +6,64 @@ <bool>true</bool> </property> <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>267</width> - <height>178</height> - </rect> - </property> - <property name="minimumSize"> + <rect> + <x>0</x> + <y>0</y> + <width>267</width> + <height>178</height> + </rect> + </property> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> <property name="windowTitle"> - <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> - <property name="currentIndex"> + <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> + <property name="currentIndex"> <number>0</number> - </property> - <widget class="QWidget" name="pageLinear"> - <layout class="QGridLayout" name="gridLayout_3"> - <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="0" column="3"> - <widget class="ScrSpinBox" name="gY1"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> + </property> + <widget class="QWidget" name="pageLinear"> + <layout class="QGridLayout" name="gridLayout_3"> + <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="0" column="3"> + <widget class="ScrSpinBox" name="gY1"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="ScrSpinBox" name="gX1"> <property name="minimum"> @@ -71,33 +71,33 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gX2"> <property name="minimum"> @@ -105,163 +105,163 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gSk"> - <property name="minimum"> - <double>-89.000000000000000</double> - </property> - <property name="maximum"> - <double>89.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageRadial"> - <layout class="QGridLayout" name="gridLayout"> - <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="4" column="1"> - <widget class="ScrSpinBox" name="gSc"> - <property name="minimum"> - <double>0.010000000000000</double> - </property> - <property name="maximum"> - <double>100.000000000000000</double> - </property> - <property name="value"> - <double>100.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="ScrSpinBox" name="gX2_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gSk"> + <property name="minimum"> + <double>-89.000000000000000</double> + </property> + <property name="maximum"> + <double>89.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageRadial"> + <layout class="QGridLayout" name="gridLayout"> + <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="4" column="1"> + <widget class="ScrSpinBox" name="gSc"> + <property name="minimum"> + <double>0.010000000000000</double> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="value"> + <double>100.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="ScrSpinBox" name="gX2_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gX1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gX1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Focal:</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Focal:</string> + </property> + </widget> + </item> <item row="1" column="2"> <widget class="QLabel" name="label_10"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2_2"> + <property name="minimum"> <double>-3000.000000000000000</double> </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gY1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gY1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gFX"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gFX"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gSk_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gSk_2"> + <property name="minimum"> <double>-89.000000000000000</double> </property> <property name="maximum"> @@ -273,124 +273,124 @@ <widget class="QLabel" name="label_13"> <property name="text"> <string>Scale:</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gFY"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <spacer name="verticalSpacer_5"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageFourColor"> - <layout class="QGridLayout" name="gridLayout_4"> - <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="2"> - <widget class="QLabel" name="label_17"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>3. Point:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gC2Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gFY"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageFourColor"> + <layout class="QGridLayout" name="gridLayout_4"> + <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="2"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>3. Point:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gC2Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_21"> - <property name="text"> - <string>4. Point:</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_18"> - <property name="text"> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string>4. Point:</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_18"> + <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gC3X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gC3X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gC2X"> <property name="minimum"> @@ -398,51 +398,51 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_19"> - <property name="text"> - <string>1. Point:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gC3Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_19"> + <property name="text"> + <string>1. Point:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gC3Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gC4X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gC4X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="ScrSpinBox" name="gC4Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="ScrSpinBox" name="gC4Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gC1X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gC1X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> </property> @@ -452,58 +452,58 @@ <widget class="QLabel" name="label_20"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gC1Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gC1Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>2. Point:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageDiamond"> - <layout class="QGridLayout" name="gridLayout_2"> - <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="0" column="0"> - <widget class="QLabel" name="label_23"> - <property name="text"> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>2. Point:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageDiamond"> + <layout class="QGridLayout" name="gridLayout_2"> + <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="0" column="0"> + <widget class="QLabel" name="label_23"> + <property name="text"> <string>1. Point:</string> </property> </widget> @@ -672,24 +672,24 @@ </widget> </item> </layout> - </widget> - <widget class="QWidget" name="pageMesh"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <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"> - <item> + </widget> + <widget class="QWidget" name="pageMesh"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <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"> + <item> <layout class="QGridLayout" name="gridLayout_5"> <item row="0" column="0"> <widget class="QToolButton" name="editPoints"> @@ -849,33 +849,33 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> - </widget> - <widget class="QWidget" name="pagePatch"> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <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_3"> - <item> + </widget> + <widget class="QWidget" name="pagePatch"> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <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_3"> + <item> <layout class="QGridLayout" name="gridLayout_7"> <item row="0" column="0"> <widget class="QToolButton" name="editPPoint"> @@ -1040,13 +1040,13 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> </widget> @@ -1054,7 +1054,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/multipleduplicate.ui b/scribus/ui/multipleduplicate.ui index fce61038f..fb7ac9a1e 100644 --- a/scribus/ui/multipleduplicate.ui +++ b/scribus/ui/multipleduplicate.ui @@ -464,7 +464,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/spiralvectorbase.ui b/scribus/ui/spiralvectorbase.ui index f192d4fca..07f440ad3 100644 --- a/scribus/ui/spiralvectorbase.ui +++ b/scribus/ui/spiralvectorbase.ui @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Spiral</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Spiral</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -125,7 +125,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/transformdialogbase.ui b/scribus/ui/transformdialogbase.ui index 0a08fbd43..1e5515604 100644 --- a/scribus/ui/transformdialogbase.ui +++ b/scribus/ui/transformdialogbase.ui @@ -513,7 +513,6 @@ </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> -- 2.27.0 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files-3.patch (42,183 bytes)

bubu 2021-03-14 21:38 reporter ~0048934	Patch is OK, can be applied.

bubu 2021-04-05 09:46 reporter ~0049074	I updated patch to current HEAD. I ask to review it. Thanks. The patch is not clean, but there is only one line removal per file: <layoutdefault spacing="5\|6" margin="10\|11"/> 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files-4.patch (38,689 bytes) From 5efca551df219a5241defda791b2d9fe81d47800 Mon Sep 17 00:00:00 2001 Message-Id: <5efca551df219a5241defda791b2d9fe81d47800.1617615724.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Mon, 5 Apr 2021 11:40:44 +0200 Subject: [PATCH] Remove Qt 3/4 layoutdefault tags from .ui files --- .../barcodegenerator/barcodegenerator.ui \| 1 - scribus/plugins/colorwheel/cwdialog.ui \| 1 - .../tools/pathfinder/pathfinderbase.ui \| 1 - scribus/ui/arcvectorbase.ui \| 37 +- scribus/ui/createrange.ui \| 1 - scribus/ui/gradientvectorbase.ui \| 939 +++++++++--------- scribus/ui/multipleduplicate.ui \| 1 - scribus/ui/spiralvectorbase.ui \| 37 +- scribus/ui/transformdialogbase.ui \| 1 - 9 files changed, 505 insertions(+), 514 deletions(-) diff --git a/scribus/plugins/barcodegenerator/barcodegenerator.ui b/scribus/plugins/barcodegenerator/barcodegenerator.ui index da590ab13..e1e0d214f 100644 --- a/scribus/plugins/barcodegenerator/barcodegenerator.ui +++ b/scribus/plugins/barcodegenerator/barcodegenerator.ui @@ -456,7 +456,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>bgColorButton</tabstop> <tabstop>lnColorButton</tabstop> diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui index 74c2a94a9..0f643d995 100644 --- a/scribus/plugins/colorwheel/cwdialog.ui +++ b/scribus/plugins/colorwheel/cwdialog.ui @@ -1120,7 +1120,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ColorWheel</class> diff --git a/scribus/plugins/tools/pathfinder/pathfinderbase.ui b/scribus/plugins/tools/pathfinder/pathfinderbase.ui index 25ec23b02..c358c14d3 100644 --- a/scribus/plugins/tools/pathfinder/pathfinderbase.ui +++ b/scribus/plugins/tools/pathfinder/pathfinderbase.ui @@ -527,7 +527,6 @@ The result is a combination of "Intersection" and "Exclusion&quot </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ColorCombo</class> diff --git a/scribus/ui/arcvectorbase.ui b/scribus/ui/arcvectorbase.ui index 3a434aa27..995259e17 100644 --- a/scribus/ui/arcvectorbase.ui +++ b/scribus/ui/arcvectorbase.ui @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Arc</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Arc</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -148,7 +148,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/createrange.ui b/scribus/ui/createrange.ui index 6f30f7594..d931a49aa 100644 --- a/scribus/ui/createrange.ui +++ b/scribus/ui/createrange.ui @@ -434,7 +434,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/gradientvectorbase.ui b/scribus/ui/gradientvectorbase.ui index cc7689e52..c461aea87 100644 --- a/scribus/ui/gradientvectorbase.ui +++ b/scribus/ui/gradientvectorbase.ui @@ -6,64 +6,64 @@ <bool>true</bool> </property> <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>267</width> - <height>178</height> - </rect> - </property> - <property name="minimumSize"> + <rect> + <x>0</x> + <y>0</y> + <width>267</width> + <height>178</height> + </rect> + </property> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> <property name="windowTitle"> - <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> - <property name="currentIndex"> + <string>Gradient Vector</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="QStackedWidget" name="stackedWidget"> + <property name="currentIndex"> <number>0</number> - </property> - <widget class="QWidget" name="pageLinear"> - <layout class="QGridLayout" name="gridLayout_3"> - <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="0" column="3"> - <widget class="ScrSpinBox" name="gY1"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> + </property> + <widget class="QWidget" name="pageLinear"> + <layout class="QGridLayout" name="gridLayout_3"> + <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="0" column="3"> + <widget class="ScrSpinBox" name="gY1"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="ScrSpinBox" name="gX1"> <property name="minimum"> @@ -71,33 +71,33 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gX2"> <property name="minimum"> @@ -105,163 +105,163 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gSk"> - <property name="minimum"> - <double>-89.000000000000000</double> - </property> - <property name="maximum"> - <double>89.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageRadial"> - <layout class="QGridLayout" name="gridLayout"> - <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="4" column="1"> - <widget class="ScrSpinBox" name="gSc"> - <property name="minimum"> - <double>0.010000000000000</double> - </property> - <property name="maximum"> - <double>100.000000000000000</double> - </property> - <property name="value"> - <double>100.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="ScrSpinBox" name="gX2_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gSk"> + <property name="minimum"> + <double>-89.000000000000000</double> + </property> + <property name="maximum"> + <double>89.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageRadial"> + <layout class="QGridLayout" name="gridLayout"> + <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="4" column="1"> + <widget class="ScrSpinBox" name="gSc"> + <property name="minimum"> + <double>0.010000000000000</double> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="value"> + <double>100.000000000000000</double> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="ScrSpinBox" name="gX2_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gX1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gX1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Focal:</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Focal:</string> + </property> + </widget> + </item> <item row="1" column="2"> <widget class="QLabel" name="label_10"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gY2_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gY2_2"> + <property name="minimum"> <double>-3000.000000000000000</double> </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gY1_2"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gY1_2"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gFX"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gFX"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gSk_2"> - <property name="minimum"> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gSk_2"> + <property name="minimum"> <double>-89.000000000000000</double> </property> <property name="maximum"> @@ -273,124 +273,124 @@ <widget class="QLabel" name="label_13"> <property name="text"> <string>Scale:</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>End:</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Skew:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gFY"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Start:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <spacer name="verticalSpacer_5"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageFourColor"> - <layout class="QGridLayout" name="gridLayout_4"> - <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="2"> - <widget class="QLabel" name="label_17"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>3. Point:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="ScrSpinBox" name="gC2Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>End:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Skew:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gFY"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> + <property name="maximum"> + <double>3000.000000000000000</double> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Start:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageFourColor"> + <layout class="QGridLayout" name="gridLayout_4"> + <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="2"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>3. Point:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="ScrSpinBox" name="gC2Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_21"> - <property name="text"> - <string>4. Point:</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_18"> - <property name="text"> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string>4. Point:</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_18"> + <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="ScrSpinBox" name="gC3X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="ScrSpinBox" name="gC3X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>/</string> - </property> - </widget> - </item> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="ScrSpinBox" name="gC2X"> <property name="minimum"> @@ -398,51 +398,51 @@ </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_19"> - <property name="text"> - <string>1. Point:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="ScrSpinBox" name="gC3Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_19"> + <property name="text"> + <string>1. Point:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="ScrSpinBox" name="gC3Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="ScrSpinBox" name="gC4X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="ScrSpinBox" name="gC4X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="ScrSpinBox" name="gC4Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="ScrSpinBox" name="gC4Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="ScrSpinBox" name="gC1X"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ScrSpinBox" name="gC1X"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> </property> @@ -452,58 +452,58 @@ <widget class="QLabel" name="label_20"> <property name="text"> <string>/</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="ScrSpinBox" name="gC1Y"> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="ScrSpinBox" name="gC1Y"> + <property name="minimum"> + <double>-3000.000000000000000</double> + </property> <property name="maximum"> <double>3000.000000000000000</double> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>2. Point:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageDiamond"> - <layout class="QGridLayout" name="gridLayout_2"> - <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="0" column="0"> - <widget class="QLabel" name="label_23"> - <property name="text"> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>2. Point:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageDiamond"> + <layout class="QGridLayout" name="gridLayout_2"> + <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="0" column="0"> + <widget class="QLabel" name="label_23"> + <property name="text"> <string>1. Point:</string> </property> </widget> @@ -672,24 +672,24 @@ </widget> </item> </layout> - </widget> - <widget class="QWidget" name="pageMesh"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <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"> - <item> + </widget> + <widget class="QWidget" name="pageMesh"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <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"> + <item> <layout class="QGridLayout" name="gridLayout_5"> <item row="0" column="0"> <widget class="QToolButton" name="editPoints"> @@ -849,33 +849,33 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> - </widget> - <widget class="QWidget" name="pagePatch"> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <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_3"> - <item> + </widget> + <widget class="QWidget" name="pagePatch"> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <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_3"> + <item> <layout class="QGridLayout" name="gridLayout_7"> <item row="0" column="0"> <widget class="QToolButton" name="editPPoint"> @@ -1040,13 +1040,13 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> </widget> @@ -1054,7 +1054,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/multipleduplicate.ui b/scribus/ui/multipleduplicate.ui index c170ebd89..805285457 100644 --- a/scribus/ui/multipleduplicate.ui +++ b/scribus/ui/multipleduplicate.ui @@ -461,7 +461,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/spiralvectorbase.ui b/scribus/ui/spiralvectorbase.ui index f192d4fca..07f440ad3 100644 --- a/scribus/ui/spiralvectorbase.ui +++ b/scribus/ui/spiralvectorbase.ui @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Spiral</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Spiral</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -125,7 +125,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff --git a/scribus/ui/transformdialogbase.ui b/scribus/ui/transformdialogbase.ui index 0a08fbd43..1e5515604 100644 --- a/scribus/ui/transformdialogbase.ui +++ b/scribus/ui/transformdialogbase.ui @@ -513,7 +513,6 @@ </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> -- 2.27.0 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files-4.patch (38,689 bytes)

luzpaz 2024-11-23 22:24 reporter ~0051637	Is this still relevant?

bubu 2024-11-24 09:27 reporter ~0051643	I think yes: https://github.com/search?q=repo%3Ascribusproject%2Fscribus%20layoutdefault%20spacing%3D%22&type=code but the patch maybe outdated.

bubu 2024-11-24 10:09 reporter ~0051644	Patch updated to current SVN. patch-02.patch (6,290 bytes) diff -ruN scribus2-svn/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui scribus-svn/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui --- scribus2-svn/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui 2024-11-24 10:52:51.251017872 +0100 +++ scribus-svn/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.ui 2024-11-24 10:47:29.787167141 +0100 @@ -456,7 +456,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>bgColorButton</tabstop> <tabstop>lnColorButton</tabstop> diff -ruN scribus2-svn/Scribus/scribus/plugins/colorwheel/cwdialog.ui scribus-svn/Scribus/scribus/plugins/colorwheel/cwdialog.ui --- scribus2-svn/Scribus/scribus/plugins/colorwheel/cwdialog.ui 2024-11-24 10:52:51.258017848 +0100 +++ scribus-svn/Scribus/scribus/plugins/colorwheel/cwdialog.ui 2024-11-24 10:48:50.679868096 +0100 @@ -1120,7 +1120,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ColorWheel</class> diff -ruN scribus2-svn/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui scribus-svn/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui --- scribus2-svn/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui 2024-11-24 10:52:51.145018236 +0100 +++ scribus-svn/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui 2024-11-24 10:48:23.249968622 +0100 @@ -527,7 +527,6 @@ </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ColorCombo</class> diff -ruN scribus2-svn/Scribus/scribus/ui/arcvectorbase.ui scribus-svn/Scribus/scribus/ui/arcvectorbase.ui --- scribus2-svn/Scribus/scribus/ui/arcvectorbase.ui 2024-11-24 10:52:50.725019679 +0100 +++ scribus-svn/Scribus/scribus/ui/arcvectorbase.ui 2024-11-24 10:45:46.442561824 +0100 @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Arc</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Arc</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -148,7 +148,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff -ruN scribus2-svn/Scribus/scribus/ui/createrange.ui scribus-svn/Scribus/scribus/ui/createrange.ui --- scribus2-svn/Scribus/scribus/ui/createrange.ui 2024-11-24 10:52:50.698019771 +0100 +++ scribus-svn/Scribus/scribus/ui/createrange.ui 2024-11-24 10:46:34.520376287 +0100 @@ -401,7 +401,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff -ruN scribus2-svn/Scribus/scribus/ui/multipleduplicate.ui scribus-svn/Scribus/scribus/ui/multipleduplicate.ui --- scribus2-svn/Scribus/scribus/ui/multipleduplicate.ui 2024-11-24 10:52:50.698019771 +0100 +++ scribus-svn/Scribus/scribus/ui/multipleduplicate.ui 2024-11-24 10:46:54.094301730 +0100 @@ -418,7 +418,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff -ruN scribus2-svn/Scribus/scribus/ui/spiralvectorbase.ui scribus-svn/Scribus/scribus/ui/spiralvectorbase.ui --- scribus2-svn/Scribus/scribus/ui/spiralvectorbase.ui 2024-11-24 10:52:50.726019675 +0100 +++ scribus-svn/Scribus/scribus/ui/spiralvectorbase.ui 2024-11-24 10:43:19.337154057 +0100 @@ -20,24 +20,24 @@ </size> </property> <property name="windowTitle"> - <string>Edit Spiral</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> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <string>Edit Spiral</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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>Start Angle:</string> @@ -125,7 +125,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> diff -ruN scribus2-svn/Scribus/scribus/ui/transformdialogbase.ui scribus-svn/Scribus/scribus/ui/transformdialogbase.ui --- scribus2-svn/Scribus/scribus/ui/transformdialogbase.ui 2024-11-24 10:52:50.710019730 +0100 +++ scribus-svn/Scribus/scribus/ui/transformdialogbase.ui 2024-11-24 10:45:16.022681104 +0100 @@ -623,7 +623,6 @@ </item> </layout> </widget> - <layoutdefault spacing="5" margin="10"/> <customwidgets> <customwidget> <class>ScrSpinBox</class> patch-02.patch (6,290 bytes)

ale 2024-11-24 17:05 manager ~0051646	is this about removing the line <layoutdefault spacing="6" margin="11"/> from all .ui files?

bubu 2024-11-24 17:13 reporter ~0051647	@ale, yes

ale 2024-11-26 18:35 manager ~0051661	i checked it: the other lines that the patch is replacing, seem to be replacing "nothing" (+ and - are exactly the same) no idea how it got in, but the person applying the patch should probably remove them from the patch before applying (to be sure that they do nothing "nasty")

bubu 2024-11-26 21:48 reporter ~0051671	@jghali, unfortunately the patch is not as clean as I would have liked and as ale mentioned. I made this issue as part of unifying layout margins. For example: 0016381 I had about 20 patches on this topic in 2020/21. These are the leftovers. I don't know why this patch stayed out. Today it's mostly code cleaning, unification.

Date Modified	Username	Field
2021-02-08 22:52	bubu	New Issue
2021-02-09 05:54	bubu	File Added: 0001-Remove-Qt-3-4-layoutdefault-from-.ui-files.patch
2021-02-16 22:18	bubu	File Added: 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files_2.patch
2021-02-16 22:18	bubu	Note Added: 0048841
2021-03-06 10:41	bubu	File Added: 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files-3.patch
2021-03-06 10:41	bubu	Note Added: 0048916
2021-03-14 21:38	bubu	Note Added: 0048934
2021-04-05 09:46	bubu	Note Added: 0049074
2021-04-05 09:46	bubu	File Added: 0001-Remove-Qt-3-4-layoutdefault-tags-from-.ui-files-4.patch
2024-11-23 22:24	luzpaz	Note Added: 0051637
2024-11-24 09:27	bubu	Note Added: 0051643
2024-11-24 10:09	bubu	Note Added: 0051644
2024-11-24 10:09	bubu	File Added: patch-02.patch
2024-11-24 17:05	ale	Note Added: 0051646
2024-11-24 17:13	bubu	Note Added: 0051647
2024-11-26 18:35	ale	Note Added: 0051661
2024-11-26 21:48	bubu	Note Added: 0051671

View Issue Details

Activities

Issue History