r24406 by jghali - #16430: Unify margins and spacing for dialogs, set 2 <bubu>

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 16 21:12:15 UTC 2021


Author: jghali
Date: Sat Jan 16 21:12:15 2021
New Revision: 24406

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

Modified:
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.ui
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui
    trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialogbase.ui
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui
    trunk/Scribus/scribus/ui/annota.cpp
    trunk/Scribus/scribus/ui/extimageprops.cpp
    trunk/Scribus/scribus/ui/imageinfodialog.cpp
    trunk/Scribus/scribus/ui/pageitemattributes.ui

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.ui	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.ui	Sat Jan 16 21:12:15 2021
@@ -1,123 +1,136 @@
-<ui version="4.0" >
- <class>MeshDistortionDialog</class>
- <widget class="QDialog" name="MeshDistortionDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MeshDistortionDialog</class>
+ <widget class="QDialog" name="MeshDistortionDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
     <width>403</width>
-    <height>355</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Mesh Distortion</string>
-  </property>
-  <layout class="QHBoxLayout" >
-   <item>
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QGraphicsView" name="previewLabel" >
-       <property name="minimumSize" >
-        <size>
-         <width>300</width>
-         <height>300</height>
-        </size>
-       </property>
-       <property name="toolTip" >
-        <string>Drag the red handles with the mouse to distort the mesh</string>
-       </property>
-       <property name="dragMode" >
-        <enum>QGraphicsView::RubberBandDrag</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <item>
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QToolButton" name="buttonZoomIn" >
-           <property name="toolTip" >
-            <string>Zoom In</string>
-           </property>
-           <property name="text" >
-            <string>+</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QToolButton" name="buttonZoomOut" >
-           <property name="toolTip" >
-            <string>Zoom Out</string>
-           </property>
-           <property name="text" >
-            <string>-</string>
-           </property>
-          </widget>
+    <height>355</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Mesh Distortion</string>
+  </property>
+  <layout class="QHBoxLayout">
+   <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="QVBoxLayout">
+     <item>
+      <widget class="QGraphicsView" name="previewLabel">
+       <property name="minimumSize">
+        <size>
+         <width>300</width>
+         <height>300</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Drag the red handles with the mouse to distort the mesh</string>
+       </property>
+       <property name="dragMode">
+        <enum>QGraphicsView::RubberBandDrag</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout">
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QToolButton" name="buttonZoomIn">
+           <property name="toolTip">
+            <string>Zoom In</string>
+           </property>
+           <property name="text">
+            <string>+</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="buttonZoomOut">
+           <property name="toolTip">
+            <string>Zoom Out</string>
+           </property>
+           <property name="text">
+            <string>-</string>
+           </property>
+          </widget>
          </item>
         </layout>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>20</width>
-           <height>20</height>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QPushButton" name="resetButton" >
-       <property name="toolTip" >
-        <string>Resets the selected handles to their initial position.
-If no handle is selected all handles will be reset.</string>
-       </property>
-       <property name="text" >
-        <string>&Reset</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>20</width>
-         <height>40</height>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout">
+     <item>
+      <widget class="QPushButton" name="resetButton">
+       <property name="toolTip">
+        <string>Resets the selected handles to their initial position.
+If no handle is selected all handles will be reset.</string>
+       </property>
+       <property name="text">
+        <string>&Reset</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <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>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-       <property name="centerButtons" >
-        <bool>true</bool>
-       </property>
-      </widget>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+       <property name="centerButtons">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -128,33 +141,33 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>MeshDistortionDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>379</x>
-     <y>385</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
+   <receiver>MeshDistortionDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>379</x>
+     <y>385</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>MeshDistortionDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>379</x>
-     <y>385</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
+   <receiver>MeshDistortionDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>379</x>
+     <y>385</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
    </hints>
   </connection>
  </connections>

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui	Sat Jan 16 21:12:15 2021
@@ -1,130 +1,143 @@
-<ui version="4.0" >
- <class>PathDialogBase</class>
- <widget class="QDialog" name="PathDialogBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PathDialogBase</class>
+ <widget class="QDialog" name="PathDialogBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
     <width>292</width>
