r24390 by jghali - #16420: Unify margins and spacing for dialogs, set 1 <bubu>

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 9 14:04:23 UTC 2021 

Author: jghali
Date: Sat Jan  9 14:04:22 2021
New Revision: 24390

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24390
Log:
#16420: Unify margins and spacing for dialogs, set 1 <bubu>

Modified:
    trunk/Scribus/scribus/ui/actionsearchdialog.ui
    trunk/Scribus/scribus/ui/javadocs.cpp
    trunk/Scribus/scribus/ui/marksmanager.ui
    trunk/Scribus/scribus/ui/measurementsbase.ui
    trunk/Scribus/scribus/ui/resourcemanagerbase.ui
    trunk/Scribus/scribus/ui/resourcemanagerlicensebase.ui
    trunk/Scribus/scribus/ui/selectobjects.ui

Modified: trunk/Scribus/scribus/ui/actionsearchdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/actionsearchdialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/actionsearchdialog.ui	(original)
+++ trunk/Scribus/scribus/ui/actionsearchdialog.ui	Sat Jan  9 14:04:22 2021
@@ -11,12 +11,24 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Action Search</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLineEdit" name="filterLineEdit">
-     <property name="placeholderText">
+   <string>Action Search</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <widget class="QLineEdit" name="filterLineEdit">
+     <property name="placeholderText">
       <string>Search for action...</string>
      </property>
     </widget>

Modified: trunk/Scribus/scribus/ui/javadocs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/javadocs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/javadocs.cpp	(original)
+++ trunk/Scribus/scribus/ui/javadocs.cpp	Sat Jan  9 14:04:22 2021
@@ -33,8 +33,8 @@
 	m_Doc = doc;
 	m_View = vie;
 	JavaDocsLayout = new QHBoxLayout(this);
-	JavaDocsLayout->setMargin(10);
-	JavaDocsLayout->setSpacing(5);
+	JavaDocsLayout->setContentsMargins(9, 9, 9, 9);
+	JavaDocsLayout->setSpacing(6);
 
 	Scripts = new QListWidget( this );
 	Scripts->setMinimumSize( QSize( 150, 200 ) );
@@ -44,8 +44,8 @@
 	JavaDocsLayout->addWidget( Scripts );
 
 	Layout1 = new QVBoxLayout;
-	Layout1->setMargin(0);
-	Layout1->setSpacing(5);
+	Layout1->setContentsMargins(0, 0, 0, 0);
+	Layout1->setSpacing(6);
 
 	EditScript = new QPushButton( tr( "&Edit..." ), this);
 	Layout1->addWidget( EditScript );

Modified: trunk/Scribus/scribus/ui/marksmanager.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/marksmanager.ui
==============================================================================
--- trunk/Scribus/scribus/ui/marksmanager.ui	(original)
+++ trunk/Scribus/scribus/ui/marksmanager.ui	Sat Jan  9 14:04:22 2021
@@ -26,12 +26,24 @@
    <string>Marks Manager</string>
   </property>
   <property name="modal">
-   <bool>false</bool>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QPushButton" name="UpdateButton">
-     <property name="sizePolicy">
+   <bool>false</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <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 row="1" column="0">
+    <widget class="QPushButton" name="UpdateButton">
+     <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>

Modified: trunk/Scribus/scribus/ui/measurementsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/measurementsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/measurementsbase.ui	(original)
+++ trunk/Scribus/scribus/ui/measurementsbase.ui	Sat Jan  9 14:04:22 2021
@@ -11,12 +11,24 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Measurements</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="x1Label">
-     <property name="text">
+   <string>Measurements</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <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 row="0" column="0">
+    <widget class="QLabel" name="x1Label">
+     <property name="text">
       <string>X1:</string>
      </property>
     </widget>

Modified: trunk/Scribus/scribus/ui/resourcemanagerbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/resourcemanagerbase.ui
==============================================================================
Binary files - no diff available.

Modified: trunk/Scribus/scribus/ui/resourcemanagerlicensebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/resourcemanagerlicensebase.ui
==============================================================================
Binary files - no diff available.

Modified: trunk/Scribus/scribus/ui/selectobjects.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24390&path=/trunk/Scribus/scribus/ui/selectobjects.ui
==============================================================================
--- trunk/Scribus/scribus/ui/selectobjects.ui	(original)
+++ trunk/Scribus/scribus/ui/selectobjects.ui	Sat Jan  9 14:04:22 2021
@@ -20,30 +20,30 @@
    <string>Select All Items</string>
   </property>
   <property name="modal">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>5</number>
-   </property>
-   <property name="margin">
-    <number>10</number>
-   </property>
-   <item>
-    <widget class="QGroupBox" name="rangeGroup">
+   <bool>true</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="rangeGroup">
      <property name="title">
-      <string>Select All Items</string>
-     </property>
-     <layout class="QHBoxLayout">
-      <property name="spacing">
-       <number>5</number>
-      </property>
-      <property name="margin">
-       <number>10</number>
-      </property>
-      <item>
-       <widget class="QRadioButton" name="buttonCurrentPage">
-        <property name="toolTip">
+      <string>Select All Items</string>
+     </property>
+     <layout class="QHBoxLayout">
+      <item>
+       <widget class="QRadioButton" name="buttonCurrentPage">
+        <property name="toolTip">
          <string>Select all items on the current page</string>
         </property>
         <property name="text">
@@ -89,18 +89,12 @@
       <bool>true</bool>
      </property>
      <property name="checked">
-      <bool>false</bool>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>10</number>
-      </property>
-      <property name="spacing">
-       <number>5</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="useItemType">
-        <property name="toolTip">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="useItemType">
+        <property name="toolTip">
          <string>Select based on item type</string>
         </property>
         <property name="text">

More information about the scribus-commit mailing list