From 311a61349432446e4b1cc0da7325c942b93e283d Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 23 Oct 2016 18:33:38 +0200
Subject: [PATCH] refs #768, use new tooltips in login comment (plus some minor
 adjustments)

---
 src/blackgui/components/logincomponent.cpp | 11 ++++++-----
 src/blackgui/components/logincomponent.h   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 526b6d17f..bcdd9b6d4 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -129,7 +129,7 @@ namespace BlackGui
             connect(ui->le_AircraftCombinedType, &QLineEdit::editingFinished, this, &CLoginComponent::ps_validateAircraftValues);
             connect(ui->selector_AircraftIcao, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &CLoginComponent::ps_changedAircraftIcao);
             connect(ui->selector_AirlineIcao, &CDbAirlineIcaoSelectorComponent::changedAirlineIcao, this, &CLoginComponent::ps_changedAirlineIcao);
-            connect(ui->tb_SimulatorIcaoReverseLookup, &QToolButton::clicked, this, &CLoginComponent::ps_reverseLookupAircraftIcaoData);
+            connect(ui->tb_SimulatorIcaoReverseLookup, &QToolButton::clicked, this, &CLoginComponent::ps_reverseLookupAircraftModel);
 
             if (sGui && sGui->getIContextSimulator())
             {
@@ -455,6 +455,7 @@ namespace BlackGui
                 ui->le_SimulatorModel->setText("");
                 this->highlightModelField();
             }
+            ui->le_SimulatorModel->setToolTip(model.asHtmlSummary());
 
             // reset the model
             if (model.isLoadedFromDb())
@@ -566,7 +567,7 @@ namespace BlackGui
             }
         }
 
-        void CLoginComponent::ps_reverseLookupAircraftIcaoData()
+        void CLoginComponent::ps_reverseLookupAircraftModel()
         {
             if (!sGui->getIContextSimulator()->isSimulatorAvailable()) { return; }
             const CAircraftModel model(sGui->getIContextOwnAircraft()->getOwnAircraft().getModel());
@@ -576,15 +577,15 @@ namespace BlackGui
         void CLoginComponent::ps_simulatorModelChanged(const CAircraftModel &model)
         {
             Q_ASSERT_X(sGui && sGui->getIContextNetwork(), Q_FUNC_INFO, "Missing context");
-            const bool isConnected = sGui && sGui->getIContextNetwork()->isConnected();
-            if (isConnected) { return; }
+            const bool isNetworkConnected = sGui && sGui->getIContextNetwork()->isConnected();
+            if (isNetworkConnected) { return; }
             const QString modelStr(model.hasModelString() ? model.getModelString() : "<unknown>");
             if (!model.hasModelString())
             {
                 CLogMessage(this).validationInfo("Invalid lookup for '%1' successful: %2") << modelStr << model.toQString();
                 return;
             }
-            this->setGuiIcaoValues(model, false);
+            this->setOwnModelAndIcaoValues();
 
             // open dialog for model mapping
             if (this->m_autoPopupWizard && !model.isLoadedFromDb())
diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h
index b8429e2e6..4648a5e40 100644
--- a/src/blackgui/components/logincomponent.h
+++ b/src/blackgui/components/logincomponent.h
@@ -82,7 +82,7 @@ namespace BlackGui
             void loginDataChanged();
 
         public slots:
-            //! Main info area chnaged
+            //! Main info area changed
             void mainInfoAreaChanged(const QWidget *currentWidget);
 
         private slots:
@@ -114,7 +114,7 @@ namespace BlackGui
             void ps_logoffCountdown();
 
             //! Reverse lookup model
-            void ps_reverseLookupAircraftIcaoData();
+            void ps_reverseLookupAircraftModel();
 
             //! Simulator model has been changed
             void ps_simulatorModelChanged(const BlackMisc::Simulation::CAircraftModel &model);