From 1d7e3dc9aa4c947c821c4c3d3e43e5b8b97f3953 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 6 Aug 2019 20:12:45 +0200
Subject: [PATCH] Ref T659, renamed buttons and use "alwaysOverride" function

---
 src/blackgui/components/loginadvcomponent.cpp | 12 ++++++++++--
 src/blackgui/components/loginadvcomponent.h   |  3 +++
 src/blackgui/components/loginadvcomponent.ui  |  6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/blackgui/components/loginadvcomponent.cpp b/src/blackgui/components/loginadvcomponent.cpp
index 4d1bd469b..a0dda8302 100644
--- a/src/blackgui/components/loginadvcomponent.cpp
+++ b/src/blackgui/components/loginadvcomponent.cpp
@@ -80,8 +80,8 @@ namespace BlackGui
         {
             ui->setupUi(this);
 
-            connect(ui->pb_Cancel, &QPushButton::clicked, this, &CLoginAdvComponent::loginCancelled,          Qt::QueuedConnection);
-            connect(ui->pb_Ok,     &QPushButton::clicked, this, &CLoginAdvComponent::toggleNetworkConnection, Qt::QueuedConnection);
+            connect(ui->pb_Cancel,  &QPushButton::clicked, this, &CLoginAdvComponent::loginCancelled,          Qt::QueuedConnection);
+            connect(ui->pb_Connect, &QPushButton::clicked, this, &CLoginAdvComponent::toggleNetworkConnection, Qt::QueuedConnection);
             connect(ui->comp_NetworkDetails, &CNetworkDetailsComponent::overridePilot, this, &CLoginAdvComponent::overrideCredentialsToPilot,      Qt::QueuedConnection);
             connect(ui->comp_NetworkDetails, &CNetworkDetailsComponent::requestNetworkSettings, this, &CLoginAdvComponent::requestNetworkSettings, Qt::QueuedConnection);
 
@@ -91,6 +91,9 @@ namespace BlackGui
             this->setForceSmall(true);
             this->showKillButton(false);
 
+            // override details/voice
+            ui->comp_NetworkDetails->setAlwaysAllowOverride(true);
+
             // auto logoff
             // we decided to make it difficult for users to disable it
             if (!CBuildConfig::isLocalDeveloperDebugBuild())
@@ -237,6 +240,11 @@ namespace BlackGui
             }
         }
 
+        void CLoginAdvComponent::resetState()
+        {
+            ui->comp_NetworkDetails->resetState();
+        }
+
         void CLoginAdvComponent::loadRememberedUserData()
         {
             const CServer lastServer = m_networkSetup.getLastServer();
diff --git a/src/blackgui/components/loginadvcomponent.h b/src/blackgui/components/loginadvcomponent.h
index 6bb5ffb86..227b00b95 100644
--- a/src/blackgui/components/loginadvcomponent.h
+++ b/src/blackgui/components/loginadvcomponent.h
@@ -73,6 +73,9 @@ namespace BlackGui
             //! Login requested
             void toggleNetworkConnection();
 
+            //! Reset state
+            void resetState();
+
         signals:
             //! Login
             void loginOrLogoffSuccessful();
diff --git a/src/blackgui/components/loginadvcomponent.ui b/src/blackgui/components/loginadvcomponent.ui
index bd8bf25ce..bc196bb57 100644
--- a/src/blackgui/components/loginadvcomponent.ui
+++ b/src/blackgui/components/loginadvcomponent.ui
@@ -217,9 +217,9 @@
        </widget>
       </item>
       <item row="1" column="2">
-       <widget class="QPushButton" name="pb_Ok">
+       <widget class="QPushButton" name="pb_Connect">
         <property name="text">
-         <string>ok</string>
+         <string>connect</string>
         </property>
        </widget>
       </item>
@@ -267,7 +267,7 @@
  <tabstops>
   <tabstop>form_Pilot</tabstop>
   <tabstop>cb_AutoLogoff</tabstop>
-  <tabstop>pb_Ok</tabstop>
+  <tabstop>pb_Connect</tabstop>
   <tabstop>pb_Cancel</tabstop>
  </tabstops>
  <resources/>