View Issue Details

IDProjectCategoryView StatusLast Update
0016465ScribusUser Interfacepublic2021-02-08 22:42
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Product Version1.5.7.svn 
Target VersionFixed in Version1.5.7.svn 
Summary0016465: Unify margins and spacing for dialogs, set 5
DescriptionI propose a new set of trivial margin/spacing corrections for dialogs:
- Arc settings dialog
- Spiral settings dialog
- Latex editor dialog
- Lorem Ipsum dialog
- Setup Printer dialog
- Setup printer margins dialog (there are whitespace modifications)
- PDP options dialog (on exporting)
- Recovery dialog (exceptionally, I didn’t take a screenshot of it.)

Please review the patch. Thanks.
TagsNo tags attached.
PatchNo

Activities

bubu

2021-02-08 22:26

reporter  

0001-Unify-margins-and-spacing-for-dialogs-set-5.patch (36,312 bytes)
From 11cd175f9f572641f59801b2a08785349868f842 Mon Sep 17 00:00:00 2001
Message-Id: <11cd175f9f572641f59801b2a08785349868f842.1612822748.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Mon, 8 Feb 2021 23:19:01 +0100
Subject: [PATCH] Unify margins and spacing for dialogs, set 5

---
 scribus/ui/arcvectorbase.ui           |  12 +
 scribus/ui/latexeditor.ui             |  12 +
 scribus/ui/loremipsum.cpp             |  16 +-
 scribus/ui/printdialogbase.ui         |  48 +---
 scribus/ui/recoverdialog.ui           |  12 +
 scribus/ui/spiralvectorbase.ui        |  12 +
 scribus/ui/tabpdfoptions.ui           | 380 +-------------------------
 scribus/ui/useprintermarginsdialog.ui | 148 +++++-----
 8 files changed, 152 insertions(+), 488 deletions(-)

diff --git a/scribus/ui/arcvectorbase.ui b/scribus/ui/arcvectorbase.ui
index e264d90d4..c609655ea 100644
--- a/scribus/ui/arcvectorbase.ui
+++ b/scribus/ui/arcvectorbase.ui
@@ -23,6 +23,18 @@
    <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">
diff --git a/scribus/ui/latexeditor.ui b/scribus/ui/latexeditor.ui
index 009bebbdf..4af72149c 100644
--- a/scribus/ui/latexeditor.ui
+++ b/scribus/ui/latexeditor.ui
@@ -14,6 +14,18 @@
    <string>Editor</string>
   </property>
   <layout class="QVBoxLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
    <item>
     <widget class="QSplitter" name="splitter">
      <property name="sizePolicy">
diff --git a/scribus/ui/loremipsum.cpp b/scribus/ui/loremipsum.cpp
index 36bf982c4..9518e9fb2 100644
--- a/scribus/ui/loremipsum.cpp
+++ b/scribus/ui/loremipsum.cpp
@@ -138,12 +138,12 @@ LoremManager::LoremManager(ScribusDoc* doc, QWidget* parent) : QDialog( parent )
 	setWindowTitle( tr( "Lorem Ipsum" ) );
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	LoremManagerLayout = new QGridLayout(this) ;
-	LoremManagerLayout->setMargin(10);
-	LoremManagerLayout->setSpacing(5);
+	LoremManagerLayout->setContentsMargins(9, 9, 9, 9);
+	LoremManagerLayout->setSpacing(6);
 
 	layout3 = new QVBoxLayout;
-	layout3->setMargin(0);
-	layout3->setSpacing(5);
+	layout3->setContentsMargins(0, 0, 0, 0);
+	layout3->setSpacing(6);
 
 	loremList = new QTreeWidget( this );
 	loremList->setRootIsDecorated(true);
@@ -155,8 +155,8 @@ LoremManager::LoremManager(ScribusDoc* doc, QWidget* parent) : QDialog( parent )
 	layout3->addWidget( loremList );
 
 	layout2 = new QHBoxLayout;