-    <height>218</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Path along Path</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <layout class="QGridLayout" name="gridLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Effect Type</string>
-       </property>
-      </widget>
+    <height>218</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Path along Path</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">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Effect Type</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="typeCombo">
+       <item>
+        <property name="text">
+         <string>Single</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Single, stretched</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Repeated</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Repeated, stretched</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Horizontal Offset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="ScrSpinBox" name="offsetXSpin"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Vertical Offset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="ScrSpinBox" name="offsetYSpin"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Rotate Objects by:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QComboBox" name="rotationCombo">
+       <item>
+        <property name="text">
+         <string>0°</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>90°</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>180°</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>270°</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Gap between Objects</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="ScrSpinBox" name="gapSpin"/>
+     </item>
+     <item row="5" column="0" colspan="2">
+      <widget class="QCheckBox" name="previewCheck">
+       <property name="text">
+        <string>Preview on Canvas</string>
+       </property>
+      </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QComboBox" name="typeCombo" >
-       <item>
-        <property name="text" >
-         <string>Single</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Single, stretched</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Repeated</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Repeated, stretched</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>Horizontal Offset</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="ScrSpinBox" name="offsetXSpin" />
-     </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
-        <string>Vertical Offset</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="ScrSpinBox" name="offsetYSpin" />
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="label_5" >
-       <property name="text" >
-        <string>Rotate Objects by:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1" >
-      <widget class="QComboBox" name="rotationCombo" >
-       <item>
-        <property name="text" >
-         <string>0°</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>90°</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>180°</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>270°</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>Gap between Objects</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" >
-      <widget class="ScrSpinBox" name="gapSpin" />
-     </item>
-     <item row="5" column="0" colspan="2" >
-      <widget class="QCheckBox" name="previewCheck" >
-       <property name="text" >
-        <string>Preview on Canvas</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -140,33 +153,33 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>PathDialogBase</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>PathDialogBase</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>PathDialogBase</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>PathDialogBase</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/plugins/tools/lenseffects/lensdialogbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialogbase.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialogbase.ui	(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialogbase.ui	Sat Jan 16 21:12:15 2021
@@ -1,278 +1,261 @@
-<ui version="4.0" >
- <class>LensDialogBase</class>
- <widget class="QDialog" name="LensDialogBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LensDialogBase</class>
+ <widget class="QDialog" name="LensDialogBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
     <width>526</width>
-    <height>372</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Optical Lens</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>5</number>
-   </property>
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>5</number>
-     </property>
-     <item>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>5</number>
-       </property>
-       <item>
-        <widget class="QGraphicsView" name="previewWidget" >
-         <property name="minimumSize" >
-          <size>
-           <width>280</width>
-           <height>280</height>
+    <height>372</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Optical Lens</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>
+      <layout class="QVBoxLayout">
+       <item>
+        <widget class="QGraphicsView" name="previewWidget">
+         <property name="minimumSize">
+          <size>
+           <width>280</width>
+           <height>280</height>
           </size>
          </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
-          <number>5</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
-            <number>5</number>
-           </property>
-           <item>
-            <widget class="QPushButton" name="buttonAdd" >
-             <property name="toolTip" >
-              <string>Add a new lens</string>
-             </property>
-             <property name="text" >
-              <string>&Add Lens</string>
-             </property>
-            </widget>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <layout class="QHBoxLayout">
+           <item>
+            <widget class="QPushButton" name="buttonAdd">
+             <property name="toolTip">
+              <string>Add a new lens</string>
+             </property>
+             <property name="text">
+              <string>&Add Lens</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonRemove">
+             <property name="toolTip">
+              <string>Remove selected lens</string>
+             </property>
+             <property name="text">
+              <string>&Remove Lens</string>
+             </property>
+            </widget>
            </item>
-           <item>
-            <widget class="QPushButton" name="buttonRemove" >
-             <property name="toolTip" >
-              <string>Remove selected lens</string>
-             </property>
-             <property name="text" >
-              <string>&Remove Lens</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
-            <number>5</number>
-           </property>
-           <item>
-            <spacer>
-             <property name="orientation" >
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0" >
-              <size>
-               <width>40</width>
-               <height>20</height>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout">
+           <item>
+            <spacer>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
               </size>
              </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QToolButton" name="buttonZoomI" >
-             <property name="toolTip" >
-              <string>Zoom In</string>
-             </property>
-             <property name="text" >
-              <string>+</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="buttonZoomOut" >
-             <property name="toolTip" >
-              <string>Zoom Out</string>
-             </property>
-             <property name="text" >
-              <string>-</string>
-             </property>
-            </widget>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QToolButton" name="buttonZoomI">
+             <property name="toolTip">
+              <string>Zoom In</string>
+             </property>
+             <property name="text">
+              <string>+</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="buttonZoomOut">
+             <property name="toolTip">
+              <string>Zoom Out</string>
+             </property>
+             <property name="text">
+              <string>-</string>
+             </property>
+            </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>5</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Lens Parameters</string>
-         </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="QLabel" name="label" >
-            <property name="text" >
-             <string>&X Pos:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>spinXPos</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" >
-           <widget class="QDoubleSpinBox" name="spinXPos" >
-            <property name="toolTip" >
-             <string>Horizontal position of the lens</string>
-            </property>
-            <property name="minimum" >
-             <double>-30000.000000000000000</double>
-            </property>
-            <property name="maximum" >
-             <double>30000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_2" >
-            <property name="text" >
-             <string>&Y Pos:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>spinYPos</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" >
-           <widget class="QDoubleSpinBox" name="spinYPos" >
-            <property name="toolTip" >
-             <string>Vertical position of the lens</string>
-            </property>
-            <property name="minimum" >
-             <double>-30000.000000000000000</double>
-            </property>
-            <property name="maximum" >
-             <double>30000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2" >
-           <widget class="QRadioButton" name="buttonMagnify" >
-            <property name="toolTip" >
-             <string>The selected lens acts like a magnification lens</string>
-            </property>
-            <property name="text" >
-             <string>&Magnification Lens</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" colspan="2" >
-           <widget class="QRadioButton" name="buttonFishEye" >
-            <property name="toolTip" >
-             <string>The selected lens acts like a fish eye lens</string>
-            </property>
-            <property name="text" >
-             <string>&Fish Eye Lens</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0" >
-           <widget class="QLabel" name="label_3" >
-            <property name="text" >
-             <string>Ra&dius:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>spinRadius</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" >
-           <widget class="QDoubleSpinBox" name="spinRadius" >
-            <property name="toolTip" >
-             <string>Radius of the lens</string>
-            </property>
-            <property name="minimum" >
-             <double>-30000.000000000000000</double>
-            </property>
-            <property name="maximum" >
-             <double>30000.000000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0" >
-           <widget class="QLabel" name="label_4" >
-            <property name="text" >
-             <string>&Strength:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>spinStrength</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1" >
-           <widget class="QDoubleSpinBox" name="spinStrength" >
-            <property name="toolTip" >
-             <string>Strength of the lens</string>
-            </property>
-            <property name="minimum" >
-             <double>0.000000000000000</double>
-            </property>
-            <property name="maximum" >
-             <double>100.000000000000000</double>
-            </property>
-           </widget>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout">
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Lens Parameters</string>
+         </property>
+         <layout class="QGridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>&X Pos:</string>
+            </property>
+            <property name="buddy">
+             <cstring>spinXPos</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QDoubleSpinBox" name="spinXPos">
+            <property name="toolTip">
+             <string>Horizontal position of the lens</string>
+            </property>
+            <property name="minimum">
+             <double>-30000.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>30000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>&Y Pos:</string>
+            </property>
+            <property name="buddy">
+             <cstring>spinYPos</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QDoubleSpinBox" name="spinYPos">
+            <property name="toolTip">
+             <string>Vertical position of the lens</string>
+            </property>
+            <property name="minimum">
+             <double>-30000.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>30000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QRadioButton" name="buttonMagnify">
+            <property name="toolTip">
+             <string>The selected lens acts like a magnification lens</string>
+            </property>
+            <property name="text">
+             <string>&Magnification Lens</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" colspan="2">
+           <widget class="QRadioButton" name="buttonFishEye">
+            <property name="toolTip">
+             <string>The selected lens acts like a fish eye lens</string>
+            </property>
+            <property name="text">
+             <string>&Fish Eye Lens</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Ra&dius:</string>
+            </property>
+            <property name="buddy">
+             <cstring>spinRadius</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QDoubleSpinBox" name="spinRadius">
+            <property name="toolTip">
+             <string>Radius of the lens</string>
+            </property>
+            <property name="minimum">
+             <double>-30000.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>30000.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>&Strength:</string>
+            </property>
+            <property name="buddy">
+             <cstring>spinStrength</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QDoubleSpinBox" name="spinStrength">
+            <property name="toolTip">
+             <string>Strength of the lens</string>
+            </property>
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>100.000000000000000</double>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>165</width>
-           <height>91</height>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>165</width>
+           <height>91</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderbase.ui	Sat Jan 16 21:12:15 2021
@@ -11,22 +11,28 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Boolean Path Operations</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>5</number>
-     </property>
-     <item>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="sourceShape">
-         <property name="minimumSize">
+   <string>Boolean Path Operations</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <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>
+      <layout class="QVBoxLayout">
+       <item>
+        <widget class="QLabel" name="sourceShape">
+         <property name="minimumSize">
           <size>
            <width>100</width>
            <height>100</height>
@@ -79,15 +85,12 @@
         </spacer>
        </item>
       </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <item>
-        <spacer>
-         <property name="orientation">
+     </item>
+     <item>
+      <layout class="QVBoxLayout">
+       <item>
+        <spacer>
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
@@ -129,15 +132,12 @@
         </spacer>
        </item>
       </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="sourceShape2">
-         <property name="minimumSize">
+     </item>
+     <item>
+      <layout class="QVBoxLayout">
+       <item>
+        <widget class="QLabel" name="sourceShape2">
+         <property name="minimumSize">
           <size>
            <width>100</width>
            <height>100</height>
@@ -190,15 +190,12 @@
         </spacer>
        </item>
       </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <item>
-        <spacer>
-         <property name="orientation">
+     </item>
+     <item>
+      <layout class="QVBoxLayout">
+       <item>
+        <spacer>
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
@@ -298,18 +295,12 @@
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
-          <string>Operation</string>
-         </property>
-         <layout class="QHBoxLayout">
-          <property name="spacing">
-           <number>5</number>
-          </property>
-          <property name="margin">
-           <number>10</number>
-          </property>
-          <item>
-           <widget class="QToolButton" name="opCombine">
-            <property name="toolTip">
+          <string>Operation</string>
+         </property>
+         <layout class="QHBoxLayout">
+          <item>
+           <widget class="QToolButton" name="opCombine">
+            <property name="toolTip">
              <string>Unites the shapes</string>
             </property>
             <property name="text">

Modified: trunk/Scribus/scribus/ui/annota.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/ui/annota.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annota.cpp	(original)
+++ trunk/Scribus/scribus/ui/annota.cpp	Sat Jan 16 21:12:15 2021
@@ -71,12 +71,12 @@
 	}
 
 	AnnotLayout = new QVBoxLayout( this );
