View Issue Details

IDProjectCategoryView StatusLast Update
0016476ScribusUser Interfacepublic2021-02-18 13:56
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Product Version1.5.7.svn 
Target VersionFixed in Version1.5.7.svn 
Summary0016476: Unify margins and spacing for dialogs, set 8
DescriptionI propose a new set of trivial margin/spacing adjustment for dialogs.

Comments:
- In xpsimportoptions.ui there is a spacer removal.
- In cwdialog.ui there is a size adjustment for colorWeel widget (300->307)
Others are trivial.

Please review. Thanks.
TagsNo tags attached.
PatchNo

Relationships

child of 0013906 acknowledged Metabug: UI enhancement proposals (1.5.x.svn) 

Activities

bubu

2021-02-16 21:57

reporter  

0001-Unify-margins-and-spacing-for-dialogs-set-8.patch (21,940 bytes)
From e28cfe389205d4da279b5505c56894a535421e80 Mon Sep 17 00:00:00 2001
Message-Id: <e28cfe389205d4da279b5505c56894a535421e80.1613512394.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Tue, 16 Feb 2021 22:53:07 +0100
Subject: [PATCH] Unify margins and spacing for dialogs, set 8

---
 scribus/plugins/colorwheel/cwdialog.ui        | 162 +++---------------
 .../plugins/import/xps/xpsimportoptions.ui    |  30 ++--
 scribus/ui/fontreplacedialog.cpp              |   8 +-
 scribus/ui/patternpropsdialog.cpp             |  32 ++--
 scribus/ui/prefs_hyphenatorbase.ui            |  66 ++-----
 5 files changed, 72 insertions(+), 226 deletions(-)

diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui
index b1962d9d5..74c2a94a9 100644
--- a/scribus/plugins/colorwheel/cwdialog.ui
+++ b/scribus/plugins/colorwheel/cwdialog.ui
@@ -28,9 +28,6 @@
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
    <item row="0" column="0">
     <widget class="ColorWheel" name="colorWheel" native="true">
      <property name="sizePolicy">
@@ -41,13 +38,13 @@
      </property>
      <property name="minimumSize">
       <size>
-       <width>300</width>
+       <width>307</width>
        <height>300</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>300</width>
+       <width>307</width>
        <height>300</height>
       </size>
      </property>
@@ -62,21 +59,6 @@
       <string>Result Colors</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="1" column="0">
        <widget class="QTableWidget" name="currentColorTable">
         <property name="sizePolicy">
@@ -112,15 +94,15 @@
         <attribute name="horizontalHeaderVisible">
          <bool>false</bool>
         </attribute>
+        <attribute name="horizontalHeaderMinimumSectionSize">
+         <number>42</number>
+        </attribute>
         <attribute name="horizontalHeaderDefaultSectionSize">
          <number>42</number>
         </attribute>
         <attribute name="horizontalHeaderHighlightSections">
          <bool>false</bool>
         </attribute>
-        <attribute name="horizontalHeaderMinimumSectionSize">
-         <number>42</number>
-        </attribute>
         <attribute name="horizontalHeaderStretchLastSection">
          <bool>true</bool>
         </attribute>
@@ -183,26 +165,8 @@
       <string>Color Scheme Method</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="1" column="0">
        <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
@@ -264,9 +228,6 @@
    </item>
    <item row="3" column="0" colspan="2">
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
@@ -342,21 +303,6 @@
       <string>Preview:</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="2" column="0">
        <widget class="QLabel" name="previewLabel">
         <property name="minimumSize">
@@ -432,25 +378,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -487,9 +427,6 @@
        </item>
        <item row="1" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -526,9 +463,6 @@
        </item>
        <item row="2" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -565,9 +499,6 @@
        </item>
        <item row="3" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -604,9 +535,6 @@
        </item>
        <item row="4" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -649,9 +577,6 @@
        </item>
        <item row="5" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -716,25 +641,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QVBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -749,9 +668,6 @@
          </property>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -785,9 +701,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -821,9 +734,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -857,9 +767,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -899,9 +806,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -965,25 +869,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QVBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -998,9 +896,6 @@
          </property>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1034,9 +929,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1070,9 +962,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1106,9 +995,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1151,9 +1037,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1217,19 +1100,16 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <widget class="ColorListBox" name="documentColorList" native="true"/>
diff --git a/scribus/plugins/import/xps/xpsimportoptions.ui b/scribus/plugins/import/xps/xpsimportoptions.ui
index 115ae9020..c03671f87 100644
--- a/scribus/plugins/import/xps/xpsimportoptions.ui
+++ b/scribus/plugins/import/xps/xpsimportoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>213</width>
-    <height>272</height>
+    <height>239</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,18 @@
    <bool>true</bool>
   </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" name="horizontalLayout_5">
      <item>
@@ -104,9 +116,6 @@
         </item>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="spacing">
