From cb702341840340cde5c46cf70bf0c2d3e379ea3f Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 26 Apr 2019 01:19:27 +0200
Subject: [PATCH] UI texts/minor fixes

---
 .../components/dbmappingcomponent.cpp         | 34 +++++++++----------
 src/blackgui/components/dbmappingcomponent.ui |  6 ++++
 .../components/flightplancomponent.ui         |  4 +--
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index 562261ee1..1fbf96d90 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -648,22 +648,6 @@ namespace BlackGui
             ui->comp_ModelWorkbench->view()->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_Workbench));
         }
 
-        void CDbMappingComponent::onOwnModelsChangedDigest(int count, bool withFilter)
-        {
-            Q_UNUSED(count);
-            Q_UNUSED(withFilter);
-
-            // non standard with sim
-            const int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModels);
-            static const QString ot(ui->tw_ModelsToBeMapped->tabText(i));
-            QString o(ot);
-            const QString sim(ui->comp_OwnAircraftModels->getOwnModelsSimulator().toQString(true));
-            if (!sim.isEmpty()) { o = o.append(" ").append(sim); }
-            const QString f = ui->comp_OwnAircraftModels->view()->hasFilter() ? "F" : "";
-            o = CGuiUtility::replaceTabCountValue(o, ui->comp_OwnAircraftModels->view()->rowCount()) + f;
-            ui->tw_ModelsToBeMapped->setTabText(i, o);
-        }
-
         void CDbMappingComponent::ps_addToOwnModelSet()
         {
             if (!this->canAddToModelSetTab()) { return; }
@@ -731,12 +715,28 @@ namespace BlackGui
 
             // none standard with simulator
             int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModelSet);
-            QString o = "Model set " + ui->comp_OwnModelSet->getModelSetSimulator().toQString(true);
+            QString o = "Active model set " + ui->comp_OwnModelSet->getModelSetSimulator().toQString(true);
             const QString f = ui->comp_OwnModelSet->view()->hasFilter() ? "F" : "";
             o = CGuiUtility::replaceTabCountValue(o, ui->comp_OwnModelSet->view()->rowCount()) + f;
             ui->tw_ModelsToBeMapped->setTabText(i, o);
         }
 
+        void CDbMappingComponent::onOwnModelsChangedDigest(int count, bool withFilter)
+        {
+            Q_UNUSED(count);
+            Q_UNUSED(withFilter);
+
+            // non standard with sim
+            const int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModels);
+            static const QString ot("Stored own models");
+            QString o(ot);
+            const QString sim(ui->comp_OwnAircraftModels->getOwnModelsSimulator().toQString(true));
+            if (!sim.isEmpty()) { o = o.append(" ").append(sim); }
+            const QString f = ui->comp_OwnAircraftModels->view()->hasFilter() ? "F" : "";
+            o = CGuiUtility::replaceTabCountValue(o, ui->comp_OwnAircraftModels->view()->rowCount()) + f;
+            ui->tw_ModelsToBeMapped->setTabText(i, o);
+        }
+
         void CDbMappingComponent::onUserChanged()
         {
             this->initVPilotLoading();
diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/blackgui/components/dbmappingcomponent.ui
index 18530691f..be937b4a1 100644
--- a/src/blackgui/components/dbmappingcomponent.ui
+++ b/src/blackgui/components/dbmappingcomponent.ui
@@ -71,10 +71,16 @@
        </property>
        <item>
         <widget class="QTabWidget" name="tw_ModelsToBeMapped">
+         <property name="toolTip">
+          <string>Models installed and found for your simulator</string>
+         </property>
          <property name="currentIndex">
           <number>0</number>
          </property>
          <widget class="QWidget" name="tab_OwnModelSet">
+          <property name="toolTip">
+           <string>This is the model set swift will use for model matching</string>
+          </property>
           <attribute name="title">
            <string>My model set</string>
           </attribute>
diff --git a/src/blackgui/components/flightplancomponent.ui b/src/blackgui/components/flightplancomponent.ui
index ad23c6445..25fc4b222 100644
--- a/src/blackgui/components/flightplancomponent.ui
+++ b/src/blackgui/components/flightplancomponent.ui
@@ -318,7 +318,7 @@
              <string>Load flight plan from network</string>
             </property>
             <property name="text">
-             <string>Load</string>
+             <string>Download</string>
             </property>
             <property name="icon">
              <iconset resource="../../blackmisc/blackmisc.qrc">
@@ -773,7 +773,7 @@
        <property name="geometry">
         <rect>
          <x>0</x>
-         <y>-93</y>
+         <y>0</y>
          <width>383</width>
          <height>436</height>
         </rect>