View Issue Details

IDProjectCategoryView StatusLast Update
0016419ScribusUser Interfacepublic2021-01-09 13:57
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Product Version1.5.7.svn 
Target VersionFixed in Version 
Summary0016419: Unify margin and spacing for Replace Colors dialog
DescriptionIn this patch I propose to unify window margin and spacing for Replace Colors and child dialog. I collect and separate them to one patch because the diff is ugly due of space changes. Please review it. Thanks.
TagsNo tags attached.
PatchNo

Relationships

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

Activities

bubu

2021-01-08 21:21

reporter  

0001-Unify-margin-and-spacing-for-Replace-Colors.patch (10,432 bytes)
From 2561cf47918a0a1c72755e94de699d1db6dd893a Mon Sep 17 00:00:00 2001
Message-Id: <2561cf47918a0a1c72755e94de699d1db6dd893a.1610140740.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Fri, 8 Jan 2021 22:18:25 +0100
Subject: [PATCH] Unify margin and spacing for Replace Colors

- Unify margin and spacing
- Code style fixes: remove unnecessary spaces
---
 scribus/ui/replacecolors.ui   | 79 ++++++++++++++++++-------------
 scribus/ui/replaceonecolor.ui | 88 ++++++++++++++++-------------------
 2 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/scribus/ui/replacecolors.ui b/scribus/ui/replacecolors.ui
index 415f12905..1367e6e39 100644
--- a/scribus/ui/replacecolors.ui
+++ b/scribus/ui/replacecolors.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>replaceColorsDialog</class>
- <widget class="QDialog" name="replaceColorsDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="replaceColorsDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,30 +10,42 @@
     <height>400</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Replace Colors</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <property name="modal" >
+  <property name="modal">
    <bool>true</bool>
   </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="QTableWidget" name="replacementTable" >
-       <property name="minimumSize" >
+      <widget class="QTableWidget" name="replacementTable">
+       <property name="minimumSize">
         <size>
          <width>150</width>
          <height>150</height>
         </size>
        </property>
-       <property name="selectionBehavior" >
+       <property name="selectionBehavior">
         <enum>QAbstractItemView::SelectRows</enum>
        </property>
-       <property name="columnCount" >
+       <property name="columnCount">
         <number>2</number>
        </property>
        <column/>
@@ -40,46 +53,46 @@
       </widget>
      </item>
      <item>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout">
        <item>
-        <widget class="QPushButton" name="addButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="addButton">
+         <property name="text">
           <string>Add ...</string>
          </property>
-         <property name="autoDefault" >
+         <property name="autoDefault">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="removeButton" >
-         <property name="enabled" >
+        <widget class="QPushButton" name="removeButton">
+         <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Remove</string>
          </property>
-         <property name="autoDefault" >
+         <property name="autoDefault">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="editButton" >
-         <property name="enabled" >
+        <widget class="QPushButton" name="editButton">
+         <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Edit...</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>75</width>
            <height>41</height>
@@ -92,12 +105,12 @@
     </layout>
    </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" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -111,11 +124,11 @@
    <receiver>replaceColorsDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -127,11 +140,11 @@
    <receiver>replaceColorsDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
diff --git a/scribus/ui/replaceonecolor.ui b/scribus/ui/replaceonecolor.ui
index 0fb86b4a6..88af5a392 100644
--- a/scribus/ui/replaceonecolor.ui
+++ b/scribus/ui/replaceonecolor.ui
@@ -1,88 +1,80 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>replaceColorDialog</class>
- <widget class="QDialog" name="replaceColorDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="replaceColorDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>106</height>
+    <height>107</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Replace Color</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <property name="modal" >
+  <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>5</number>
+  <layout class="QVBoxLayout">
+   <property name="leftMargin">
+    <number>9</number>
    </property>
-   <property name="leftMargin" >
-    <number>10</number>
+   <property name="topMargin">
+    <number>9</number>
    </property>
-   <property name="topMargin" >
-    <number>10</number>
+   <property name="rightMargin">
+    <number>9</number>
    </property>
-   <property name="rightMargin" >
-    <number>10</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>10</number>
+   <property name="bottomMargin">
+    <number>9</number>
    </property>
    <item>
-    <layout class="QGridLayout" >
-     <property name="horizontalSpacing" >
-      <number>5</number>
-     </property>
-     <property name="verticalSpacing" >
-      <number>5</number>
-     </property>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+    <layout class="QGridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Replace:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="ColorCombo" name="originalColor" />
+     <item row="0" column="1">
+      <widget class="ColorCombo" name="originalColor"/>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>with:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="ColorCombo" name="replacementColor" />
+     <item row="1" column="1">
+      <widget class="ColorCombo" name="replacementColor"/>
      </item>
     </layout>
    </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" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -103,11 +95,11 @@
    <receiver>replaceColorDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -119,11 +111,11 @@
    <receiver>replaceColorDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
-- 
2.27.0

replace_colors.gif (30,708 bytes)
replace_colors.gif (30,708 bytes)

jghali

2021-01-09 13:57

administrator   ~0048658

Applied, thanks!

Issue History

Date Modified Username Field Change
2021-01-08 21:21 bubu New Issue
2021-01-08 21:21 bubu File Added: 0001-Unify-margin-and-spacing-for-Replace-Colors.patch
2021-01-08 21:21 bubu File Added: replace_colors.gif
2021-01-09 06:39 PeterBenedek Relationship added child of 0013906
2021-01-09 13:57 jghali Assigned To => jghali
2021-01-09 13:57 jghali Status new => resolved
2021-01-09 13:57 jghali Resolution open => fixed
2021-01-09 13:57 jghali Note Added: 0048658