-           <number>3</number>
-          </property>
           <property name="leftMargin">
            <number>15</number>
           </property>
@@ -132,19 +141,6 @@
        </layout>
       </widget>
      </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <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>
    </item>
    <item>
diff --git a/scribus/ui/fontreplacedialog.cpp b/scribus/ui/fontreplacedialog.cpp
index 136a61177..e173fa640 100644
--- a/scribus/ui/fontreplacedialog.cpp
+++ b/scribus/ui/fontreplacedialog.cpp
@@ -31,8 +31,8 @@ FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *R
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	ReplaceList = RList;
 	FontReplaceDialogLayout = new QVBoxLayout( this );
-	FontReplaceDialogLayout->setMargin(10);
-	FontReplaceDialogLayout->setSpacing(5);
+	FontReplaceDialogLayout->setContentsMargins(9, 9, 9, 9);
+	FontReplaceDialogLayout->setSpacing(6);
 
 	textLabel1 = new QLabel(this);
 	textLabel1->setAlignment(Qt::AlignVCenter);
@@ -66,8 +66,8 @@ FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *R
 	FontReplaceDialogLayout->addWidget( replacementTable );
 
 	layout1 = new QHBoxLayout;
-	layout1->setMargin(0);
-	layout1->setSpacing(5);
+	layout1->setContentsMargins(0, 0, 0, 0);
+	layout1->setSpacing(6);
 	stickyReplacements = new QCheckBox( this );
 	stickyReplacements->setText( tr( "Make these substitutions permanent" ) );
 	layout1->addWidget(stickyReplacements);
diff --git a/scribus/ui/patternpropsdialog.cpp b/scribus/ui/patternpropsdialog.cpp
index 0c5301f0e..c4262ccd1 100644
--- a/scribus/ui/patternpropsdialog.cpp
+++ b/scribus/ui/patternpropsdialog.cpp
@@ -30,13 +30,13 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	setModal(true);
 	forStroke = isStroke;
 	frame3Layout = new QVBoxLayout( this );
-	frame3Layout->setMargin(0);
-	frame3Layout->setSpacing(2);
+	frame3Layout->setContentsMargins(9, 9, 9, 9);
+	frame3Layout->setSpacing(6);
 
 	groupOffset = new QGroupBox( this );
 	groupOffsetLayout = new QHBoxLayout( groupOffset );
-	groupOffsetLayout->setSpacing( 2 );
-	groupOffsetLayout->setMargin( 3 );
+	groupOffsetLayout->setSpacing(6);
+	groupOffsetLayout->setContentsMargins(9, 9, 9, 9);
 	groupOffsetLayout->setAlignment( Qt::AlignTop );
 	textLabel1 = new QLabel( groupOffset );
 	groupOffsetLayout->addWidget( textLabel1 );
@@ -50,8 +50,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 
 	groupScale = new QGroupBox( this );
 	groupScaleLayout = new QGridLayout( groupScale );
-	groupScaleLayout->setSpacing( 2 );
-	groupScaleLayout->setMargin( 3 );
+	groupScaleLayout->setSpacing(6);
+	groupScaleLayout->setContentsMargins(9, 9, 9, 9);
 	groupScaleLayout->setAlignment( Qt::AlignTop );
 	textLabel5 = new QLabel( groupScale );
 	groupScaleLayout->addWidget( textLabel5, 0, 0 );
@@ -71,8 +71,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	frame3Layout->addWidget( groupScale );
 	groupRotation = new QGroupBox( this );
 	groupRotationLayout = new QHBoxLayout( groupRotation );
-	groupRotationLayout->setSpacing( 2 );
-	groupRotationLayout->setMargin( 3 );
+	groupRotationLayout->setSpacing(6);
+	groupRotationLayout->setContentsMargins(9, 9, 9, 9);
 	groupRotationLayout->setAlignment( Qt::AlignTop );
 	textLabel7 = new QLabel( groupRotation );
 	groupRotationLayout->addWidget( textLabel7 );
@@ -82,8 +82,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 
 	groupSkew = new QGroupBox( this );
 	groupSkewLayout = new QGridLayout( groupSkew );
-	groupSkewLayout->setSpacing( 2 );
-	groupSkewLayout->setMargin( 3 );
+	groupSkewLayout->setSpacing(6);
+	groupSkewLayout->setContentsMargins(9, 9, 9, 9);
 	groupSkewLayout->setAlignment( Qt::AlignTop );
 	textLabel8 = new QLabel( groupSkew );
 	groupSkewLayout->addWidget( textLabel8, 0, 0 );
@@ -101,8 +101,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	{
 		groupSpace = new QGroupBox( this );
 		groupSpaceLayout = new QHBoxLayout( groupSpace );
-		groupSpaceLayout->setSpacing( 2 );
-		groupSpaceLayout->setMargin( 3 );
+		groupSpaceLayout->setSpacing(6);
+		groupSpaceLayout->setContentsMargins(9, 9, 9, 9);
 		groupSpaceLayout->setAlignment( Qt::AlignTop );
 		textLabel20 = new QLabel( groupSpace );
 		groupSpaceLayout->addWidget( textLabel20 );
@@ -113,8 +113,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	}
 
 	groupFlipLayout = new QHBoxLayout();