-	AnnotLayout->setSpacing( 5 );
-	AnnotLayout->setMargin( 10 );
+	AnnotLayout->setSpacing(6);
+	AnnotLayout->setContentsMargins(9, 9, 9, 9);
 
 	Layout1 = new QHBoxLayout;
-	Layout1->setSpacing( 5 );
-	Layout1->setMargin( 0 );
+	Layout1->setSpacing(6);
+	Layout1->setContentsMargins(0, 0, 0, 0);
 
 	typeCombo = new QComboBox(this);
 	if (!m_view->m_doc->masterPageMode())
@@ -123,8 +123,8 @@
 	GroupBox2->setTitle( tr( "Options" ) );
 	GroupBox2Layout = new QGridLayout( GroupBox2 );
 	GroupBox2Layout->setAlignment( Qt::AlignTop );
-	GroupBox2Layout->setSpacing( 5 );
-	GroupBox2Layout->setMargin( 10 );
+	GroupBox2Layout->setSpacing(6);
+	GroupBox2Layout->setContentsMargins(9, 9, 9, 9);
 	iconComboLabel = new QLabel( tr("Icon:"), GroupBox2);
 	iconCombo = new QComboBox(GroupBox2);
 	iconCombo->addItem( tr("Note"));
@@ -149,8 +149,8 @@
 	GroupBox1->setTitle( tr( "Destination" ) );
 	GroupBox1Layout = new QGridLayout( GroupBox1 );
 	GroupBox1Layout->setAlignment( Qt::AlignTop );
