From a6937e25ad1245ebc565e7c5b7d0ee4fd1ab572a Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Thu, 12 Mar 2015 10:36:32 +0000
Subject: [PATCH] Make a new launcher tab for add-ons

- avoids the settings page being overloaded with list boxes.
---
 src/GUI/Launcher.ui | 240 ++++++++++++++++++++++++++++++++------------
 1 file changed, 174 insertions(+), 66 deletions(-)

diff --git a/src/GUI/Launcher.ui b/src/GUI/Launcher.ui
index 521938756..a7fdaa056 100644
--- a/src/GUI/Launcher.ui
+++ b/src/GUI/Launcher.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>667</width>
-    <height>821</height>
+    <width>700</width>
+    <height>700</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -441,52 +441,38 @@
          </item>
         </layout>
        </item>
-       <item row="0" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string>Season:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="seasonCombo">
-           <item>
-            <property name="text">
-             <string>Summer</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Winter</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="rembrandtCheckbox">
+         <property name="text">
+          <string>Enable deferred rendering (Rembrandt)</string>
+         </property>
+        </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="msaaCheckbox">
+       <item row="4" column="1">
+        <widget class="QCheckBox" name="fullScreenCheckbox">
          <property name="text">
-          <string>Enable Multi-sample anti-aliasing</string>
+          <string>Start full-screen</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QCheckBox" name="rembrandtCheckbox">
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="fetchRealWxrCheckbox">
          <property name="text">
-          <string>Enable deferred rendering (Rembrandt)</string>
+          <string>Fetch real weather online</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2">
-        <widget class="QCheckBox" name="terrasyncCheck">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="msaaCheckbox">
          <property name="text">
-          <string>Enable automatic scenery downloading (TerraSync)</string>
+          <string>Enable Multi-sample anti-aliasing</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QCheckBox" name="startPausedCheck">
+         <property name="text">
+          <string>Start paused</string>
          </property>
         </widget>
        </item>
@@ -523,28 +509,96 @@
          </item>
         </layout>
        </item>
-       <item row="4" column="0">
-        <widget class="QCheckBox" name="fetchRealWxrCheckbox">
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="terrasyncCheck">
          <property name="text">
-          <string>Fetch real weather online</string>
+          <string>Enable automatic scenery downloading (TerraSync)</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QCheckBox" name="fullScreenCheckbox">
-         <property name="text">
-          <string>Start full-screen</string>
+       <item row="0" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <item>
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Season:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="seasonCombo">
+           <item>
+            <property name="text">
+             <string>Summer</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Winter</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="7" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Additional options</string>
          </property>
+         <layout class="QVBoxLayout" name="verticalLayout_7">
+          <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>
-       <item row="5" column="0">
-        <widget class="QCheckBox" name="startPausedCheck">
-         <property name="text">
-          <string>Start paused</string>
+       <item row="6" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-        </widget>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
        </item>
-       <item row="6" column="0" colspan="2">
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_4">
+      <attribute name="title">
+       <string>Add-ons</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="leftMargin">
+        <number>8</number>
+       </property>
+       <property name="rightMargin">
+        <number>8</number>
+       </property>
+       <property name="bottomMargin">
+        <number>8</number>
+       </property>
+       <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0">
          <item>
           <widget class="QLabel" name="customAircraftDirLabel">
@@ -565,7 +619,7 @@
          </item>
         </layout>
        </item>
-       <item row="7" column="0" colspan="2">
+       <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Additional scenery locations</string>
@@ -643,12 +697,12 @@
          </layout>
         </widget>
        </item>
-       <item row="8" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox_3">
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
-          <string>Additional aircraft locations</string>
+          <string>Aircraft hangar locations</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <layout class="QGridLayout" name="gridLayout_6">
           <property name="leftMargin">
            <number>8</number>
           </property>
@@ -665,10 +719,10 @@
            <number>0</number>
           </property>
           <item row="0" column="0" colspan="3">
-           <widget class="QListWidget" name="aircraftPathsList"/>
+           <widget class="QListWidget" name="aircraftPathsList_2"/>
           </item>
           <item row="1" column="0">
-           <spacer name="horizontalSpacer_4">
+           <spacer name="horizontalSpacer_5">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -681,7 +735,7 @@
            </spacer>
           </item>
           <item row="1" column="2">
-           <widget class="QToolButton" name="removeAircraftPath">
+           <widget class="QToolButton" name="removeAircraftPath_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -700,7 +754,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QToolButton" name="addAircraftPath">
+           <widget class="QToolButton" name="addAircraftPath_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -721,12 +775,12 @@
          </layout>
         </widget>
        </item>
-       <item row="9" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox_2">
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
-          <string>Additional options</string>
+          <string>Additional aircraft locations</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_9">
+         <layout class="QGridLayout" name="gridLayout_4">
           <property name="leftMargin">
            <number>8</number>
           </property>
@@ -739,8 +793,62 @@
           <property name="bottomMargin">
            <number>8</number>
           </property>
-          <item>
-           <widget class="QPlainTextEdit" name="commandLineArgs"/>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0" colspan="3">
+           <widget class="QListWidget" name="aircraftPathsList"/>
+          </item>
+          <item row="1" column="0">
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>567</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="2">
+           <widget class="QToolButton" name="removeAircraftPath">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>-</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QToolButton" name="addAircraftPath">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>+</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
-- 
2.39.5