r24439 by jghali - #16453: Unify margins and spacing for dialogs, set 3 <bubu>

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 31 22:45:12 UTC 2021


Author: jghali
Date: Sun Jan 31 22:45:12 2021
New Revision: 24439

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

Modified:
    trunk/Scribus/scribus/plugins/export/pixmapexport/exportform.ui
    trunk/Scribus/scribus/plugins/fontpreview/fontpreview.ui
    trunk/Scribus/scribus/plugins/short-words/swdialog.ui
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui
    trunk/Scribus/scribus/ui/copypagetomasterpage.ui
    trunk/Scribus/scribus/ui/guidemanager.ui

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/exportform.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24439&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/exportform.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/exportform.ui	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/exportform.ui	Sun Jan 31 22:45:12 2021
@@ -7,30 +7,27 @@
     <x>0</x>
     <y>0</y>
     <width>520</width>
-    <height>352</height>
+    <height>324</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Export as Image(s)</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="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <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="text">
@@ -74,12 +71,81 @@
        </layout>
       </widget>
      </item>
+     <item row="1" column="0">
+      <widget class="QGroupBox" name="rangeGroupBox">
+       <property name="title">
+        <string>Range</string>
+       </property>
+       <layout class="QGridLayout" name="rangeLayout">
+        <item row="2" column="0">
+         <widget class="QRadioButton" name="intervalPagesRadio">
+          <property name="text">
+           <string>&Range</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QRadioButton" name="allPagesRadio">
+          <property name="text">
+           <string>&All pages</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QPushButton" name="pageNrButton">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" colspan="3">
+         <widget class="QRadioButton" name="onePageRadio">
+          <property name="text">
+           <string>&Current page</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="rangeVal"/>
+        </item>
+        <item row="3" column="0">
+         <spacer>
+          <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>
+      </widget>
+     </item>
      <item row="0" column="1" rowspan="2">
       <widget class="QGroupBox" name="groupBox">
        <property name="title">
         <string>Options</string>
        </property>
        <layout class="QGridLayout" name="gridLayout1">
+        <item row="2" column="1">
+         <widget class="QSpinBox" name="DPIBox">
+          <property name="suffix">
+           <string> dpi</string>
+          </property>
+          <property name="minimum">
+           <number>72</number>
+          </property>
+          <property name="maximum">
+           <number>2400</number>
+          </property>
+          <property name="value">
+           <number>72</number>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -87,19 +153,6 @@
           </property>
           <property name="buddy">
            <cstring>bitmapType</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QComboBox" name="bitmapType"/>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>&Quality:</string>
-          </property>
-          <property name="buddy">
-           <cstring>qualityBox</cstring>
           </property>
          </widget>
         </item>
@@ -119,6 +172,53 @@
           </property>
          </widget>
         </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>&Size:</string>
+          </property>
+          <property name="buddy">
+           <cstring>enlargementBox</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="0">
+         <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>
+        <item row="6" column="0" colspan="2">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Image size in Pixels</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>&Quality:</string>
+          </property>
+          <property name="buddy">
+           <cstring>qualityBox</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0" colspan="2">
+         <widget class="QCheckBox" name="noBackground">
+          <property name="text">
+           <string>No Background</string>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="0">
          <widget class="QLabel" name="label_4">
           <property name="text">
@@ -129,29 +229,13 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
-         <widget class="QSpinBox" name="DPIBox">
-          <property name="suffix">
-           <string> dpi</string>
-          </property>
-          <property name="minimum">
-           <number>72</number>
-          </property>
-          <property name="maximum">
-           <number>2400</number>
-          </property>
-          <property name="value">
-           <number>72</number>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>&Size:</string>
-          </property>
-          <property name="buddy">
-           <cstring>enlargementBox</cstring>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="bitmapType"/>
+        </item>
+        <item row="7" column="0" colspan="2">
+         <widget class="QLabel" name="imageSizeLabel">
+          <property name="text">
+           <string/>
           </property>
          </widget>
         </item>
@@ -171,84 +255,8 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0" colspan="2">
-         <widget class="QCheckBox" name="noBackground">
-          <property name="text">
-           <string>No Background</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0" colspan="2">
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Image size in Pixels</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="imageSizeLabel">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QGroupBox" name="rangeGroupBox">
-       <property name="title">
-        <string>Range</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="QRadioButton" name="intervalPagesRadio">
-          <property name="text">
-           <string>&Range</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QRadioButton" name="allPagesRadio">
-          <property name="text">
-           <string>&All pages</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="QPushButton" name="pageNrButton">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" colspan="3">
-         <widget class="QRadioButton" name="onePageRadio">
-          <property name="text">
-           <string>&Current page</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="rangeVal"/>
-        </item>
-        <item row="3" column="0">
-         <spacer>
+        <item row="5" column="0">
+         <spacer name="verticalSpacer_2">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>