-	groupFlipLayout->setSpacing( 2 );
-	groupFlipLayout->setMargin( 3 );
+	groupFlipLayout->setSpacing(6);
+	groupFlipLayout->setContentsMargins(0, 0, 0, 0);
 	textLabel15 = new QLabel( this );
 	groupFlipLayout->addWidget( textLabel15 );
 	QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -130,8 +130,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	frame3Layout->addLayout( groupFlipLayout );
 
 	buttonLayout = new QHBoxLayout;
-	buttonLayout->setMargin(0);
-	buttonLayout->setSpacing(5);
+	buttonLayout->setContentsMargins(0, 0, 0, 0);
+	buttonLayout->setSpacing(6);
 	QSpacerItem* hspacing = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
 	buttonLayout->addItem(hspacing);
 	buttonOk = new QPushButton( this );
diff --git a/scribus/ui/prefs_hyphenatorbase.ui b/scribus/ui/prefs_hyphenatorbase.ui
index da3285600..1f6b56827 100644
--- a/scribus/ui/prefs_hyphenatorbase.ui
+++ b/scribus/ui/prefs_hyphenatorbase.ui
@@ -11,24 +11,24 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
       <font>
        <pointsize>14</pointsize>
        <weight>75</weight>
@@ -108,21 +108,6 @@
             <string>Exceptions</string>
            </property>
            <layout class="QGridLayout" name="_2">
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
-            <property name="spacing">
-             <number>5</number>
-            </property>
             <item row="0" column="0" colspan="4">
              <widget class="QListWidget" name="exceptionListWidget"/>
             </item>
@@ -169,21 +154,6 @@
             <string>Ignore List</string>
            </property>
            <layout class="QGridLayout" name="_3">
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
-            <property name="spacing">
-             <number>5</number>
-            </property>
             <item row="0" column="0" colspan="4">
              <widget class="QListWidget" name="ignoreListWidget">
               <property name="sizePolicy">
-- 
2.27.0

patternpropsdialog.gif (28,280 bytes)
patternpropsdialog.gif (28,280 bytes)
fontreplacedialog.gif (37,586 bytes)
fontreplacedialog.gif (37,586 bytes)
xpsimportoptions.gif (19,119 bytes)
xpsimportoptions.gif (19,119 bytes)
cwdialog.gif (87,491 bytes)
cwdialog.gif (87,491 bytes)
prefs_hyphenator.gif (77,908 bytes)
prefs_hyphenator.gif (77,908 bytes)

jghali

2021-02-17 21:12

administrator   ~0048854

The modifications to xps import dialog does not provide correct results on Windows.

bubu

2021-02-17 21:40

reporter   ~0048855

Thanks for reviewing. Sorry for the mistake.

1) I propose patch B: I added a resize(minimumSizeHint()); I hope this solves the problem. See the attached screenshot.
2) If patch B does not work well on Windows: in patch C I put back the deleted vertical separator.

Please review patch B first. Thanks.

0001-Unify-margins-and-spacing-for-dialogs-set-8-B.patch (22,505 bytes)
From 0e4794ed0a453e088867f0e2cdb4dc5065c2f5b0 Mon Sep 17 00:00:00 2001
Message-Id: <0e4794ed0a453e088867f0e2cdb4dc5065c2f5b0.1613597631.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Wed, 17 Feb 2021 22:32:34 +0100
Subject: [PATCH] Unify margins and spacing for dialogs, set 8

---
 scribus/plugins/colorwheel/cwdialog.ui        | 162 +++---------------
 .../plugins/import/xps/xpsimportoptions.cpp   |   1 +
 .../plugins/import/xps/xpsimportoptions.ui    |  30 ++--
 scribus/ui/fontreplacedialog.cpp              |   8 +-
 scribus/ui/patternpropsdialog.cpp             |  32 ++--
 scribus/ui/prefs_hyphenatorbase.ui            |  66 ++-----
 6 files changed, 73 insertions(+), 226 deletions(-)

diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui
index b1962d9d5..74c2a94a9 100644
--- a/scribus/plugins/colorwheel/cwdialog.ui
+++ b/scribus/plugins/colorwheel/cwdialog.ui
@@ -28,9 +28,6 @@
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
    <item row="0" column="0">
     <widget class="ColorWheel" name="colorWheel" native="true">
      <property name="sizePolicy">
@@ -41,13 +38,13 @@
      </property>
      <property name="minimumSize">
       <size>
-       <width>300</width>
+       <width>307</width>
        <height>300</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>300</width>
+       <width>307</width>
        <height>300</height>
       </size>
      </property>