-	layout2->setMargin(0);
-	layout2->setSpacing(5);
+	layout2->setContentsMargins(0, 0, 0, 0);
+	layout2->setSpacing(6);
 
 	paraLabel = new QLabel( this );
 	layout2->addWidget( paraLabel );
@@ -180,8 +180,8 @@ LoremManager::LoremManager(ScribusDoc* doc, QWidget* parent) : QDialog( parent )
 //	layout3->addLayout( layout4 );
 
 	layout1 = new QHBoxLayout;
-	layout1->setMargin(0);
-	layout1->setSpacing(5);
+	layout1->setContentsMargins(0, 0, 0, 0);
+	layout1->setSpacing(6);
 	buttonSpacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	layout1->addItem( buttonSpacer );
 
diff --git a/scribus/ui/printdialogbase.ui b/scribus/ui/printdialogbase.ui
index c9624e555..eb9578848 100644
--- a/scribus/ui/printdialogbase.ui
+++ b/scribus/ui/printdialogbase.ui
@@ -17,32 +17,26 @@
    <bool>false</bool>
   </property>
   <layout class="QVBoxLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="PrintDialogGroup">
      <property name="title">
       <string>Print Destination</string>
      </property>
      <layout class="QVBoxLayout">
-      <property name="spacing">
-       <number>5</number>
-      </property>
-      <property name="leftMargin">
-       <number>10</number>
-      </property>
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="rightMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
-       <number>10</number>
-      </property>
       <item>
        <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>5</number>
-        </property>
         <item>
          <widget class="QComboBox" name="PrintDest">
           <property name="minimumSize">
@@ -77,9 +71,6 @@
       </item>
       <item>
        <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>5</number>
-        </property>
         <item>
          <widget class="QLabel" name="DateiT">
           <property name="enabled">
@@ -169,21 +160,6 @@
       <string>Range</string>
      </property>
      <layout class="QGridLayout">
-      <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">
        <widget class="QRadioButton" name="printAllRadio">
         <property name="text">
diff --git a/scribus/ui/recoverdialog.ui b/scribus/ui/recoverdialog.ui
index 8a1f6f5e2..e5f45651e 100644
--- a/scribus/ui/recoverdialog.ui
+++ b/scribus/ui/recoverdialog.ui
@@ -17,6 +17,18 @@
    <string>Crash Recovery</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <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="QLabel" name="label">
      <property name="text">
diff --git a/scribus/ui/spiralvectorbase.ui b/scribus/ui/spiralvectorbase.ui
index dfde7766e..b1562f196 100644
--- a/scribus/ui/spiralvectorbase.ui
+++ b/scribus/ui/spiralvectorbase.ui
@@ -23,6 +23,18 @@
    <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">
diff --git a/scribus/ui/tabpdfoptions.ui b/scribus/ui/tabpdfoptions.ui
index d8ea86056..96e573ee9 100644
--- a/scribus/ui/tabpdfoptions.ui
+++ b/scribus/ui/tabpdfoptions.ui
@@ -18,47 +18,26 @@
     <string>&amp;General</string>
    </attribute>
    <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>5</number>
-    </property>
     <property name="leftMargin">
-     <number>10</number>
+     <number>9</number>
     </property>
     <property name="topMargin">
-     <number>10</number>
+     <number>9</number>
     </property>
     <property name="rightMargin">
-     <number>10</number>
+     <number>9</number>
     </property>
     <property name="bottomMargin">
-     <number>10</number>
+     <number>9</number>
     </property>
     <item>
      <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>5</number>
-      </property>
       <item>
        <widget class="QGroupBox" name="RangeGroup">
         <property name="title">
          <string>Export Range</string>
         </property>
         <layout class="QVBoxLayout" name="rangeGroupLayout">
-         <property name="spacing">
-          <number>5</number>
-         </property>
-         <property name="leftMargin">
-          <number>10</number>
-         </property>
-         <property name="topMargin">
-          <number>10</number>
-         </property>
-         <property name="rightMargin">
-          <number>10</number>
-         </property>
-         <property name="bottomMargin">
-          <number>10</number>
-         </property>
          <item>
           <widget class="QRadioButton" name="AllPages">
            <property name="text">
