From 793265722f4a53accd10644b3a86d585a77efbb9 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 24 Oct 2018 00:29:32 +0200
Subject: [PATCH] Ref T411, set SimObject directory from file browser + UI
 adjustments

---
 .../installfsxterrainprobecomponent.cpp       |  12 +-
 .../installfsxterrainprobecomponent.ui        | 103 ++++++++++--------
 2 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/src/blackgui/components/installfsxterrainprobecomponent.cpp b/src/blackgui/components/installfsxterrainprobecomponent.cpp
index 052dceed6..451f55b82 100644
--- a/src/blackgui/components/installfsxterrainprobecomponent.cpp
+++ b/src/blackgui/components/installfsxterrainprobecomponent.cpp
@@ -44,8 +44,8 @@ namespace BlackGui
             connect(ui->pb_DirectoryBrowser, &QPushButton::released, this, &CInstallFsxTerrainProbeComponent::selectSimObjectsDir);
             connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CInstallFsxTerrainProbeComponent::onSimulatorChanged);
 
-            QPointer<CInstallFsxTerrainProbeComponent> myself;
-            QTimer::singleShot(250, this, [ = ]
+            QPointer<CInstallFsxTerrainProbeComponent> myself(this);
+            QTimer::singleShot(500, this, [ = ]
             {
                 if (!myself) { return; }
                 this->onSimulatorChanged(ui->comp_SimulatorSelector->getValue());
@@ -86,8 +86,12 @@ namespace BlackGui
         void CInstallFsxTerrainProbeComponent::selectSimObjectsDir()
         {
             const QString startDirectory = CFileUtils::fixWindowsUncPath(ui->le_Target->text());
-            const QString dir = QFileDialog::getExistingDirectory(this, "SimObjects directory", startDirectory,
-                                QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+            const QString dir =
+                CFileUtils::fixWindowsUncPath(
+                    QFileDialog::getExistingDirectory(
+                        this, "SimObjects directory", startDirectory,
+                        QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks));
+            ui->le_Target->setText(dir);
         }
     } // ns
 } // ns
diff --git a/src/blackgui/components/installfsxterrainprobecomponent.ui b/src/blackgui/components/installfsxterrainprobecomponent.ui
index 3a0345761..d6c1c339e 100644
--- a/src/blackgui/components/installfsxterrainprobecomponent.ui
+++ b/src/blackgui/components/installfsxterrainprobecomponent.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>427</width>
-    <height>189</height>
+    <height>205</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -62,41 +62,6 @@
       <string>Copy swift probe</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_Target">
-        <property name="text">
-         <string>Target:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="le_Target">
-        <property name="placeholderText">
-         <string>specify the SimObjects directory</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_Simulator">
-        <property name="text">
-         <string>Simulator:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="pb_DirectoryBrowser">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="pb_Copy">
-        <property name="text">
-         <string>copy</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QWidget" name="wi_Simulator" native="true">
         <layout class="QHBoxLayout" name="hl_Simulator">
@@ -112,7 +77,7 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item>
+         <item alignment="Qt::AlignLeft">
           <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
            <property name="minimumSize">
             <size>
@@ -122,19 +87,61 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QLineEdit" name="le_Source">
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-           <property name="placeholderText">
-            <string>source directory of probe</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_Target">
+        <property name="text">
+         <string>Target:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="le_Target">
+        <property name="placeholderText">
+         <string>specify the SimObjects directory</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="lbl_Simulator">
+        <property name="text">
+         <string>Simulator:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QPushButton" name="pb_DirectoryBrowser">
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="le_Source">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="placeholderText">
+         <string>source directory of probe</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="pb_Copy">
+        <property name="text">
+         <string>copy</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lbl_Source">
+        <property name="text">
+         <string>Source:</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -149,7 +156,9 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>le_Source</tabstop>
   <tabstop>le_Target</tabstop>
+  <tabstop>pb_Copy</tabstop>
   <tabstop>pb_DirectoryBrowser</tabstop>
  </tabstops>
  <resources/>