Modified: trunk/Scribus/scribus/plugins/fontpreview/fontpreview.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24439&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreview.ui	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreview.ui	Sun Jan 31 22:45:12 2021
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>FontPreview</class>
- <widget class="QDialog" name="FontPreview" >
-  <property name="geometry" >
+ <widget class="QDialog" name="FontPreview">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,151 +10,157 @@
     <height>463</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Fonts Preview</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" colspan="2" >
-    <widget class="QLabel" name="searchLabel" >
-     <property name="text" >
+  <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" colspan="2">
+    <widget class="QLabel" name="searchLabel">
+     <property name="text">
       <string>&Quick Search:</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>searchEdit</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" colspan="5" >
-    <widget class="QLineEdit" name="searchEdit" />
+   <item row="0" column="2" colspan="5">
+    <widget class="QLineEdit" name="searchEdit"/>
    </item>
-   <item row="1" column="0" colspan="7" >
-    <widget class="QCheckBox" name="extendedCheckBox" >
-     <property name="text" >
+   <item row="1" column="0" colspan="7">
+    <widget class="QCheckBox" name="extendedCheckBox">
+     <property name="text">
       <string>Show Extended Font Information</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="7" >
-    <widget class="FontListView" name="fontList" >
-     <property name="alternatingRowColors" >
+   <item row="2" column="0" colspan="7">
+    <widget class="FontListView" name="fontList">
+     <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
-     <property name="selectionMode" >
+     <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
-     <property name="selectionBehavior" >
+     <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
-     <property name="sortingEnabled" >
+     <property name="sortingEnabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="7" >
-    <widget class="QLabel" name="fontPreview" >
-     <property name="minimumSize" >
+   <item row="3" column="0" colspan="7">
+    <widget class="QLabel" name="fontPreview">
+     <property name="minimumSize">
       <size>
        <width>500</width>
        <height>100</height>
       </size>
      </property>
-     <property name="maximumSize" >
+     <property name="maximumSize">
       <size>
        <width>16777215</width>
        <height>100</height>
       </size>
      </property>
-     <property name="frameShape" >
+     <property name="frameShape">
       <enum>QFrame::Box</enum>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <widget class="QLabel" name="sizeLabel" >
-     <property name="text" >
+   <item row="4" column="0">
+    <widget class="QLabel" name="sizeLabel">
+     <property name="text">
       <string>&Font Size:</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>sizeSpin</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="2" >
-    <widget class="QSpinBox" name="sizeSpin" >
-     <property name="minimum" >
+   <item row="4" column="1" colspan="2">
+    <widget class="QSpinBox" name="sizeSpin">
+     <property name="minimum">
       <number>10</number>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <number>72</number>
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
-    <widget class="QLabel" name="displayLabel" >
-     <property name="text" >
+   <item row="4" column="3">
+    <widget class="QLabel" name="displayLabel">
+     <property name="text">
       <string>Text</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="4" >
-    <widget class="QLineEdit" name="displayEdit" >
-     <property name="toolTip" >
+   <item row="4" column="4">
+    <widget class="QLineEdit" name="displayEdit">
+     <property name="toolTip">
       <string>Sample text to display</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="5" >
-    <widget class="QPushButton" name="displayButton" >
-     <property name="toolTip" >
+   <item row="4" column="5">
+    <widget class="QPushButton" name="displayButton">
+     <property name="toolTip">
       <string>Set the preview text</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Se&t</string>
      </property>
-     <property name="shortcut" >
+     <property name="shortcut">
       <string>Alt+T</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="6" >
-    <widget class="QPushButton" name="resetDisplayButton" >
-     <property name="toolTip" >
+   <item row="4" column="6">
+    <widget class="QPushButton" name="resetDisplayButton">
+     <property name="toolTip">
       <string>Reset the text</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>&Default</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="7" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="margin" >
-      <number>0</number>
-     </property>
+   <item row="5" column="0" colspan="7">
+    <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" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -162,11 +169,11 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
         <string>&Close</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+C</string>
        </property>
       </widget>
@@ -175,7 +182,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <customwidgets>
   <customwidget>
    <class>FontListView</class>

Modified: trunk/Scribus/scribus/plugins/short-words/swdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24439&path=/trunk/Scribus/scribus/plugins/short-words/swdialog.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/swdialog.ui	(original)
+++ trunk/Scribus/scribus/plugins/short-words/swdialog.ui	Sun Jan 31 22:45:12 2021
@@ -11,12 +11,24 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Short Words</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="buttonGroup">
-     <property name="title">
+   <string>Short Words</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <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="QGroupBox" name="buttonGroup">
+     <property name="title">
       <string>Apply Unbreakable Space To:</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24439&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui	Sun Jan 31 22:45:12 2021