@@ -68,14 +47,8 @@
          </item>
          <item>
           <layout class="QGridLayout" name="gridLayout">
-           <property name="spacing">
-            <number>5</number>
-           </property>
            <item row="1" column="0">
             <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <property name="spacing">
-              <number>5</number>
-             </property>
              <item>
               <widget class="QLineEdit" name="PageNr"/>
              </item>
@@ -95,9 +68,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_3">
-           <property name="spacing">
-            <number>5</number>
-           </property>
            <item>
             <widget class="QLabel" name="rotationLabel">
              <property name="text">
@@ -139,9 +109,6 @@
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <property name="spacing">
-            <number>5</number>
-           </property>
            <item>
             <widget class="QToolButton" name="MirrorH">
              <property name="text">
@@ -183,21 +150,6 @@
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
         </property>
         <layout class="QGridLayout" name="fileOptionsLayout">
-         <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">
           <widget class="QLabel" name="label">
            <property name="text">
@@ -327,21 +279,6 @@
        <string>Image Quality Settings</string>
       </property>
       <layout class="QGridLayout" name="imageQualityLayout">
-       <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">
         <widget class="QLabel" name="label_4">
          <property name="text">
@@ -467,39 +404,12 @@
     <string>&amp;Fonts</string>
    </attribute>
    <layout class="QVBoxLayout" name="verticalLayout_2">
-    <property name="spacing">
-     <number>5</number>
-    </property>
-    <property name="leftMargin">
-     <number>10</number>
-    </property>
-    <property name="topMargin">
-     <number>10</number>
-    </property>
-    <property name="rightMargin">
-     <number>10</number>
-    </property>
-    <property name="bottomMargin">
-     <number>10</number>
-    </property>
     <item>
      <widget class="QGroupBox" name="groupFont">
       <property name="title">
        <string>Embedding</string>
       </property>
       <layout class="QVBoxLayout" name="groupFontLayout">
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>10</number>
-       </property>
-       <property name="rightMargin">
-        <number>10</number>
-       </property>
-       <property name="bottomMargin">
-        <number>10</number>
-       </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
@@ -524,9 +434,6 @@
         <layout class="QHBoxLayout" name="horizontalLayout_9">
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_6">
-           <property name="spacing">
-            <number>5</number>
-           </property>
            <item>
             <widget class="QLabel" name="label_8">
              <property name="text">
@@ -548,9 +455,6 @@
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_8">
-           <property name="spacing">
-            <number>5</number>
-           </property>
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
@@ -595,9 +499,6 @@
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_5">
-           <property name="spacing">
-            <number>5</number>
-           </property>
            <item>
             <widget class="QLabel" name="label_9">
              <property name="text">
@@ -629,21 +530,6 @@
     <string>E&amp;xtras</string>
    </attribute>
    <layout class="QGridLayout" name="gridLayout_4">
-    <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">
      <widget class="QCheckBox" name="CheckBox10">
       <property name="text">
@@ -878,47 +764,14 @@
     <string>Viewer</string>
    </attribute>
    <layout class="QVBoxLayout" name="verticalLayout_7">
-    <property name="spacing">
-     <number>5</number>
-    </property>
-    <property name="leftMargin">
-     <number>10</number>
-    </property>
-    <property name="topMargin">
-     <number>10</number>
-    </property>
-    <property name="rightMargin">
-     <number>10</number>
-    </property>
-    <property name="bottomMargin">
-     <number>10</number>
-    </property>
     <item>
      <widget class="QGroupBox" name="groupDisplay">
       <property name="title">
        <string>Display Settings</string>
       </property>
       <layout class="QVBoxLayout" name="groupDisplayLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>10</number>