@@ -62,21 +59,6 @@
       <string>Result Colors</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="1" column="0">
        <widget class="QTableWidget" name="currentColorTable">
         <property name="sizePolicy">
@@ -112,15 +94,15 @@
         <attribute name="horizontalHeaderVisible">
          <bool>false</bool>
         </attribute>
+        <attribute name="horizontalHeaderMinimumSectionSize">
+         <number>42</number>
+        </attribute>
         <attribute name="horizontalHeaderDefaultSectionSize">
          <number>42</number>
         </attribute>
         <attribute name="horizontalHeaderHighlightSections">
          <bool>false</bool>
         </attribute>
-        <attribute name="horizontalHeaderMinimumSectionSize">
-         <number>42</number>
-        </attribute>
         <attribute name="horizontalHeaderStretchLastSection">
          <bool>true</bool>
         </attribute>
@@ -183,26 +165,8 @@
       <string>Color Scheme Method</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="1" column="0">
        <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
@@ -264,9 +228,6 @@
    </item>
    <item row="3" column="0" colspan="2">
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
@@ -342,21 +303,6 @@
       <string>Preview:</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="2" column="0">
        <widget class="QLabel" name="previewLabel">
         <property name="minimumSize">
@@ -432,25 +378,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -487,9 +427,6 @@
        </item>
        <item row="1" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -526,9 +463,6 @@
        </item>
        <item row="2" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -565,9 +499,6 @@
        </item>
        <item row="3" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -604,9 +535,6 @@
        </item>
        <item row="4" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -649,9 +577,6 @@
        </item>
        <item row="5" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -716,25 +641,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QVBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -749,9 +668,6 @@
          </property>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -785,9 +701,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -821,9 +734,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -857,9 +767,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -899,9 +806,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -965,25 +869,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QVBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -998,9 +896,6 @@
          </property>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1034,9 +929,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1070,9 +962,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1106,9 +995,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1151,9 +1037,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1217,19 +1100,16 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <widget class="ColorListBox" name="documentColorList" native="true"/>
diff --git a/scribus/plugins/import/xps/xpsimportoptions.cpp b/scribus/plugins/import/xps/xpsimportoptions.cpp
index ac7bb3fbb..66de1f884 100644
--- a/scribus/plugins/import/xps/xpsimportoptions.cpp
+++ b/scribus/plugins/import/xps/xpsimportoptions.cpp
@@ -14,6 +14,7 @@ XpsImportOptions::XpsImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui
 {
 	ui->setupUi(this);
 	ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+	resize(minimumSizeHint());
 	m_maxPage = 0;
 }
 
diff --git a/scribus/plugins/import/xps/xpsimportoptions.ui b/scribus/plugins/import/xps/xpsimportoptions.ui
index 115ae9020..c03671f87 100644
--- a/scribus/plugins/import/xps/xpsimportoptions.ui
+++ b/scribus/plugins/import/xps/xpsimportoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>213</width>
-    <height>272</height>
+    <height>239</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,18 @@
    <bool>true</bool>
   </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" name="horizontalLayout_5">
      <item>
@@ -104,9 +116,6 @@
         </item>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="spacing">
-           <number>3</number>
-          </property>
           <property name="leftMargin">
            <number>15</number>
           </property>
@@ -132,19 +141,6 @@
        </layout>
       </widget>
      </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <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>
    </item>
    <item>
diff --git a/scribus/ui/fontreplacedialog.cpp b/scribus/ui/fontreplacedialog.cpp
index 136a61177..e173fa640 100644
--- a/scribus/ui/fontreplacedialog.cpp
+++ b/scribus/ui/fontreplacedialog.cpp
@@ -31,8 +31,8 @@ FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *R
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	ReplaceList = RList;
 	FontReplaceDialogLayout = new QVBoxLayout( this );
-	FontReplaceDialogLayout->setMargin(10);
-	FontReplaceDialogLayout->setSpacing(5);
+	FontReplaceDialogLayout->setContentsMargins(9, 9, 9, 9);
+	FontReplaceDialogLayout->setSpacing(6);
 
 	textLabel1 = new QLabel(this);
 	textLabel1->setAlignment(Qt::AlignVCenter);
@@ -66,8 +66,8 @@ FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *R
 	FontReplaceDialogLayout->addWidget( replacementTable );
 
 	layout1 = new QHBoxLayout;
-	layout1->setMargin(0);
-	layout1->setSpacing(5);
+	layout1->setContentsMargins(0, 0, 0, 0);
+	layout1->setSpacing(6);
 	stickyReplacements = new QCheckBox( this );
 	stickyReplacements->setText( tr( "Make these substitutions permanent" ) );
 	layout1->addWidget(stickyReplacements);
