From 6b6a6e0d8e2991dd127a1e4848e1410e23569936 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 29 Jan 2020 20:50:56 +0100
Subject: [PATCH] [emulated driver] minor fixes

* dialog size
* update sim.value UI fields if emulated simulator changes
* renamed function
---
 .../simulator/emulated/simulatoremulated.cpp       |  2 +-
 .../emulated/simulatoremulatedmonitordialog.cpp    |  5 +++--
 .../emulated/simulatoremulatedmonitordialog.h      |  2 +-
 .../emulated/simulatoremulatedmonitordialog.ui     | 14 +++++++-------
 .../simulatoremulatedconfigwidget.ui               |  4 ++--
 src/plugins/simulator/fs9/simulatorfs9.cpp         |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp
index f36eb9aa2..e5bcfda08 100644
--- a/src/plugins/simulator/emulated/simulatoremulated.cpp
+++ b/src/plugins/simulator/emulated/simulatoremulated.cpp
@@ -438,7 +438,7 @@ namespace BlackSimPlugin
             // update provider, own name, title
             this->updateOwnModel(settings.getOwnModel());
             this->setObjectName(simulator);
-            if (m_monitorWidget) { m_monitorWidget->updateWindowTitle(simulator); }
+            if (m_monitorWidget) { m_monitorWidget->updateWindowTitleAndUiValues(simulator); }
         }
 
         void CSimulatorEmulated::connectOwnSignals()
diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
index 6db0871cc..cb342df06 100644
--- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
+++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
@@ -83,7 +83,7 @@ namespace BlackSimPlugin
             this->enableInterpolationLogButtons(false);
             this->setSimulatorUiValues();
             this->setInternalAircraftUiValues();
-            this->updateWindowTitle(simulator->getSimulatorInfo());
+            this->updateWindowTitleAndUiValues(simulator->getSimulatorInfo());
         }
 
         CSimulatorEmulatedMonitorDialog::~CSimulatorEmulatedMonitorDialog()
@@ -147,10 +147,11 @@ namespace BlackSimPlugin
             ui->pte_TextMessages->setPlainText(message.toQString(true));
         }
 
-        void CSimulatorEmulatedMonitorDialog::updateWindowTitle(const CSimulatorInfo &info)
+        void CSimulatorEmulatedMonitorDialog::updateWindowTitleAndUiValues(const CSimulatorInfo &info)
         {
             if (!info.isSingleSimulator()) { return; }
             this->setWindowTitle("Emulated driver : " + info.toQString());
+            this->setSimulatorUiValues();
         }
 
         void CSimulatorEmulatedMonitorDialog::onSimulatorValuesChanged()
diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
index ffc0e369d..8362ab7f4 100644
--- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
+++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
@@ -63,7 +63,7 @@ namespace BlackSimPlugin
             void displayTextMessage(const BlackMisc::Network::CTextMessage &message);
 
             //! The title
-            void updateWindowTitle(const BlackMisc::Simulation::CSimulatorInfo &info);
+            void updateWindowTitleAndUiValues(const BlackMisc::Simulation::CSimulatorInfo &info);
 
         private:
             static int constexpr MaxLogMessages = 500; //!< desired log message number
diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
index 06c18f1ce..1034ef256 100644
--- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
+++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
@@ -68,7 +68,7 @@
    <item>
     <widget class="QTabWidget" name="tw_SwiftMonitorDialog">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="tb_AircraftSituation">
       <attribute name="title">
@@ -658,18 +658,18 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>BlackGui::Components::CLogComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/logcomponent.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CSettingsSwiftPlugin</class>
    <extends>QFrame</extends>
    <header>blackgui/components/settingsswiftplugin.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CLogComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/logcomponent.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Editors::CSituationForm</class>
    <extends>QFrame</extends>
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
index 39feb4dbf..eb6c1bcf6 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>500</width>
     <height>300</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>400</width>
+    <width>500</width>
     <height>300</height>
    </size>
   </property>
diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp
index 6edd488cf..8f4ff0e8e 100644
--- a/src/plugins/simulator/fs9/simulatorfs9.cpp
+++ b/src/plugins/simulator/fs9/simulatorfs9.cpp
@@ -528,7 +528,7 @@ namespace BlackSimPlugin
                 if (m_isConnecting || isOk(m_lobbyClient->connectFs9ToHost(m_fs9Host->getHostAddress())))
                 {
                     m_isConnecting = true;
-                    CLogMessage(this).info(u"swift is joining FS9 to the multiplayer session...");
+                    CLogMessage(this).info(u"swift is joining FS9 to the multiplayer session ...");
                 }
             }