From 298c9eeec13d140f968b714ca07313d4fd8a4cc3 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sat, 27 Jan 2024 22:16:42 +0100 Subject: [PATCH] refactor: Remove option to disable autologoff Auto logoff was always enabled in normal builds anyway, even when the user tried to disable it (see 8eff8cd). --- src/blackcore/data/networksetup.cpp | 5 ----- src/blackcore/data/networksetup.h | 7 ------- src/blackgui/components/loginadvcomponent.cpp | 16 ---------------- src/blackgui/components/loginadvcomponent.h | 3 --- src/blackgui/components/loginadvcomponent.ui | 11 ----------- src/blackgui/components/logincomponent.cpp | 10 ---------- src/blackgui/components/logincomponent.ui | 11 ----------- src/blackgui/components/logindialog.cpp | 6 ------ src/blackgui/components/logindialog.h | 3 --- .../components/loginoverviewcomponent.cpp | 14 -------------- src/blackgui/components/loginoverviewcomponent.h | 3 --- .../components/loginoverviewcomponent.ui | 11 ----------- src/blackmisc/network/settings/serversettings.h | 16 ---------------- src/swiftguistandard/swiftguistd.cpp | 4 ---- 14 files changed, 120 deletions(-) diff --git a/src/blackcore/data/networksetup.cpp b/src/blackcore/data/networksetup.cpp index b11684f85..d91f7aac2 100644 --- a/src/blackcore/data/networksetup.cpp +++ b/src/blackcore/data/networksetup.cpp @@ -24,11 +24,6 @@ namespace BlackCore::Data return m_lastVatsimServer.set(server); } - CStatusMessage CNetworkSetup::setAutoLogoff(bool autoLogoff) - { - return m_autoLogoff.setAndSave(autoLogoff); - } - CServer CNetworkSetup::getLastServer() const { return m_lastServer.get(); diff --git a/src/blackcore/data/networksetup.h b/src/blackcore/data/networksetup.h index 78a87b43c..f20ba83fd 100644 --- a/src/blackcore/data/networksetup.h +++ b/src/blackcore/data/networksetup.h @@ -40,9 +40,6 @@ namespace BlackCore::Data //! Set value of last VATSIM server BlackMisc::CStatusMessage setLastVatsimServer(const BlackMisc::Network::CServer &server); - //! Save auto logoff - BlackMisc::CStatusMessage setAutoLogoff(bool autoLogoff); - //! Last server (all networks) BlackMisc::Network::CServer getLastServer() const; @@ -64,9 +61,6 @@ namespace BlackCore::Data //! Used with an other server (i.e. non VATSIM) bool wasLastUsedWithOtherServer() const; - //! Auto logoff? - bool useAutoLogoff() const { return m_autoLogoff.get(); } - signals: //! Setup changed void setupChanged(); @@ -76,7 +70,6 @@ namespace BlackCore::Data void onSettingsChanged(); BlackMisc::CSettingReadOnly m_otherTrafficNetworkServers { this, &CNetworkSetup::onSettingsChanged }; - BlackMisc::CSetting m_autoLogoff { this, &CNetworkSetup::onSettingsChanged }; BlackMisc::CData m_lastServer { this, &CNetworkSetup::onSettingsChanged }; //!< recently used server (VATSIM, other) BlackMisc::CData m_lastVatsimServer { this, &CNetworkSetup::onSettingsChanged }; //!< recently used VATSIM server }; diff --git a/src/blackgui/components/loginadvcomponent.cpp b/src/blackgui/components/loginadvcomponent.cpp index b8220e78c..4a12c2463 100644 --- a/src/blackgui/components/loginadvcomponent.cpp +++ b/src/blackgui/components/loginadvcomponent.cpp @@ -85,13 +85,6 @@ namespace BlackGui::Components // override details/voice ui->comp_NetworkDetails->setAlwaysAllowOverride(true); - // auto logoff - // we decided to make it difficult for users to disable it - if (!CBuildConfig::isLocalDeveloperDebugBuild()) - { - ui->cb_AutoLogoff->setChecked(true); - } - // Stored data this->loadRememberedUserData(); @@ -105,17 +98,11 @@ namespace BlackGui::Components // inital setup, if data already available ui->form_Pilot->validate(); - ui->cb_AutoLogoff->setChecked(m_networkSetup.useAutoLogoff()); } CLoginAdvComponent::~CLoginAdvComponent() {} - void CLoginAdvComponent::setAutoLogoff(bool autoLogoff) - { - ui->cb_AutoLogoff->setChecked(autoLogoff); - } - void CLoginAdvComponent::loginCancelled() { this->closeOverlay(); @@ -129,7 +116,6 @@ namespace BlackGui::Components const bool isConnected = sGui && sGui->getIContextNetwork()->isConnected(); const bool vatsimLogin = ui->comp_NetworkDetails->isVatsimServerSelected(); - m_networkSetup.setAutoLogoff(ui->cb_AutoLogoff->isChecked()); ui->form_Pilot->setVatsimValidation(vatsimLogin); @@ -323,7 +309,6 @@ namespace BlackGui::Components void CLoginAdvComponent::autoLogoffDetection() { - if (!ui->cb_AutoLogoff->isChecked()) { return; } if (!this->hasValidContexts()) { return; } if (!sGui->getIContextNetwork()->isConnected()) { return; } // nothing to logoff @@ -337,7 +322,6 @@ namespace BlackGui::Components void CLoginAdvComponent::autoLogoffFrameRate(bool fatal) { //! \fixme code duplication with function above - if (!ui->cb_AutoLogoff->isChecked()) { return; } if (!this->hasValidContexts()) { return; } if (!sGui->getIContextNetwork()->isConnected()) { return; } diff --git a/src/blackgui/components/loginadvcomponent.h b/src/blackgui/components/loginadvcomponent.h index 4611404ab..8394efe71 100644 --- a/src/blackgui/components/loginadvcomponent.h +++ b/src/blackgui/components/loginadvcomponent.h @@ -60,9 +60,6 @@ namespace BlackGui::Components //! Automatically popup void setAutoPopupWizad(bool autoPopup); - //! Set auto logoff - void setAutoLogoff(bool autoLogoff); - //! Login requested void toggleNetworkConnection(); diff --git a/src/blackgui/components/loginadvcomponent.ui b/src/blackgui/components/loginadvcomponent.ui index bc196bb57..113fbe72f 100644 --- a/src/blackgui/components/loginadvcomponent.ui +++ b/src/blackgui/components/loginadvcomponent.ui @@ -223,16 +223,6 @@ - - - - automatically logoff when simulator changes or appears crashed - - - auto logoff - - - @@ -266,7 +256,6 @@ form_Pilot - cb_AutoLogoff pb_Connect pb_Cancel diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index f1608fea0..333d74e53 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -161,7 +161,6 @@ namespace BlackGui::Components // inital setup, if data already available this->validateAircraftValues(); ui->form_Pilot->validate(); - ui->cb_AutoLogoff->setChecked(m_networkSetup.useAutoLogoff()); this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1, {}); this->reloadOtherServersSetup(); @@ -202,12 +201,6 @@ namespace BlackGui::Components this->updateUiConnectState(); this->blinkConnectButton(); } - - // we decided to make it difficult for users to disable it - if (!CBuildConfig::isLocalDeveloperDebugBuild()) - { - ui->cb_AutoLogoff->setChecked(true); - } } void CLoginComponent::setLogoffCountdown(int timeoutSeconds) @@ -235,7 +228,6 @@ namespace BlackGui::Components m_networkConnected = sGui && sGui->getIContextNetwork()->isConnected(); const bool vatsimLogin = this->isVatsimNetworkTabSelected(); - m_networkSetup.setAutoLogoff(ui->cb_AutoLogoff->isChecked()); ui->form_Pilot->setVatsimValidation(vatsimLogin); this->updateUiConnectState(); @@ -691,7 +683,6 @@ namespace BlackGui::Components void CLoginComponent::autoLogoffDetection() { - if (!ui->cb_AutoLogoff->isChecked()) { return; } if (!this->hasValidContexts()) { return; } if (!sGui->getIContextNetwork()->isConnected()) { return; } // nothing to logoff @@ -707,7 +698,6 @@ namespace BlackGui::Components void CLoginComponent::autoLogoffFrameRate(bool fatal) { //! \fixme code duplication with function above - if (!ui->cb_AutoLogoff->isChecked()) { return; } if (!this->hasValidContexts()) { return; } if (!sGui->getIContextNetwork()->isConnected()) { return; } diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui index 1eb7e1359..de0a3ac73 100644 --- a/src/blackgui/components/logincomponent.ui +++ b/src/blackgui/components/logincomponent.ui @@ -871,16 +871,6 @@ - - - - automatically logoff when simulator changes or appears crashed - - - auto logoff - - - @@ -965,7 +955,6 @@ le_LoginAsAircaft le_LoginSince tb_Timeout - cb_AutoLogoff pb_Ok pb_Cancel comp_OtherServers diff --git a/src/blackgui/components/logindialog.cpp b/src/blackgui/components/logindialog.cpp index 493923e30..db8f37138 100644 --- a/src/blackgui/components/logindialog.cpp +++ b/src/blackgui/components/logindialog.cpp @@ -35,12 +35,6 @@ namespace BlackGui::Components CLoginDialog::~CLoginDialog() {} - void CLoginDialog::setAutoLogoff(bool logoff) - { - ui->comp_LoginComponent->setAutoLogoff(logoff); - ui->comp_LoginOverviewComponent->setAutoLogoff(logoff); - } - void CLoginDialog::show() { this->init(); diff --git a/src/blackgui/components/logindialog.h b/src/blackgui/components/logindialog.h index af29fe92f..6f58d460f 100644 --- a/src/blackgui/components/logindialog.h +++ b/src/blackgui/components/logindialog.h @@ -30,9 +30,6 @@ namespace BlackGui::Components //! Destructor virtual ~CLoginDialog() override; - //! Set auto logoff - void setAutoLogoff(bool logoff); - //! Init and show void show(); diff --git a/src/blackgui/components/loginoverviewcomponent.cpp b/src/blackgui/components/loginoverviewcomponent.cpp index 7a498f5a7..876ec2bdd 100644 --- a/src/blackgui/components/loginoverviewcomponent.cpp +++ b/src/blackgui/components/loginoverviewcomponent.cpp @@ -84,26 +84,13 @@ namespace BlackGui::Components ui->form_Pilot->setReadOnly(true); ui->form_Server->setReadOnly(true); - // auto logoff - // we decided to make it difficult for users to disable it - if (!CBuildConfig::isLocalDeveloperDebugBuild()) - { - ui->cb_AutoLogoff->setChecked(true); - } - // inital setup, if data already available ui->form_Pilot->validate(); - ui->cb_AutoLogoff->setChecked(m_networkSetup.useAutoLogoff()); } CLoginOverviewComponent::~CLoginOverviewComponent() {} - void CLoginOverviewComponent::setAutoLogoff(bool autoLogoff) - { - ui->cb_AutoLogoff->setChecked(autoLogoff); - } - void CLoginOverviewComponent::cancel() { this->closeOverlay(); @@ -116,7 +103,6 @@ namespace BlackGui::Components if (!sGui->getIContextNetwork() || !sGui->getIContextAudio()) { return; } const bool isConnected = sGui && sGui->getIContextNetwork()->isConnected(); - m_networkSetup.setAutoLogoff(ui->cb_AutoLogoff->isChecked()); CStatusMessage msg; if (!isConnected) diff --git a/src/blackgui/components/loginoverviewcomponent.h b/src/blackgui/components/loginoverviewcomponent.h index 72686e791..8e503f6a3 100644 --- a/src/blackgui/components/loginoverviewcomponent.h +++ b/src/blackgui/components/loginoverviewcomponent.h @@ -55,9 +55,6 @@ namespace BlackGui::Components //! Destructor virtual ~CLoginOverviewComponent() override; - //! Set auto logoff - void setAutoLogoff(bool autoLogoff); - //! Login requested void toggleNetworkConnection(); diff --git a/src/blackgui/components/loginoverviewcomponent.ui b/src/blackgui/components/loginoverviewcomponent.ui index 94aa344fd..b1b887ad1 100644 --- a/src/blackgui/components/loginoverviewcomponent.ui +++ b/src/blackgui/components/loginoverviewcomponent.ui @@ -272,16 +272,6 @@ - - - - automatically logoff when simulator changes or appears crashed - - - auto logoff - - - @@ -317,7 +307,6 @@ le_LoginMode le_PartnerCallsign gb_OwnAircraft - cb_AutoLogoff pb_Disconnect pb_Cancel diff --git a/src/blackmisc/network/settings/serversettings.h b/src/blackmisc/network/settings/serversettings.h index 73e3831b5..9ca9b39da 100644 --- a/src/blackmisc/network/settings/serversettings.h +++ b/src/blackmisc/network/settings/serversettings.h @@ -50,22 +50,6 @@ namespace BlackMisc::Network::Settings return dv; } }; - - /*! - * Auto logoff - */ - struct TAutoLogoff : public TSettingTrait - { - //! \copydoc BlackMisc::TSettingTrait::key - static const char *key() { return "network/autologoff"; } - - //! \copydoc BlackMisc::TSettingTrait::humanReadable - static const QString &humanReadable() - { - static const QString name("Auto logoff"); - return name; - } - }; } // ns #endif diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index bde53a53d..8233dbaa9 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -250,10 +250,6 @@ void SwiftGuiStd::loginRequested() { if (!m_loginDialog) { m_loginDialog.reset(new CLoginDialog(this)); } connect(m_loginDialog.data(), &CLoginDialog::requestNetworkSettings, this, &SwiftGuiStd::displayNetworkSettings); - if (!CBuildConfig::isLocalDeveloperDebugBuild()) - { - m_loginDialog->setAutoLogoff(true); - } m_loginDialog->show(); } else