diff --git a/scribus/ui/patternpropsdialog.cpp b/scribus/ui/patternpropsdialog.cpp
index 0c5301f0e..c4262ccd1 100644
--- a/scribus/ui/patternpropsdialog.cpp
+++ b/scribus/ui/patternpropsdialog.cpp
@@ -30,13 +30,13 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	setModal(true);
 	forStroke = isStroke;
 	frame3Layout = new QVBoxLayout( this );
-	frame3Layout->setMargin(0);
-	frame3Layout->setSpacing(2);
+	frame3Layout->setContentsMargins(9, 9, 9, 9);
+	frame3Layout->setSpacing(6);
 
 	groupOffset = new QGroupBox( this );
 	groupOffsetLayout = new QHBoxLayout( groupOffset );
-	groupOffsetLayout->setSpacing( 2 );
-	groupOffsetLayout->setMargin( 3 );
+	groupOffsetLayout->setSpacing(6);
+	groupOffsetLayout->setContentsMargins(9, 9, 9, 9);
 	groupOffsetLayout->setAlignment( Qt::AlignTop );
 	textLabel1 = new QLabel( groupOffset );
 	groupOffsetLayout->addWidget( textLabel1 );
@@ -50,8 +50,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 
 	groupScale = new QGroupBox( this );
 	groupScaleLayout = new QGridLayout( groupScale );
-	groupScaleLayout->setSpacing( 2 );
-	groupScaleLayout->setMargin( 3 );
+	groupScaleLayout->setSpacing(6);
+	groupScaleLayout->setContentsMargins(9, 9, 9, 9);
 	groupScaleLayout->setAlignment( Qt::AlignTop );
 	textLabel5 = new QLabel( groupScale );
 	groupScaleLayout->addWidget( textLabel5, 0, 0 );
@@ -71,8 +71,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	frame3Layout->addWidget( groupScale );
 	groupRotation = new QGroupBox( this );
 	groupRotationLayout = new QHBoxLayout( groupRotation );
-	groupRotationLayout->setSpacing( 2 );
-	groupRotationLayout->setMargin( 3 );
+	groupRotationLayout->setSpacing(6);
+	groupRotationLayout->setContentsMargins(9, 9, 9, 9);
 	groupRotationLayout->setAlignment( Qt::AlignTop );
 	textLabel7 = new QLabel( groupRotation );
 	groupRotationLayout->addWidget( textLabel7 );
@@ -82,8 +82,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 
 	groupSkew = new QGroupBox( this );
 	groupSkewLayout = new QGridLayout( groupSkew );
-	groupSkewLayout->setSpacing( 2 );
-	groupSkewLayout->setMargin( 3 );
+	groupSkewLayout->setSpacing(6);
+	groupSkewLayout->setContentsMargins(9, 9, 9, 9);
 	groupSkewLayout->setAlignment( Qt::AlignTop );
 	textLabel8 = new QLabel( groupSkew );
 	groupSkewLayout->addWidget( textLabel8, 0, 0 );
@@ -101,8 +101,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	{
 		groupSpace = new QGroupBox( this );
 		groupSpaceLayout = new QHBoxLayout( groupSpace );
-		groupSpaceLayout->setSpacing( 2 );
-		groupSpaceLayout->setMargin( 3 );
+		groupSpaceLayout->setSpacing(6);
+		groupSpaceLayout->setContentsMargins(9, 9, 9, 9);
 		groupSpaceLayout->setAlignment( Qt::AlignTop );
 		textLabel20 = new QLabel( groupSpace );
 		groupSpaceLayout->addWidget( textLabel20 );
@@ -113,8 +113,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	}
 
 	groupFlipLayout = new QHBoxLayout();
-	groupFlipLayout->setSpacing( 2 );
-	groupFlipLayout->setMargin( 3 );
+	groupFlipLayout->setSpacing(6);
+	groupFlipLayout->setContentsMargins(0, 0, 0, 0);
 	textLabel15 = new QLabel( this );
 	groupFlipLayout->addWidget( textLabel15 );
 	QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -130,8 +130,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	frame3Layout->addLayout( groupFlipLayout );
 
 	buttonLayout = new QHBoxLayout;
-	buttonLayout->setMargin(0);
-	buttonLayout->setSpacing(5);
+	buttonLayout->setContentsMargins(0, 0, 0, 0);
+	buttonLayout->setSpacing(6);
 	QSpacerItem* hspacing = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
 	buttonLayout->addItem(hspacing);
 	buttonOk = new QPushButton( this );
diff --git a/scribus/ui/prefs_hyphenatorbase.ui b/scribus/ui/prefs_hyphenatorbase.ui
index da3285600..1f6b56827 100644
--- a/scribus/ui/prefs_hyphenatorbase.ui
+++ b/scribus/ui/prefs_hyphenatorbase.ui
@@ -11,24 +11,24 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
       <font>
        <pointsize>14</pointsize>
        <weight>75</weight>
@@ -108,21 +108,6 @@
             <string>Exceptions</string>
            </property>
            <layout class="QGridLayout" name="_2">
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
-            <property name="spacing">
-             <number>5</number>
-            </property>
             <item row="0" column="0" colspan="4">
              <widget class="QListWidget" name="exceptionListWidget"/>
             </item>