-       </property>
-       <property name="rightMargin">
-        <number>10</number>
-       </property>
-       <property name="bottomMargin">
-        <number>10</number>
-       </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <property name="spacing">
-          <number>5</number>
-         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -937,21 +790,6 @@
             <string>Document Layout</string>
            </property>
            <layout class="QVBoxLayout" name="pageLayoutLayout">
-            <property name="spacing">
-             <number>5</number>
-            </property>
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
             <item>
              <widget class="QRadioButton" name="singlePage">
               <property name="text">
@@ -989,21 +827,6 @@
             <string>Visual Appearance</string>
            </property>
            <layout class="QVBoxLayout" name="groupNavigationLayout">
-            <property name="spacing">
-             <number>5</number>
-            </property>
-            <property name="leftMargin">
-             <number>10</number>
-            </property>
-            <property name="topMargin">
-             <number>10</number>
-            </property>
-            <property name="rightMargin">
-             <number>10</number>
-            </property>
-            <property name="bottomMargin">
-             <number>10</number>
-            </property>
             <item>
              <widget class="QRadioButton" name="useViewDefault">
               <property name="text">
@@ -1071,21 +894,6 @@
           <string>Special Actions</string>
          </property>
          <layout class="QHBoxLayout" name="groupJavaLayout">
-          <property name="spacing">
-           <number>5</number>
-          </property>
-          <property name="leftMargin">
-           <number>10</number>
-          </property>
-          <property name="topMargin">
-           <number>10</number>
-          </property>
-          <property name="rightMargin">
-           <number>10</number>
-          </property>
-          <property name="bottomMargin">
-           <number>10</number>
-          </property>
           <item>
            <widget class="QLabel" name="actionLabel">
             <property name="text">
@@ -1119,21 +927,6 @@ when PDF document is opened:</string>
     <string>S&amp;ecurity</string>
    </attribute>
    <layout class="QVBoxLayout" name="verticalLayout_9">
-    <property name="spacing">
-     <number>5</number>
-    </property>
-    <property name="leftMargin">
-     <number>10</number>
-    </property>
-    <property name="topMargin">
-     <number>10</number>
-    </property>
-    <property name="rightMargin">
-     <number>10</number>
-    </property>
-    <property name="bottomMargin">
-     <number>10</number>
-    </property>
     <item>
      <widget class="QCheckBox" name="Encry">
       <property name="text">
@@ -1153,21 +946,6 @@ when PDF document is opened:</string>
        <string>Passwords</string>
       </property>
       <layout class="QGridLayout" name="groupPassLayout">
-       <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="1" column="0">
         <widget class="QLabel" name="TextSec2">
          <property name="text">
@@ -1217,21 +995,6 @@ when PDF document is opened:</string>
        <string>Settings</string>
       </property>
       <layout class="QVBoxLayout" name="groupSecSetLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>10</number>
-       </property>
-       <property name="rightMargin">
-        <number>10</number>
-       </property>
-       <property name="bottomMargin">
-        <number>10</number>
-       </property>
        <item>
         <widget class="QCheckBox" name="PrintSec">
          <property name="text">
@@ -1283,42 +1046,12 @@ when PDF document is opened:</string>
     <string>C&amp;olor</string>
    </attribute>
    <layout class="QVBoxLayout" name="tabColorLayout">
-    <property name="spacing">
-     <number>5</number>
-    </property>
-    <property name="leftMargin">
-     <number>10</number>
-    </property>
-    <property name="topMargin">
-     <number>10</number>
-    </property>
-    <property name="rightMargin">
-     <number>10</number>
-    </property>
-    <property name="bottomMargin">
-     <number>10</number>
-    </property>
     <item>
      <widget class="QGroupBox" name="ColorGroup">
       <property name="title">
        <string>General</string>
       </property>
       <layout class="QHBoxLayout" name="colorGroupLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>10</number>
-       </property>
-       <property name="rightMargin">
-        <number>10</number>
-       </property>
-       <property name="bottomMargin">
-        <number>10</number>
-       </property>
        <item>
         <widget class="QLabel" name="label_16">
          <property name="text">
