From 8414576ab644ef4da2008df118edf7da59455d9c Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Thu, 8 Sep 2016 14:49:52 +0100
Subject: [PATCH] Tweak launcher layout margins.

Trying to squeeze things back into an XGA screen. Will backport once
I get feedback.
---
 src/GUI/Launcher.ui    | 54 +++++++++++++++++++++++++-------------
 src/GUI/PathsDialog.ui | 59 +++++++++++++++++++++++++++++++++---------
 2 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/src/GUI/Launcher.ui b/src/GUI/Launcher.ui
index c0dbe24ca..21977d3cb 100644
--- a/src/GUI/Launcher.ui
+++ b/src/GUI/Launcher.ui
@@ -6,14 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>800</height>
+    <width>642</width>
+    <height>523</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Start FlightGear</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>2</number>
+   </property>
    <property name="leftMargin">
     <number>6</number>
    </property>
@@ -26,7 +29,7 @@
    <property name="bottomMargin">
     <number>4</number>
    </property>
-   <item row="0" column="0">
+   <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -504,22 +507,21 @@
           <bool>true</bool>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
           <item>
            <widget class="QPlainTextEdit" name="commandLineArgs"/>
           </item>
-          <item>
-           <widget class="QLabel" name="label_8">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For information on additional options, please &lt;a href=&quot;http://mapserver.flightgear.org/getstart/getstart-enpa2.html#x5-450004.5&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;see here&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="textFormat">
-             <enum>Qt::RichText</enum>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -597,12 +599,28 @@
          </layout>
         </widget>
        </item>
+       <item row="9" column="1">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For information on additional options, please &lt;a href=&quot;http://mapserver.flightgear.org/getstart/getstart-enpa2.html#x5-450004.5&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;see here&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QPushButton" name="quitButton">
        <property name="text">
diff --git a/src/GUI/PathsDialog.ui b/src/GUI/PathsDialog.ui
index 89cd1e42f..eb6167d16 100644
--- a/src/GUI/PathsDialog.ui
+++ b/src/GUI/PathsDialog.ui
@@ -14,6 +14,21 @@
    <string>Configure add-ons</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <property name="leftMargin">
+    <number>4</number>
+   </property>
+   <property name="topMargin">
+    <number>4</number>
+   </property>
+   <property name="rightMargin">
+    <number>4</number>
+   </property>
+   <property name="bottomMargin">
+    <number>4</number>
+   </property>
    <item>
     <widget class="QLabel" name="dataLocation">
      <property name="text">
@@ -41,6 +56,11 @@
      </item>
      <item>
       <widget class="QLabel" name="label_4">
+       <property name="font">
+        <font>
+         <pointsize>11</pointsize>
+        </font>
+       </property>
        <property name="text">
         <string>FlightGear needs certain files (sometimes called 'fg-data') to function - these are included as part of stable releases.</string>
        </property>
@@ -82,6 +102,11 @@
      </item>
      <item>
       <widget class="QLabel" name="label_2">
+       <property name="font">
+        <font>
+         <pointsize>11</pointsize>
+        </font>
+       </property>
        <property name="text">
         <string>Aircraft hangars and automatic scenery downloads may cause this location to contain large numbers of files. Changing this location will cause files to be downloaded again.</string>
        </property>
@@ -137,16 +162,16 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <property name="leftMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="rightMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="spacing">
        <number>0</number>
@@ -204,6 +229,11 @@
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
         <property name="text">
          <string>Drag to re-order</string>
         </property>
@@ -222,16 +252,16 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="rightMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="spacing">
        <number>0</number>
@@ -311,16 +341,16 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
       <property name="leftMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="rightMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>8</number>
+       <number>6</number>
       </property>
       <property name="spacing">
        <number>0</number>
@@ -378,6 +408,11 @@
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_3">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
         <property name="text">
          <string>Drag to re-order</string>
         </property>
-- 
2.39.5