@@ -169,21 +154,6 @@
             <string>Ignore List</string>
            </property>
            <layout class="QGridLayout" name="_3">
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
-            <property name="spacing">
-             <number>5</number>
-            </property>
             <item row="0" column="0" colspan="4">
              <widget class="QListWidget" name="ignoreListWidget">
               <property name="sizePolicy">
-- 
2.27.0

0001-Unify-margins-and-spacing-for-dialogs-set-8-C.patch (21,318 bytes)
From 957ed9912fba01bd462a1f43e64a73abefdbb7b2 Mon Sep 17 00:00:00 2001
Message-Id: <957ed9912fba01bd462a1f43e64a73abefdbb7b2.1613597688.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Wed, 17 Feb 2021 22:33:28 +0100
Subject: [PATCH] Unify margins and spacing for dialogs, set 8

---
 scribus/plugins/colorwheel/cwdialog.ui        | 162 +++---------------
 .../plugins/import/xps/xpsimportoptions.ui    |  15 +-
 scribus/ui/fontreplacedialog.cpp              |   8 +-
 scribus/ui/patternpropsdialog.cpp             |  32 ++--
 scribus/ui/prefs_hyphenatorbase.ui            |  66 ++-----
 5 files changed, 71 insertions(+), 212 deletions(-)

diff --git a/scribus/plugins/colorwheel/cwdialog.ui b/scribus/plugins/colorwheel/cwdialog.ui
index b1962d9d5..74c2a94a9 100644
--- a/scribus/plugins/colorwheel/cwdialog.ui
+++ b/scribus/plugins/colorwheel/cwdialog.ui
@@ -28,9 +28,6 @@
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
    <item row="0" column="0">
     <widget class="ColorWheel" name="colorWheel" native="true">
      <property name="sizePolicy">
@@ -41,13 +38,13 @@
      </property>
      <property name="minimumSize">
       <size>
-       <width>300</width>
+       <width>307</width>
        <height>300</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>300</width>
+       <width>307</width>
        <height>300</height>
       </size>
      </property>
@@ -62,21 +59,6 @@
       <string>Result Colors</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="1" column="0">
        <widget class="QTableWidget" name="currentColorTable">
         <property name="sizePolicy">
@@ -112,15 +94,15 @@
         <attribute name="horizontalHeaderVisible">
          <bool>false</bool>
         </attribute>
+        <attribute name="horizontalHeaderMinimumSectionSize">
+         <number>42</number>
+        </attribute>
         <attribute name="horizontalHeaderDefaultSectionSize">
          <number>42</number>
         </attribute>
         <attribute name="horizontalHeaderHighlightSections">
          <bool>false</bool>
         </attribute>
-        <attribute name="horizontalHeaderMinimumSectionSize">
-         <number>42</number>
-        </attribute>
         <attribute name="horizontalHeaderStretchLastSection">
          <bool>true</bool>
         </attribute>
@@ -183,26 +165,8 @@
       <string>Color Scheme Method</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="1" column="0">
        <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
         <property name="leftMargin">
          <number>0</number>
         </property>
@@ -264,9 +228,6 @@
    </item>
    <item row="3" column="0" colspan="2">
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
@@ -342,21 +303,6 @@
       <string>Preview:</string>
      </property>
      <layout class="QGridLayout">
-      <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>
-      <property name="spacing">
-       <number>6</number>
-      </property>
       <item row="2" column="0">
        <widget class="QLabel" name="previewLabel">
         <property name="minimumSize">
@@ -432,25 +378,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -487,9 +427,6 @@
        </item>
        <item row="1" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -526,9 +463,6 @@
        </item>
        <item row="2" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -565,9 +499,6 @@
        </item>
        <item row="3" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -604,9 +535,6 @@
        </item>
        <item row="4" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -649,9 +577,6 @@
        </item>
        <item row="5" column="0">
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -716,25 +641,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QVBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -749,9 +668,6 @@
          </property>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -785,9 +701,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -821,9 +734,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -857,9 +767,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -899,9 +806,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -965,25 +869,19 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <layout class="QVBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -998,9 +896,6 @@
          </property>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1034,9 +929,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1070,9 +962,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1106,9 +995,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1151,9 +1037,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="leftMargin">
             <number>0</number>
            </property>
@@ -1217,19 +1100,16 @@
       </attribute>
       <layout class="QGridLayout">
        <property name="leftMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="topMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="rightMargin">
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="bottomMargin">
-        <number>11</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
+        <number>9</number>
        </property>
        <item row="0" column="0">
         <widget class="ColorListBox" name="documentColorList" native="true"/>
