From e5c6d14cef764c22329b39cf7c1c8b0c8e17c97f Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sat, 9 Jan 2016 17:17:58 -0600
Subject: [PATCH] Allow re-ordering of paths in the launcher.

- suggested by Gilberto, allow the user to set the order of the
  scenery and aircraft paths by dragging.
---
 src/GUI/PathsDialog.cxx | 18 +++++++++++
 src/GUI/PathsDialog.ui  | 68 +++++++++++++++++++++++++----------------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/src/GUI/PathsDialog.cxx b/src/GUI/PathsDialog.cxx
index 726932dea..3770733c9 100644
--- a/src/GUI/PathsDialog.cxx
+++ b/src/GUI/PathsDialog.cxx
@@ -22,6 +22,15 @@ PathsDialog::PathsDialog(QWidget *parent, simgear::pkg::RootRef root) :
     m_catalogsModel = new CatalogListModel(this, m_packageRoot);
     m_ui->catalogsList->setModel(m_catalogsModel);
 
+ // enable drag-drop to re-order the paths
+    m_ui->sceneryPathsList->setDragEnabled(true);
+    m_ui->sceneryPathsList->setDragDropMode(QAbstractItemView::InternalMove);
+    m_ui->sceneryPathsList->setDropIndicatorShown(true);
+
+    m_ui->aircraftPathsList->setDragEnabled(true);
+    m_ui->aircraftPathsList->setDragDropMode(QAbstractItemView::InternalMove);
+    m_ui->aircraftPathsList->setDropIndicatorShown(true);
+
     connect(m_ui->addCatalog, &QToolButton::clicked,
             this, &PathsDialog::onAddCatalog);
     connect(m_ui->addDefaultCatalogButton, &QPushButton::clicked,
@@ -98,6 +107,11 @@ void PathsDialog::onAddSceneryPath()
     if (!path.isEmpty()) {
         m_ui->sceneryPathsList->addItem(path);
     }
+
+    // work around a Qt OS-X bug - this dialog is ending ordered
+    // behind the main settings dialog (consequence of modal-dialog
+    // showing a modla dialog showing a modial dialog)
+    window()->raise();
 }
 
 void PathsDialog::onRemoveSceneryPath()
@@ -113,6 +127,10 @@ void PathsDialog::onAddAircraftPath()
     if (!path.isEmpty()) {
         m_ui->aircraftPathsList->addItem(path);
     }
+    // work around a Qt OS-X bug - this dialog is ending ordered
+    // behind the main settings dialog (consequence of modal-dialog
+    // showing a modla dialog showing a modial dialog)
+    window()->raise();
 }
 
 void PathsDialog::onRemoveAircraftPath()
diff --git a/src/GUI/PathsDialog.ui b/src/GUI/PathsDialog.ui
index 393c10ee6..6b02983d6 100644
--- a/src/GUI/PathsDialog.ui
+++ b/src/GUI/PathsDialog.ui
@@ -83,20 +83,7 @@
       <property name="spacing">
        <number>0</number>
       </property>
-      <item row="1" column="0">
-       <spacer name="horizontalSpacer_3">
-        <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="1">
+      <item row="1" column="2">
        <widget class="QToolButton" name="addSceneryPath">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -115,10 +102,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="3">
-       <widget class="QListWidget" name="sceneryPathsList"/>
-      </item>
-      <item row="1" column="2">
+      <item row="1" column="3">
        <widget class="QToolButton" name="removeSceneryPath">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -137,6 +121,29 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <spacer name="horizontalSpacer_3">
+        <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="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Drag to re-order</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <widget class="QListWidget" name="sceneryPathsList"/>
+      </item>
      </layout>
     </widget>
    </item>
@@ -246,10 +253,7 @@
       <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">
+      <item row="1" column="1">
        <spacer name="horizontalSpacer_4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -263,7 +267,7 @@
        </spacer>
       </item>
       <item row="1" column="2">
-       <widget class="QToolButton" name="removeAircraftPath">
+       <widget class="QToolButton" name="addAircraftPath">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -277,12 +281,12 @@
          </size>
         </property>
         <property name="text">
-         <string>-</string>
+         <string>+</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QToolButton" name="addAircraftPath">
+      <item row="1" column="3">
+       <widget class="QToolButton" name="removeAircraftPath">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -296,10 +300,20 @@
          </size>
         </property>
         <property name="text">
-         <string>+</string>
+         <string>-</string>
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Drag to re-order</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <widget class="QListWidget" name="aircraftPathsList"/>
+      </item>
      </layout>
     </widget>
    </item>
-- 
2.39.5