@@ -1371,21 +1104,6 @@ when PDF document is opened:</string>
        <string>Rendering Settings</string>
       </property>
       <layout class="QGridLayout" name="lpiGroupLayout">
-       <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">
         <widget class="QComboBox" name="LPIcolor"/>
        </item>
@@ -1490,21 +1208,6 @@ when PDF document is opened:</string>
        <string>Solid Colors:</string>
       </property>
       <layout class="QGridLayout" name="solidColorsGroupLayout">
-       <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="1" column="0">
         <widget class="QLabel" name="solidsProfileLabel">
          <property name="text">
@@ -1565,21 +1268,6 @@ when PDF document is opened:</string>
        <string>Images:</string>
       </property>
       <layout class="QGridLayout" name="imageProfileGroupLayout">
-       <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">
         <widget class="QCheckBox" name="EmbedProfs2">
          <property name="text">
@@ -1661,42 +1349,12 @@ when PDF document is opened:</string>
     <string>Pre-Press</string>
    </attribute>
    <layout class="QVBoxLayout" name="tabPDFXLayout">
-    <property name="spacing">
-     <number>5</number>
-    </property>
-    <property name="leftMargin">
-     <number>10</number>
-    </property>
-    <property name="topMargin">
-     <number>10</number>
-    </property>
-    <property name="rightMargin">
-     <number>10</number>
-    </property>
-    <property name="bottomMargin">
-     <number>10</number>
-    </property>
     <item>
      <widget class="QGroupBox" name="MarkGroup">
       <property name="title">
        <string>Printer Marks</string>
       </property>
       <layout class="QGridLayout" name="markGroupLayout">
-       <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="3" column="0">
         <widget class="QCheckBox" name="colorMarks">
          <property name="text">
@@ -1769,21 +1427,6 @@ when PDF document is opened:</string>
        <string>Bleed Settings</string>
       </property>
       <layout class="QGridLayout" name="bleedGroupLayout">
-       <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="1" column="0">
         <widget class="QLabel" name="bleedTopLabel">
          <property name="text">
@@ -1840,21 +1483,6 @@ when PDF document is opened:</string>
        <string>PDF/X Output Intent</string>
       </property>
       <layout class="QGridLayout" name="X3GroupLayout">
-       <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="1">
         <widget class="QComboBox" name="PrintProfC">
          <property name="editable">
diff --git a/scribus/ui/useprintermarginsdialog.ui b/scribus/ui/useprintermarginsdialog.ui
index 0eddde307..b633422bb 100644
--- a/scribus/ui/useprintermarginsdialog.ui
+++ b/scribus/ui/useprintermarginsdialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>UsePrinterMarginsDialog</class>
- <widget class="QDialog" name="UsePrinterMarginsDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="UsePrinterMarginsDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,29 +10,41 @@
     <height>185</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Use Printer Margins</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="selectPrinterLabel" >
-       <property name="text" >
+      <widget class="QLabel" name="selectPrinterLabel">
+       <property name="text">
         <string>Select &amp;Printer:</string>
        </property>
-       <property name="wordWrap" >
+       <property name="wordWrap">
         <bool>false</bool>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>printerComboBox</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="printerComboBox" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <widget class="QComboBox" name="printerComboBox">
+       <property name="sizePolicy">
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -41,42 +54,42 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="marginsGroupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="marginsGroupBox">
+     <property name="title">
       <string>Margins</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <layout class="QGridLayout" >
-        <item row="0" column="4" >
-         <widget class="QLineEdit" name="bottomLineEdit" >
-          <property name="readOnly" >
+       <layout class="QGridLayout">
+        <item row="0" column="4">
+         <widget class="QLineEdit" name="bottomLineEdit">
+          <property name="readOnly">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="3" >
-         <widget class="QLabel" name="rightLabel" >
-          <property name="text" >
+        <item row="1" column="3">
+         <widget class="QLabel" name="rightLabel">
+          <property name="text">
            <string>Right:</string>
           </property>