diff --git a/scribus/plugins/import/xps/xpsimportoptions.ui b/scribus/plugins/import/xps/xpsimportoptions.ui
index 115ae9020..3ffc58b6a 100644
--- a/scribus/plugins/import/xps/xpsimportoptions.ui
+++ b/scribus/plugins/import/xps/xpsimportoptions.ui
@@ -17,6 +17,18 @@
    <bool>true</bool>
   </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" name="horizontalLayout_5">
      <item>
@@ -104,9 +116,6 @@
         </item>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="spacing">
-           <number>3</number>
-          </property>
           <property name="leftMargin">
            <number>15</number>
           </property>
diff --git a/scribus/ui/fontreplacedialog.cpp b/scribus/ui/fontreplacedialog.cpp
index 136a61177..e173fa640 100644
--- a/scribus/ui/fontreplacedialog.cpp
+++ b/scribus/ui/fontreplacedialog.cpp
@@ -31,8 +31,8 @@ FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *R
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	ReplaceList = RList;
 	FontReplaceDialogLayout = new QVBoxLayout( this );
-	FontReplaceDialogLayout->setMargin(10);
-	FontReplaceDialogLayout->setSpacing(5);
+	FontReplaceDialogLayout->setContentsMargins(9, 9, 9, 9);
+	FontReplaceDialogLayout->setSpacing(6);
 
 	textLabel1 = new QLabel(this);
 	textLabel1->setAlignment(Qt::AlignVCenter);
