From 4f9f5d1cd1428593113adce70c9cd0d52791fbd2 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 30 Nov 2018 15:49:37 +1000
Subject: [PATCH] Unify appearance and behaviour of export settings dialogs

---
 src/app/layout/qgslayoutdesignerdialog.cpp   |  4 +-
 src/ui/layout/qgslayoutimageexportoptions.ui | 72 ++++++++++----------
 src/ui/layout/qgspdfexportoptions.ui         |  4 +-
 src/ui/layout/qgssvgexportoptions.ui         |  4 +-
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
index c5fc9f08534..2012b9abe28 100644
--- a/src/app/layout/qgslayoutdesignerdialog.cpp
+++ b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -3996,7 +3996,7 @@ bool QgsLayoutDesignerDialog::getSvgExportSettings( QgsLayoutExporter::SvgExport
   }
 
   // open options dialog
-  QDialog dialog;
+  QDialog dialog( this );
   Ui::QgsSvgExportOptionsDialog options;
   options.setupUi( &dialog );
 
@@ -4066,7 +4066,7 @@ bool QgsLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExport
   }
 
   // open options dialog
-  QDialog dialog;
+  QDialog dialog( this );
   Ui::QgsPdfExportOptionsDialog options;
   options.setupUi( &dialog );
 
diff --git a/src/ui/layout/qgslayoutimageexportoptions.ui b/src/ui/layout/qgslayoutimageexportoptions.ui
index e0aed8cb3b2..9dc5e3b27fc 100644
--- a/src/ui/layout/qgslayoutimageexportoptions.ui
+++ b/src/ui/layout/qgslayoutimageexportoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>533</width>
-    <height>394</height>
+    <height>424</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,18 +15,11 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
      <property name="title">
       <string>Export Options</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>Export resolution</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0" colspan="2">
        <widget class="QLabel" name="label_13">
         <property name="text">
@@ -50,6 +43,13 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="label_9">
+        <property name="text">
+         <string>Export resolution</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="2" colspan="2">
        <widget class="QgsSpinBox" name="mWidthSpinBox">
         <property name="specialValueText">
@@ -114,6 +114,26 @@
         </property>
        </spacer>
       </item>
+      <item row="4" column="0" colspan="5">
+       <widget class="QCheckBox" name="mGenerateWorldFile">
+        <property name="toolTip">
+         <string>If checked, a separate world file which georeferences exported images will be created</string>
+        </property>
+        <property name="text">
+         <string>Generate world file</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="5">
+       <widget class="QCheckBox" name="mAntialiasingCheckBox">
+        <property name="toolTip">
+         <string>If unchecked, the generated images will not be antialiased</string>
+        </property>
+        <property name="text">
+         <string>Enable antialiasing</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -143,7 +163,7 @@
           <item>
            <widget class="QgsSpinBox" name="mLeftMarginSpinBox">
             <property name="suffix">
-             <string> px</string>
+             <string/>
             </property>
             <property name="maximum">
              <number>1000</number>
@@ -160,7 +180,7 @@
           <item>
            <widget class="QgsSpinBox" name="mRightMarginSpinBox">
             <property name="suffix">
-             <string> px</string>
+             <string/>
             </property>
             <property name="maximum">
              <number>1000</number>
@@ -179,7 +199,7 @@
         <item row="0" column="1">
          <widget class="QLabel" name="label_4">
           <property name="text">
-           <string>Top margin</string>
+           <string>Top margin (px)</string>
           </property>
          </widget>
         </item>
@@ -212,7 +232,7 @@
         <item row="0" column="2">
          <widget class="QgsSpinBox" name="mTopMarginSpinBox">
           <property name="suffix">
-           <string> px</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>1000</number>
@@ -222,7 +242,7 @@
         <item row="2" column="2">
          <widget class="QgsSpinBox" name="mBottomMarginSpinBox">
           <property name="suffix">
-           <string> px</string>
+           <string/>
           </property>
           <property name="maximum">
            <number>1000</number>
@@ -234,26 +254,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="mGenerateWorldFile">
-     <property name="toolTip">
-      <string>If checked, a separate world file which georeferences exported images will be created</string>
-     </property>
-     <property name="text">
-      <string>Generate world file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="mAntialiasingCheckBox">
-     <property name="toolTip">
-      <string>If unchecked, the generated images will not be antialiased</string>
-     </property>
-     <property name="text">
-      <string>Enable antialiasing</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -283,7 +283,7 @@
   <customwidget>
    <class>QgsCollapsibleGroupBoxBasic</class>
    <extends>QGroupBox</extends>
-   <header>qgscollapsiblegroupbox.h</header>
+   <header location="global">qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -296,6 +296,8 @@
   <tabstop>mResolutionSpinBox</tabstop>
   <tabstop>mWidthSpinBox</tabstop>
   <tabstop>mHeightSpinBox</tabstop>
+  <tabstop>mAntialiasingCheckBox</tabstop>
+  <tabstop>mGenerateWorldFile</tabstop>
   <tabstop>mClipToContentGroupBox</tabstop>
   <tabstop>mTopMarginSpinBox</tabstop>
   <tabstop>mLeftMarginSpinBox</tabstop>
diff --git a/src/ui/layout/qgspdfexportoptions.ui b/src/ui/layout/qgspdfexportoptions.ui
index 73f69df9c8c..26fe4b5362b 100644
--- a/src/ui/layout/qgspdfexportoptions.ui
+++ b/src/ui/layout/qgspdfexportoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>489</width>
-    <height>190</height>
+    <height>197</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
      <property name="title">
-      <string>PDF Options</string>
+      <string>Export Options</string>
      </property>
      <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
       <item row="1" column="0" colspan="2">
diff --git a/src/ui/layout/qgssvgexportoptions.ui b/src/ui/layout/qgssvgexportoptions.ui
index 8ee4f5f4897..8695cd994d6 100644
--- a/src/ui/layout/qgssvgexportoptions.ui
+++ b/src/ui/layout/qgssvgexportoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>489</width>
-    <height>351</height>
+    <height>385</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
      <property name="title">
-      <string>SVG Options</string>
+      <string>Export Options</string>
      </property>
      <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
       <item row="0" column="0" colspan="2">