-	GroupBox1Layout->setSpacing( 5 );
-	GroupBox1Layout->setMargin( 10 );
+	GroupBox1Layout->setSpacing(6);
+	GroupBox1Layout->setContentsMargins(9, 9, 9, 9);
 
 	destFile = new QLineEdit(GroupBox1);
 	destFile->setText(m_item->annotation().Extern());
@@ -219,8 +219,8 @@
 	Fram->addWidget(GroupBox1);
 
 	Layout1_2 = new QHBoxLayout;
-	Layout1_2->setSpacing( 5 );
-	Layout1_2->setMargin( 0 );
+	Layout1_2->setSpacing(6);
+	Layout1_2->setContentsMargins(0, 0, 0, 0);
 
 	QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	Layout1_2->addItem( spacer );

Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp	(original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp	Sat Jan 16 21:12:15 2021
@@ -40,7 +40,7 @@
 	setWindowTitle( tr( "Extended Image Properties" ) );
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	ExtImagePropsLayout = new QVBoxLayout( this );
-	ExtImagePropsLayout->setMargin(6);
+	ExtImagePropsLayout->setContentsMargins(9, 9, 9, 9);
 	ExtImagePropsLayout->setSpacing(6);
 	m_view  = view;
 	m_timer = nullptr;
@@ -103,10 +103,10 @@
 	{
 		tab = new QWidget( propsTab );
 		tabLayout = new QVBoxLayout( tab );
-		tabLayout->setMargin(6);
+		tabLayout->setContentsMargins(9, 9, 9, 9);
 		tabLayout->setSpacing(6);
 		layout1 = new QHBoxLayout;
-		layout1->setMargin(0);
+		layout1->setContentsMargins(0, 0, 0, 0);
 		layout1->setSpacing(6);
 		textLabel1 = new QLabel( tab );
 		textLabel1->setText( tr( "Blend Mode:" ) );
@@ -230,7 +230,7 @@
 	}
 	tab_2 = new QWidget( propsTab );
 	tabLayout_2 = new QVBoxLayout( tab_2 );
-	tabLayout_2->setMargin(6);
+	tabLayout_2->setContentsMargins(9, 9, 9, 9);
 	tabLayout_2->setSpacing(6);
 	pathList = new QListWidget( tab_2 );
 	pathList->clear();
@@ -285,7 +285,7 @@
 	ExtImagePropsLayout->addWidget( propsTab );
 
 	layoutBottom = new QHBoxLayout;
-	layoutBottom->setMargin(0);
+	layoutBottom->setContentsMargins(0, 0, 0, 0);
 	layoutBottom->setSpacing(6);
 	livePreview = new QCheckBox( this );
 	livePreview->setText( tr( "Live Preview" ) );

Modified: trunk/Scribus/scribus/ui/imageinfodialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/ui/imageinfodialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/imageinfodialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/imageinfodialog.cpp	Sat Jan 16 21:12:15 2021
@@ -24,13 +24,13 @@
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 
 	ImageInfoDialogLayout = new QVBoxLayout( this );
-	ImageInfoDialogLayout->setMargin(10);
-	ImageInfoDialogLayout->setSpacing(5);
+	ImageInfoDialogLayout->setContentsMargins(9, 9, 9, 9);
+	ImageInfoDialogLayout->setSpacing(6);
 	GenGroup = new QGroupBox(this);
 	GenGroup->setTitle( tr("General Info"));
 	layout3 = new QGridLayout(GenGroup);
-	layout3->setMargin(5);
-	layout3->setSpacing(5);
+	layout3->setContentsMargins(9, 9, 9, 9);
+	layout3->setSpacing(6);
 	Text0g = new QLabel( tr( "Date / Time:" ), GenGroup);
 	layout3->addWidget( Text0g, 0, 0 );
 	timeInfo = new QLabel( info->exifInfo.dateTime, GenGroup);
@@ -68,8 +68,8 @@
 	ExGroup = new QGroupBox(this);
 	ExGroup->setTitle( tr("EXIF Info"));
 	layout2 = new QGridLayout(ExGroup);
-	layout2->setMargin(5);
-	layout2->setSpacing(5);
+	layout2->setContentsMargins(9, 9, 9, 9);
+	layout2->setSpacing(6);
 	Text1 = new QLabel( "", ExGroup);
 	layout2->addWidget( Text1, 0, 0 );
 	Comment = new QLabel(info->exifInfo.comment, ExGroup);
@@ -147,8 +147,8 @@
 			break;
 	}
 	layout1 = new QHBoxLayout;
