View Issue Details

IDProjectCategoryView StatusLast Update
0016486ScribusUser Interfacepublic2021-02-23 22:33
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Product Version1.5.7.svn 
Target VersionFixed in Version1.5.7.svn 
Summary0016486: Unify margins and spacing for dialogs, set 12
DescriptionI propose a new set of trivial margin/spacing adjustment for dialogs. I hope this is the last one.

Comments:
- scribus/ui/prefs_externaltoolsbase.ui: there is no visual change, no screenshot.
- scribus/ui/smstyleimport.ui: whitespace changes
- Others are trivial.
- Style Manager: Unfortunately, this patch increased the interface... but consistent. I will try to reduce dead space later.

Please review. Thanks.
TagsNo tags attached.
PatchNo

Activities

bubu

2021-02-20 22:17

reporter  

0001-Unify-margins-and-spacing-for-dialogs-set-12.patch (17,635 bytes)
From 8f11a75e8e2032fd7f64ba178e673f6f79e383ea Mon Sep 17 00:00:00 2001
Message-Id: <8f11a75e8e2032fd7f64ba178e673f6f79e383ea.1613857733.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sat, 20 Feb 2021 21:55:15 +0100
Subject: [PATCH] Unify margins and spacing for dialogs, set 12

---
 scribus/ui/colorsandfillsbase.ui      | 77 +++++++++++++-------------
 scribus/ui/prefs_externaltoolsbase.ui |  3 --
 scribus/ui/smcstylewidget.ui          | 45 ----------------
 scribus/ui/smlinestylewidget.ui       | 78 +++++++++++++++++----------
 scribus/ui/smpstylewidget.ui          | 21 --------
 scribus/ui/smstyleimport.ui           | 69 ++++++++++++++----------
 scribus/ui/stylemanager.ui            |  4 --
 7 files changed, 129 insertions(+), 168 deletions(-)

diff --git a/scribus/ui/colorsandfillsbase.ui b/scribus/ui/colorsandfillsbase.ui
index 06fec36a2..88458009f 100644
--- a/scribus/ui/colorsandfillsbase.ui
+++ b/scribus/ui/colorsandfillsbase.ui
@@ -14,31 +14,31 @@
    <string>Colors and Fills</string>
   </property>
   <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
-   <property name="leftMargin">
-    <number>9</number>
-   </property>
-   <property name="topMargin">
-    <number>9</number>
-   </property>
-   <property name="rightMargin">
-    <number>9</number>
-   </property>
-   <property name="bottomMargin">
-    <number>9</number>
-   </property>
-   <item>
-    <widget class="QTreeWidget" name="dataTree">
-     <property name="toolTip">
-      <string>If color management is enabled, an exclamation mark indicates that the color may be outside of the color gamut of the current printer profile selected. What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. More hints about gamut warnings are in the online help under Color Management. Registration colors will have a registration mark next to the color. Use Registration only for printers marks and crop marks.</string>
-     </property>
-     <attribute name="headerVisible">
-      <bool>false</bool>
+   <bool>false</bool>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <widget class="QTreeWidget" name="dataTree">
+     <property name="toolTip">
+      <string>If color management is enabled, an exclamation mark indicates that the color may be outside of the color gamut of the current printer profile selected. What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. More hints about gamut warnings are in the online help under Color Management. Registration colors will have a registration mark next to the color. Use Registration only for printers marks and crop marks.</string>
+     </property>
+     <attribute name="headerVisible">
+      <bool>false</bool>
      </attribute>
      <column>
       <property name="text">
@@ -115,18 +115,18 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_3">
-       <property name="title">
-        <string>Color Sets</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Current Color Set:</string>
-          </property>
-         </widget>
+     <item>
+      <widget class="QGroupBox" name="groupBox_3">
+       <property name="title">
+        <string>Color Sets</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Current Color Set:</string>
+          </property>
+         </widget>
         </item>
         <item>
          <widget class="SwatchCombo" name="LoadColSet">
@@ -172,9 +172,6 @@
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_4">
-       <property name="spacing">
-        <number>5</number>
-       </property>
        <item>
         <widget class="QPushButton" name="okButton">
          <property name="toolTip">