-          <property name="wordWrap" >
+          <property name="wordWrap">
            <bool>false</bool>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>rightLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
+        <item row="1" column="2">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
+          <property name="sizeType">
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint">
            <size>
             <width>40</width>
             <height>20</height>
@@ -84,75 +97,75 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="4" >
-         <widget class="QLineEdit" name="rightLineEdit" >
-          <property name="readOnly" >
+        <item row="1" column="4">
+         <widget class="QLineEdit" name="rightLineEdit">
+          <property name="readOnly">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="leftLineEdit" >
-          <property name="readOnly" >
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="leftLineEdit">
+          <property name="readOnly">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="topLabel" >
-          <property name="text" >
+        <item row="0" column="0">
+         <widget class="QLabel" name="topLabel">
+          <property name="text">
            <string>&amp;Top:</string>
           </property>
-          <property name="wordWrap" >
+          <property name="wordWrap">
            <bool>false</bool>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>topLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="0" column="3" >
-         <widget class="QLabel" name="bottomLabel" >
-          <property name="text" >
+        <item row="0" column="3">
+         <widget class="QLabel" name="bottomLabel">
+          <property name="text">
            <string>&amp;Bottom:</string>
           </property>
-          <property name="wordWrap" >
+          <property name="wordWrap">
            <bool>false</bool>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>bottomLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="leftLabel" >
-          <property name="text" >
+        <item row="1" column="0">
+         <widget class="QLabel" name="leftLabel">
+          <property name="text">
            <string>&amp;Left:</string>
           </property>
-          <property name="wordWrap" >
+          <property name="wordWrap">
            <bool>false</bool>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>leftLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="topLineEdit" >
-          <property name="readOnly" >
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="topLineEdit">
+          <property name="readOnly">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="2" >
+        <item row="0" column="2">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
+          <property name="sizeType">
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint">
            <size>
             <width>40</width>
             <height>20</height>
@@ -166,16 +179,16 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint">
         <size>
          <width>212</width>
          <height>20</height>
@@ -184,21 +197,21 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+O</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
         <string>&amp;Cancel</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+C</string>
        </property>
       </widget>
@@ -207,7 +220,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <resources/>
  <connections/>
 </ui>
-- 
2.27.0

arc.gif (14,814 bytes)
arc.gif (14,814 bytes)
spiral.gif (12,137 bytes)
spiral.gif (12,137 bytes)
latex_editor.gif (84,108 bytes)
latex_editor.gif (84,108 bytes)
lorem_ipsum.gif (29,405 bytes)
lorem_ipsum.gif (29,405 bytes)
printer_margins.gif (21,895 bytes)
printer_margins.gif (21,895 bytes)
setup_printer.gif (52,225 bytes)
setup_printer.gif (52,225 bytes)
tabpdfoptions.gif (474,625 bytes)
tabpdfoptions.gif (474,625 bytes)

jghali

2021-02-08 22:42

administrator   ~0048815

Applied, thanks!

Issue History

Date Modified Username Field Change
2021-02-08 22:26 bubu New Issue
2021-02-08 22:26 bubu File Added: 0001-Unify-margins-and-spacing-for-dialogs-set-5.patch
2021-02-08 22:26 bubu File Added: arc.gif
2021-02-08 22:26 bubu File Added: spiral.gif
2021-02-08 22:26 bubu File Added: latex_editor.gif
2021-02-08 22:26 bubu File Added: lorem_ipsum.gif
2021-02-08 22:26 bubu File Added: printer_margins.gif
2021-02-08 22:26 bubu File Added: setup_printer.gif
2021-02-08 22:26 bubu File Added: tabpdfoptions.gif
2021-02-08 22:42 jghali Assigned To => jghali
2021-02-08 22:42 jghali Status new => resolved
2021-02-08 22:42 jghali Resolution open => fixed
2021-02-08 22:42 jghali Fixed in Version => 1.5.7.svn
2021-02-08 22:42 jghali Note Added: 0048815