@@ -1,100 +1,113 @@
-<ui version="4.0" >
- <class>PathConnectDialogBase</class>
- <widget class="QDialog" name="PathConnectDialogBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PathConnectDialogBase</class>
+ <widget class="QDialog" name="PathConnectDialogBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
     <width>235</width>
-    <height>160</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Connect Paths</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Connect First Line</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="firstLinePoint" >
-     <item>
-      <property name="text" >
-       <string>Starting Point</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>End Point</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>with Second Line</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QComboBox" name="secondLinePoint" >
-     <item>
-      <property name="text" >
-       <string>Starting Point</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>End Point</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
-      <string>by using:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QComboBox" name="modeCombo" >
-     <item>
-      <property name="text" >
-       <string>a straight Line</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Points moving</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QCheckBox" name="previewCheck" >
-     <property name="text" >
-      <string>Preview on Canvas</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons" >
-      <bool>false</bool>
-     </property>
-    </widget>
+    <height>160</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Connect Paths</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="label">
+     <property name="text">
+      <string>Connect First Line</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="firstLinePoint">
+     <item>
+      <property name="text">
+       <string>Starting Point</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>End Point</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>with Second Line</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="secondLinePoint">
+     <item>
+      <property name="text">
+       <string>Starting Point</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>End Point</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>by using:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="modeCombo">
+     <item>
+      <property name="text">
+       <string>a straight Line</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Points moving</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="previewCheck">
+     <property name="text">
+      <string>Preview on Canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -103,33 +116,33 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>PathConnectDialogBase</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
+   <receiver>PathConnectDialogBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>PathConnectDialogBase</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
+   <receiver>PathConnectDialogBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
    </hints>
   </connection>
  </connections>

Modified: trunk/Scribus/scribus/ui/copypagetomasterpage.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24439&path=/trunk/Scribus/scribus/ui/copypagetomasterpage.ui
==============================================================================
--- trunk/Scribus/scribus/ui/copypagetomasterpage.ui	(original)
+++ trunk/Scribus/scribus/ui/copypagetomasterpage.ui	Sun Jan 31 22:45:12 2021
@@ -1,54 +1,80 @@
-<ui version="4.0" >
- <class>CopyPageToMasterPageBase</class>
- <widget class="QDialog" name="CopyPageToMasterPageBase" >
-  <property name="windowModality" >
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CopyPageToMasterPageBase</class>
+ <widget class="QDialog" name="CopyPageToMasterPageBase">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
     <width>252</width>
-    <height>139</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Convert Page to Master Page</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QLabel" name="nameLabel" >
-       <property name="text" >
-        <string>Name:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="nameLineEdit" />
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QComboBox" name="pagePositionComboBox" />
-   </item>
-   <item>
-    <widget class="QCheckBox" name="copyMasterItemsCheckBox" >
-     <property name="text" >
-      <string>Copy Applied Master Page Items</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <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>
-    </widget>
+    <height>139</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Convert Page to Master Page</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>
+    <layout class="QHBoxLayout">
+     <item>
+      <widget class="QLabel" name="nameLabel">
+       <property name="text">
+        <string>Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="nameLineEdit"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QComboBox" name="pagePositionComboBox"/>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="copyMasterItemsCheckBox">
+     <property name="text">
+      <string>Copy Applied Master Page Items</string>
+     </property>
+    </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>
+   <item>
+    <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>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -57,33 +83,33 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>CopyPageToMasterPageBase</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
+   <receiver>CopyPageToMasterPageBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>CopyPageToMasterPageBase</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
+   <receiver>CopyPageToMasterPageBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
    </hints>
   </connection>
  </connections>

Modified: trunk/Scribus/scribus/ui/guidemanager.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24439&path=/trunk/Scribus/scribus/ui/guidemanager.ui
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.ui	(original)
+++ trunk/Scribus/scribus/ui/guidemanager.ui	Sun Jan 31 22:45:12 2021
@@ -8,7 +8,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>432</width>
+    <width>428</width>
     <height>368</height>
    </rect>
   </property>
@@ -38,6 +38,18 @@
        <string>&Single</string>
       </attribute>
       <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>
        <item row="0" column="0" colspan="2">
         <layout class="QHBoxLayout">
          <item>
@@ -165,6 +177,18 @@
        <string>&Column/Row</string>
       </attribute>
       <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>
        <item row="2" column="0" colspan="2">
         <widget class="QPushButton" name="applyToAllAutoButton">
          <property name="toolTip">
@@ -408,6 +432,18 @@
        <string>&Misc</string>
       </attribute>
       <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>
        <item row="0" column="0">
         <widget class="QPushButton" name="deletePageButton">
          <property name="toolTip">
@@ -456,7 +492,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>ScrSpinBox</class>




More information about the scribus-commit mailing list