r24413 by jghali - #16437: Unify window margin for New From Template dialog <bubu>

[scribus-commit]

Author: jghali
Date: Mon Jan 18 21:55:32 2021
New Revision: 24413

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24413
Log:
#16437: Unify window margin for New From Template dialog <bubu>

Modified:
    trunk/Scribus/scribus/ui/newdocdialog.cpp
    trunk/Scribus/scribus/ui/nftdialog.ui
    trunk/Scribus/scribus/ui/nftwidget.ui

Modified: trunk/Scribus/scribus/ui/newdocdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24413&path=/trunk/Scribus/scribus/ui/newdocdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newdocdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/newdocdialog.cpp	Mon Jan 18 21:55:32 2021
@@ -352,7 +352,7 @@
 {
 	newFromTempFrame = new QFrame(this);
 	verticalLayout = new QVBoxLayout(newFromTempFrame);
-	verticalLayout->setContentsMargins(0, 0, 0, 0);
+	verticalLayout->setContentsMargins(9, 9, 9, 9);
 	nftGui = new nftwidget(newFromTempFrame);
 	verticalLayout->addWidget(nftGui);
 }

Modified: trunk/Scribus/scribus/ui/nftdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24413&path=/trunk/Scribus/scribus/ui/nftdialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/nftdialog.ui	(original)
+++ trunk/Scribus/scribus/ui/nftdialog.ui	Mon Jan 18 21:55:32 2021
@@ -1,30 +1,43 @@
-<ui version="4.0" >
- <class>nftdialog</class>
- <widget class="QDialog" name="nftdialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>nftdialog</class>
+ <widget class="QDialog" name="nftdialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
     <width>659</width>
-    <height>480</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>New From Template</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <widget class="nftwidget" native="1" name="nftGui" />
-   </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>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>New From Template</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="nftwidget" name="nftGui" native="true"/>
+   </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>
@@ -41,33 +54,33 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>nftdialog</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>nftdialog</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>nftdialog</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>nftdialog</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/nftwidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24413&path=/trunk/Scribus/scribus/ui/nftwidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/nftwidget.ui	(original)
+++ trunk/Scribus/scribus/ui/nftwidget.ui	Mon Jan 18 21:55:32 2021
@@ -11,14 +11,23 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>5</number>
-   </property>
-   <item>
-    <widget class="QListWidget" name="categoryList">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <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="QListWidget" name="categoryList">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>