diff --git a/scribus/ui/prefs_externaltoolsbase.ui b/scribus/ui/prefs_externaltoolsbase.ui
index 2447d9742..cb9fc8433 100644
--- a/scribus/ui/prefs_externaltoolsbase.ui
+++ b/scribus/ui/prefs_externaltoolsbase.ui
@@ -541,9 +541,6 @@
          </item>
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <item>
             <widget class="QPushButton" name="latexConfigUpButton">
              <property name="text">
diff --git a/scribus/ui/smcstylewidget.ui b/scribus/ui/smcstylewidget.ui
index 2835854cd..276c90c20 100644
--- a/scribus/ui/smcstylewidget.ui
+++ b/scribus/ui/smcstylewidget.ui
@@ -77,21 +77,6 @@
             <string>Basic Formatting</string>
            </property>
            <layout class="QVBoxLayout" name="_4">
-            <property name="spacing">
-             <number>3</number>
-            </property>
-            <property name="leftMargin">
-             <number>5</number>
-            </property>
-            <property name="topMargin">
-             <number>5</number>
-            </property>
-            <property name="rightMargin">
-             <number>5</number>
-            </property>
-            <property name="bottomMargin">
-             <number>5</number>
-            </property>
             <item>
              <widget class="SMFontComboH" name="fontFace_" native="true">
               <property name="sizePolicy">
@@ -282,21 +267,6 @@
             <string>Advanced Formatting</string>
            </property>
            <layout class="QVBoxLayout" name="_7">
-            <property name="spacing">
-             <number>3</number>
-            </property>
-            <property name="leftMargin">
-             <number>5</number>
-            </property>
-            <property name="topMargin">
-             <number>5</number>
-            </property>
-            <property name="rightMargin">
-             <number>5</number>
-            </property>
-            <property name="bottomMargin">
-             <number>5</number>
-            </property>
             <item>
              <layout class="QHBoxLayout" name="_8">
               <item>
@@ -564,21 +534,6 @@
             <string>Colors</string>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout">
-            <property name="spacing">
-             <number>3</number>
-            </property>
-            <property name="leftMargin">
-             <number>5</number>
-            </property>
-            <property name="topMargin">
-             <number>5</number>
-            </property>
-            <property name="rightMargin">
-             <number>5</number>
-            </property>
-            <property name="bottomMargin">
-             <number>5</number>
-            </property>
             <item>
              <layout class="QHBoxLayout" name="_2">
               <item>
diff --git a/scribus/ui/smlinestylewidget.ui b/scribus/ui/smlinestylewidget.ui
index c43fc77bc..9688b8fde 100644
--- a/scribus/ui/smlinestylewidget.ui
+++ b/scribus/ui/smlinestylewidget.ui
@@ -11,18 +11,18 @@
    </rect>
   </property>
   <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>5</number>
-   </property>
-   <property name="margin">
-    <number>5</number>
-   </property>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
      </property>
-     <property name="margin">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
@@ -95,10 +95,16 @@
    </item>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
      </property>
-     <property name="margin">
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
@@ -113,19 +119,31 @@
      </item>
      <item>
       <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
+       <property name="leftMargin">
+        <number>0</number>
        </property>
-       <property name="margin">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
         <layout class="QGridLayout">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
           <number>0</number>
          </property>
-         <property name="spacing">
-          <number>6</number>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
          </property>
          <item row="1" column="0">
           <widget class="QComboBox" name="endCombo">
@@ -154,11 +172,17 @@
        </item>
        <item>
         <layout class="QGridLayout">
-         <property name="margin">
+         <property name="leftMargin">
           <number>0</number>
          </property>
-         <property name="spacing">
-          <number>6</number>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
          </property>
          <item row="1" column="1">
           <widget class="QSpinBox" name="shadeBox">
@@ -269,12 +293,12 @@
       </layout>
      </item>
     </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>LineCombo</class>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LineCombo</class>
    <extends>QComboBox</extends>
    <header>ui/linecombo.h</header>
   </customwidget>