@@ -66,8 +66,8 @@ FontReplaceDialog::FontReplaceDialog( QWidget* parent, QMap<QString, QString> *R
 	FontReplaceDialogLayout->addWidget( replacementTable );
 
 	layout1 = new QHBoxLayout;
-	layout1->setMargin(0);
-	layout1->setSpacing(5);
+	layout1->setContentsMargins(0, 0, 0, 0);
+	layout1->setSpacing(6);
 	stickyReplacements = new QCheckBox( this );
 	stickyReplacements->setText( tr( "Make these substitutions permanent" ) );
 	layout1->addWidget(stickyReplacements);
diff --git a/scribus/ui/patternpropsdialog.cpp b/scribus/ui/patternpropsdialog.cpp
index 0c5301f0e..c4262ccd1 100644
--- a/scribus/ui/patternpropsdialog.cpp
+++ b/scribus/ui/patternpropsdialog.cpp
@@ -30,13 +30,13 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	setModal(true);
 	forStroke = isStroke;
 	frame3Layout = new QVBoxLayout( this );
-	frame3Layout->setMargin(0);
-	frame3Layout->setSpacing(2);
+	frame3Layout->setContentsMargins(9, 9, 9, 9);
+	frame3Layout->setSpacing(6);
 
 	groupOffset = new QGroupBox( this );
 	groupOffsetLayout = new QHBoxLayout( groupOffset );
-	groupOffsetLayout->setSpacing( 2 );
-	groupOffsetLayout->setMargin( 3 );
+	groupOffsetLayout->setSpacing(6);
+	groupOffsetLayout->setContentsMargins(9, 9, 9, 9);
 	groupOffsetLayout->setAlignment( Qt::AlignTop );
 	textLabel1 = new QLabel( groupOffset );
 	groupOffsetLayout->addWidget( textLabel1 );
@@ -50,8 +50,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 
 	groupScale = new QGroupBox( this );
 	groupScaleLayout = new QGridLayout( groupScale );
-	groupScaleLayout->setSpacing( 2 );
-	groupScaleLayout->setMargin( 3 );
+	groupScaleLayout->setSpacing(6);
+	groupScaleLayout->setContentsMargins(9, 9, 9, 9);
 	groupScaleLayout->setAlignment( Qt::AlignTop );
 	textLabel5 = new QLabel( groupScale );
 	groupScaleLayout->addWidget( textLabel5, 0, 0 );
@@ -71,8 +71,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	frame3Layout->addWidget( groupScale );
 	groupRotation = new QGroupBox( this );
 	groupRotationLayout = new QHBoxLayout( groupRotation );
-	groupRotationLayout->setSpacing( 2 );
-	groupRotationLayout->setMargin( 3 );
+	groupRotationLayout->setSpacing(6);
+	groupRotationLayout->setContentsMargins(9, 9, 9, 9);
 	groupRotationLayout->setAlignment( Qt::AlignTop );
 	textLabel7 = new QLabel( groupRotation );
 	groupRotationLayout->addWidget( textLabel7 );
@@ -82,8 +82,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 
 	groupSkew = new QGroupBox( this );
 	groupSkewLayout = new QGridLayout( groupSkew );
-	groupSkewLayout->setSpacing( 2 );
-	groupSkewLayout->setMargin( 3 );
+	groupSkewLayout->setSpacing(6);
+	groupSkewLayout->setContentsMargins(9, 9, 9, 9);
 	groupSkewLayout->setAlignment( Qt::AlignTop );
 	textLabel8 = new QLabel( groupSkew );
 	groupSkewLayout->addWidget( textLabel8, 0, 0 );
@@ -101,8 +101,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	{
 		groupSpace = new QGroupBox( this );
 		groupSpaceLayout = new QHBoxLayout( groupSpace );
-		groupSpaceLayout->setSpacing( 2 );
-		groupSpaceLayout->setMargin( 3 );
+		groupSpaceLayout->setSpacing(6);
+		groupSpaceLayout->setContentsMargins(9, 9, 9, 9);
 		groupSpaceLayout->setAlignment( Qt::AlignTop );
 		textLabel20 = new QLabel( groupSpace );
 		groupSpaceLayout->addWidget( textLabel20 );
@@ -113,8 +113,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	}
 
 	groupFlipLayout = new QHBoxLayout();
-	groupFlipLayout->setSpacing( 2 );
-	groupFlipLayout->setMargin( 3 );
+	groupFlipLayout->setSpacing(6);
+	groupFlipLayout->setContentsMargins(0, 0, 0, 0);
 	textLabel15 = new QLabel( this );
 	groupFlipLayout->addWidget( textLabel15 );
 	QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -130,8 +130,8 @@ PatternPropsDialog::PatternPropsDialog(QWidget* parent, int unitIndex, bool isSt
 	frame3Layout->addLayout( groupFlipLayout );
 
 	buttonLayout = new QHBoxLayout;
-	buttonLayout->setMargin(0);
-	buttonLayout->setSpacing(5);
+	buttonLayout->setContentsMargins(0, 0, 0, 0);
+	buttonLayout->setSpacing(6);
 	QSpacerItem* hspacing = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
 	buttonLayout->addItem(hspacing);
 	buttonOk = new QPushButton( this );
diff --git a/scribus/ui/prefs_hyphenatorbase.ui b/scribus/ui/prefs_hyphenatorbase.ui
index da3285600..1f6b56827 100644
--- a/scribus/ui/prefs_hyphenatorbase.ui
+++ b/scribus/ui/prefs_hyphenatorbase.ui
@@ -11,24 +11,24 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
       <font>
        <pointsize>14</pointsize>
        <weight>75</weight>
@@ -108,21 +108,6 @@
             <string>Exceptions</string>
            </property>
            <layout class="QGridLayout" name="_2">
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
-            <property name="spacing">
-             <number>5</number>
-            </property>
             <item row="0" column="0" colspan="4">
              <widget class="QListWidget" name="exceptionListWidget"/>
             </item>
@@ -169,21 +154,6 @@
             <string>Ignore List</string>
            </property>
            <layout class="QGridLayout" name="_3">
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
-            <property name="spacing">
-             <number>5</number>
-            </property>
             <item row="0" column="0" colspan="4">
              <widget class="QListWidget" name="ignoreListWidget">
               <property name="sizePolicy">
-- 
2.27.0

xpsimportoptions-2.gif (29,587 bytes)
xpsimportoptions-2.gif (29,587 bytes)

jghali

2021-02-18 13:55

administrator   ~0048857

Last edited: 2021-02-18 13:56

View 3 revisions

Applied, thanks! In the end, I used a compromise between patch B and C plus some additional adjustments to improve behavior when resizing XPS import dialog. Patch B was indeed not fixing the issue I mentioned as resizing the dialog made the issue re-appear.

Issue History

Date Modified Username Field Change
2021-02-16 21:57 bubu New Issue
2021-02-16 21:57 bubu File Added: 0001-Unify-margins-and-spacing-for-dialogs-set-8.patch
2021-02-16 21:57 bubu File Added: patternpropsdialog.gif
2021-02-16 21:57 bubu File Added: fontreplacedialog.gif
2021-02-16 21:57 bubu File Added: xpsimportoptions.gif
2021-02-16 21:57 bubu File Added: cwdialog.gif
2021-02-16 21:57 bubu File Added: prefs_hyphenator.gif
2021-02-17 20:21 PeterBenedek Relationship added child of 0013906
2021-02-17 21:12 jghali File Added: 16476_xps_import_dialog.png
2021-02-17 21:12 jghali Note Added: 0048854
2021-02-17 21:40 bubu File Added: 0001-Unify-margins-and-spacing-for-dialogs-set-8-B.patch
2021-02-17 21:40 bubu File Added: 0001-Unify-margins-and-spacing-for-dialogs-set-8-C.patch
2021-02-17 21:40 bubu File Added: xpsimportoptions-2.gif
2021-02-17 21:40 bubu Note Added: 0048855
2021-02-18 13:55 jghali Assigned To => jghali
2021-02-18 13:55 jghali Status new => resolved
2021-02-18 13:55 jghali Resolution open => fixed
2021-02-18 13:55 jghali Fixed in Version => 1.5.7.svn
2021-02-18 13:55 jghali Note Added: 0048857
2021-02-18 13:56 jghali Note Edited: 0048857 View Revisions
2021-02-18 13:56 jghali Note Edited: 0048857 View Revisions