From 83e8597b1463e47f2e0b63e3290bdcbca581b4ae Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 19 Jul 2019 03:10:08 +0200
Subject: [PATCH] Ref T659, login dialog and connected signal/slots with main
 GUI

---
 src/blackgui/components/logindialog.cpp  | 19 +++++++++++++++++++
 src/blackgui/components/logindialog.h    |  8 ++++++++
 src/blackgui/components/logindialog.ui   | 10 ++++++++--
 src/swiftguistandard/swiftguistd.cpp     |  8 ++++++++
 src/swiftguistandard/swiftguistd.h       |  3 +++
 src/swiftguistandard/swiftguistdinit.cpp |  7 +------
 6 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/blackgui/components/logindialog.cpp b/src/blackgui/components/logindialog.cpp
index 459cfcb5d..bd2366028 100644
--- a/src/blackgui/components/logindialog.cpp
+++ b/src/blackgui/components/logindialog.cpp
@@ -19,10 +19,29 @@ namespace BlackGui
         {
             ui->setupUi(this);
             this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+            connect(ui->comp_LoginComponent, &CLoginAdvComponent::loginOrLogoffSuccessful, this, &CLoginDialog::onLoginOrLogoffSuccessful);
+            connect(ui->comp_LoginComponent, &CLoginAdvComponent::loginOrLogoffCancelled,  this, &CLoginDialog::onLoginOrLogoffCancelled);
+            connect(ui->comp_LoginComponent, &CLoginAdvComponent::requestNetworkSettings,  this, &CLoginDialog::onRequestNetworkSettings);
         }
 
         CLoginDialog::~CLoginDialog()
         { }
 
+        void CLoginDialog::onLoginOrLogoffCancelled()
+        {
+            this->reject();
+        }
+
+        void CLoginDialog::onLoginOrLogoffSuccessful()
+        {
+            this->accept();
+        }
+
+        void CLoginDialog::onRequestNetworkSettings()
+        {
+            emit this->requestNetworkSettings();
+            this->close();
+        }
     } // ns
 }// ns
diff --git a/src/blackgui/components/logindialog.h b/src/blackgui/components/logindialog.h
index a731f78f0..13158e94d 100644
--- a/src/blackgui/components/logindialog.h
+++ b/src/blackgui/components/logindialog.h
@@ -33,7 +33,15 @@ namespace BlackGui
             //! Destructor
             virtual ~CLoginDialog() override;
 
+        signals:
+            //! Request server settings
+            void requestNetworkSettings();
+
         private:
+            void onLoginOrLogoffCancelled();
+            void onLoginOrLogoffSuccessful();
+            void onRequestNetworkSettings();
+
             QScopedPointer<Ui::CLoginDialog> ui;
         };
 
diff --git a/src/blackgui/components/logindialog.ui b/src/blackgui/components/logindialog.ui
index 7447b9aab..dbc9ce6c1 100644
--- a/src/blackgui/components/logindialog.ui
+++ b/src/blackgui/components/logindialog.ui
@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>640</width>
-    <height>480</height>
+    <width>350</width>
+    <height>500</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>350</width>
+    <height>500</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Login dialog</string>
   </property>
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index d3e81774b..60995581b 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -254,6 +254,7 @@ void SwiftGuiStd::loginRequested()
         if (!connected && shift)
         {
             if (!m_loginDialog) { m_loginDialog.reset(new CLoginDialog(this)); }
+            connect(m_loginDialog.data(), &CLoginDialog::requestNetworkSettings, this, &SwiftGuiStd::displayNetworkSettings);
             m_loginDialog->show();
         }
         else
@@ -520,6 +521,13 @@ void SwiftGuiStd::displayLog()
     ui->comp_MainInfoArea->displayLog();
 }
 
+void SwiftGuiStd::displayNetworkSettings()
+{
+    if (!sApp || sApp->isShuttingDown()) { return; }
+    this->setMainPageInfoArea(CMainInfoAreaComponent::InfoAreaSettings);
+    ui->comp_MainInfoArea->getSettingsComponent()->setTab(CSettingsComponent::SettingTabServers);
+}
+
 void SwiftGuiStd::onPttChanged(bool enabled)
 {
     if (!sGui || !sGui->getIContextAudio()) { return; }
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index 3ae03792c..87a8d3abc 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -185,6 +185,9 @@ private:
     //! Display log
     void displayLog();
 
+    //! Display network settings
+    void displayNetworkSettings();
+
     //! Display a reconnect dialog
     void displayDBusReconnectDialog();
 
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index e4a1fcaf8..20ba756f1 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -237,12 +237,7 @@ void SwiftGuiStd::initGuiSignals()
     connect(ui->comp_Login, &CLoginComponent::loginOrLogoffSuccessful, this, &SwiftGuiStd::setMainPageToInfoArea);
     connect(ui->comp_Login, &CLoginComponent::loginOrLogoffSuccessful, ui->comp_MainInfoArea->getFlightPlanComponent(), &CFlightPlanComponent::loginDataSet);
     connect(ui->comp_Login, &CLoginComponent::loginDataChangedDigest,  ui->comp_MainInfoArea->getFlightPlanComponent(), &CFlightPlanComponent::loginDataSet);
-    connect(ui->comp_Login, &CLoginComponent::requestNetworkSettings, [ this ]()
-    {
-        if (!sApp || sApp->isShuttingDown()) { return; }
-        this->setMainPageInfoArea(CMainInfoAreaComponent::InfoAreaSettings);
-        ui->comp_MainInfoArea->getSettingsComponent()->setTab(CSettingsComponent::SettingTabServers);
-    });
+    connect(ui->comp_Login, &CLoginComponent::requestNetworkSettings,  this, &SwiftGuiStd::displayNetworkSettings);
     connect(ui->comp_Login, &CLoginComponent::requestLoginPage, [ this ]()
     {
         if (!sApp || sApp->isShuttingDown()) { return; }