diff --git a/scribus/ui/smpstylewidget.ui b/scribus/ui/smpstylewidget.ui
index 49a463eb4..bd6e107bc 100644
--- a/scribus/ui/smpstylewidget.ui
+++ b/scribus/ui/smpstylewidget.ui
@@ -23,9 +23,6 @@
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <item>
         <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>5</number>
-         </property>
          <item>
           <widget class="QLabel" name="parentLabel">
            <property name="text">
@@ -654,21 +651,6 @@
           <string>Colors</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
-          <property name="spacing">
-           <number>3</number>
-          </property>
-          <property name="leftMargin">
-           <number>5</number>
-          </property>
-          <property name="topMargin">
-           <number>5</number>
-          </property>
-          <property name="rightMargin">
-           <number>5</number>
-          </property>
-          <property name="bottomMargin">
-           <number>5</number>
-          </property>
           <item>
            <layout class="QHBoxLayout" name="_6">
             <item>
@@ -1252,9 +1234,6 @@
        <string>Character Style</string>
       </attribute>
       <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
diff --git a/scribus/ui/smstyleimport.ui b/scribus/ui/smstyleimport.ui
index 7709d0d25..338f967df 100644
--- a/scribus/ui/smstyleimport.ui
+++ b/scribus/ui/smstyleimport.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SMStyleImport</class>
- <widget class="QDialog" name="SMStyleImport" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SMStyleImport">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,51 +10,63 @@
     <height>444</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Choose Styles</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
    <item>
-    <widget class="QTreeWidget" name="styleWidget" >
-     <property name="selectionMode" >
+    <widget class="QTreeWidget" name="styleWidget">
+     <property name="selectionMode">
       <enum>QAbstractItemView::NoSelection</enum>
      </property>
-     <property name="selectionBehavior" >
+     <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectItems</enum>
      </property>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Available Styles</string>
       </property>
      </column>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="importAllCheckBox" >
-     <property name="text" >
+    <widget class="QCheckBox" name="importAllCheckBox">
+     <property name="text">
       <string>Select or Unselect All</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>In case of a name clash</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="renameButton" >
-        <property name="text" >
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="renameButton">
+        <property name="text">
          <string>&amp;Rename Imported Style</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QRadioButton" name="replaceButton" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="replaceButton">
+        <property name="text">
          <string>R&amp;eplace Existing Style</string>
         </property>
        </widget>
@@ -62,11 +75,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -81,11 +94,11 @@
    <receiver>SMStyleImport</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>252</x>
      <y>419</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -97,11 +110,11 @@
    <receiver>SMStyleImport</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>299</x>
      <y>419</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
diff --git a/scribus/ui/stylemanager.ui b/scribus/ui/stylemanager.ui
index 1ad16b74f..be11f8d6a 100644
--- a/scribus/ui/stylemanager.ui
+++ b/scribus/ui/stylemanager.ui
@@ -359,9 +359,6 @@
      </item>
      <item>
       <layout class="QHBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -446,7 +443,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>StyleView</class>
-- 
2.27.0

colorsandfillsbase.gif (34,373 bytes)
colorsandfillsbase.gif (34,373 bytes)
smstyleimport.gif (43,591 bytes)
smstyleimport.gif (43,591 bytes)
sm.gif (451,452 bytes)
sm.gif (451,452 bytes)

jghali

2021-02-23 22:33

administrator   ~0048875

Applied, thanks! I added a few modifications of my own, especially in smcstylewidget.ui

Issue History

Date Modified Username Field Change
2021-02-20 22:17 bubu New Issue
2021-02-20 22:17 bubu File Added: 0001-Unify-margins-and-spacing-for-dialogs-set-12.patch
2021-02-20 22:17 bubu File Added: colorsandfillsbase.gif
2021-02-20 22:17 bubu File Added: smstyleimport.gif
2021-02-20 22:17 bubu File Added: sm.gif
2021-02-23 22:33 jghali Assigned To => jghali
2021-02-23 22:33 jghali Status new => resolved
2021-02-23 22:33 jghali Resolution open => fixed
2021-02-23 22:33 jghali Fixed in Version => 1.5.7.svn
2021-02-23 22:33 jghali Note Added: 0048875