-	layout1->setMargin(5);
-	layout1->setSpacing(5);
+	layout1->setContentsMargins(0, 0, 0, 0);
+	layout1->setSpacing(6);
 	QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	layout1->addItem( spacer );
 	okButton = new QPushButton( CommonStrings::tr_OK, this);

Modified: trunk/Scribus/scribus/ui/pageitemattributes.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24406&path=/trunk/Scribus/scribus/ui/pageitemattributes.ui
==============================================================================
--- trunk/Scribus/scribus/ui/pageitemattributes.ui	(original)
+++ trunk/Scribus/scribus/ui/pageitemattributes.ui	Sat Jan 16 21:12:15 2021
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PageItemAttributes</class>
- <widget class="QDialog" name="PageItemAttributes" >
-  <property name="geometry" >
+ <widget class="QDialog" name="PageItemAttributes">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,98 +10,110 @@
     <height>188</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Attributes</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <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>
-    <widget class="ScTableWidget" name="attributesTable" >
+    <widget class="ScTableWidget" name="attributesTable">
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Name</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Type</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Value</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Parameter</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Relationship</string>
       </property>
      </column>
      <column>
-      <property name="text" >
+      <property name="text">
        <string>Relationship To</string>
       </property>
      </column>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QPushButton" name="addButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="addButton">
+       <property name="text">
         <string>&Add</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+A</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="copyButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="copyButton">
+       <property name="text">
         <string>&Copy</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+C</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="deleteButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="deleteButton">
+       <property name="text">
         <string>&Delete</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+D</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="clearButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="clearButton">
+       <property name="text">
         <string>C&lear</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+L</string>
        </property>
       </widget>
      </item>
      <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" stdset="0">
         <size>
          <width>90</width>
          <height>20</height>
@@ -109,30 +122,30 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
         <string>&OK</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string/>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
         <string>&Cancel</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string/>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
       </widget>
@@ -141,7 +154,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <customwidgets>
   <customwidget>
    <class>ScTableWidget</class>
@@ -150,7 +162,7 @@
   </customwidget>
  </customwidgets>
  <includes>
-  <include location="local" >pagestructs.h</include>
+  <include location="local">pagestructs.h</include>
  </includes>
  <resources/>
  <connections/>




More information about the scribus-commit mailing list