From 51a749b109fa98585e9f4a3c77e3556060602355 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 4 Mar 2025 23:45:14 -0500 Subject: [PATCH] refactor: move closeToTray setting to Settings newkey: gui/closeToTray <= General/closeToTray remove closeToTray from `AppConfig` --- src/apps/deskflow-gui/MainWindow.cpp | 5 +++-- src/apps/deskflow-gui/dialogs/SettingsDialog.cpp | 4 ++-- src/lib/common/Settings.cpp | 2 +- src/lib/common/Settings.h | 2 ++ src/lib/gui/config/AppConfig.cpp | 14 +------------- src/lib/gui/config/AppConfig.h | 5 +---- src/lib/gui/config/IAppConfig.h | 2 -- src/test/shared/gui/mocks/AppConfigMock.h | 2 -- 8 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index 2393305b7..b201bffc3 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -850,7 +850,7 @@ void MainWindow::showEvent(QShowEvent *event) void MainWindow::closeEvent(QCloseEvent *event) { - if (m_appConfig.closeToTray() && event->spontaneous()) { + if (Settings::value(Settings::Gui::CloseToTray).toBool() && event->spontaneous()) { if (m_appConfig.showCloseReminder()) { messages::showCloseReminder(this); m_appConfig.setShowCloseReminder(false); @@ -881,7 +881,8 @@ void MainWindow::showFirstConnectedMessage() m_configScopes.save(); const auto isServer = m_coreProcess.mode() == CoreMode::Server; - messages::showFirstConnectedMessage(this, m_appConfig.closeToTray(), m_appConfig.enableService(), isServer); + const auto closeToTray = Settings::value(Settings::Gui::CloseToTray).toBool(); + messages::showFirstConnectedMessage(this, closeToTray, m_appConfig.enableService(), isServer); } void MainWindow::updateStatus() diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp index 8e6237774..fd18f9def 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp @@ -158,7 +158,7 @@ void SettingsDialog::accept() m_appConfig.setLanguageSync(ui->cbLanguageSync->isChecked()); m_appConfig.setInvertScrollDirection(ui->cbScrollDirection->isChecked()); m_appConfig.setEnableService(ui->cbServiceEnabled->isChecked()); - m_appConfig.setCloseToTray(ui->cbCloseToTray->isChecked()); + Settings::setValue(Settings::Gui::CloseToTray, ui->cbCloseToTray->isChecked()); Settings::setValue(Settings::Gui::SymbolicTrayIcon, ui->rbIconMono->isChecked()); m_appConfig.setRequireClientCerts(ui->cbRequireClientCert->isChecked()); @@ -188,7 +188,7 @@ void SettingsDialog::loadFromConfig() ui->cbLanguageSync->setChecked(m_appConfig.languageSync()); ui->cbScrollDirection->setChecked(m_appConfig.invertScrollDirection()); ui->cbServiceEnabled->setChecked(m_appConfig.enableService()); - ui->cbCloseToTray->setChecked(m_appConfig.closeToTray()); + ui->cbCloseToTray->setChecked(Settings::value(Settings::Gui::CloseToTray).toBool()); ui->comboElevate->setCurrentIndex(static_cast(m_appConfig.elevateMode())); ui->cbAutoUpdate->setChecked(Settings::value(Settings::Gui::Autohide).toBool()); diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index ff13fa75a..9000f7a56 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -73,7 +73,7 @@ QVariant Settings::defaultValue(const QString &key) return false; } - if ((key == Gui::LogExpanded) || (key == Gui::SymbolicTrayIcon)) { + if ((key == Gui::CloseToTray) || (key == Gui::LogExpanded) || (key == Gui::SymbolicTrayIcon)) { return true; } diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index e088f170c..0517a90e6 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -38,6 +38,7 @@ public: { inline static const auto Autohide = QStringLiteral("gui/autoHide"); inline static const auto AutoUpdateCheck = QStringLiteral("gui/enableUpdateCheck"); + inline static const auto CloseToTray = QStringLiteral("gui/closeToTray"); inline static const auto LogExpanded = QStringLiteral("gui/logExpanded"); inline static const auto SymbolicTrayIcon = QStringLiteral("gui/symbolicTrayIcon"); }; @@ -75,6 +76,7 @@ private: Core::Scope , Gui::Autohide , Gui::AutoUpdateCheck + , Gui::CloseToTray , Gui::LogExpanded , Gui::SymbolicTrayIcon }; diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp index 276487aa8..66f9489cf 100644 --- a/src/lib/gui/config/AppConfig.cpp +++ b/src/lib/gui/config/AppConfig.cpp @@ -71,7 +71,7 @@ const char *const AppConfig::m_SettingsName[] = { "", // 35 = clientHostMode, obsolete "", // 36 = serverClientMode, obsolete "enableService", - "closeToTray", + "", // 38 Moved to deskflow settings "mainWindowSize", "mainWindowPosition", "", // 41 = Show dev thanks, obsolete @@ -132,7 +132,6 @@ void AppConfig::recallFromCurrentScope() m_LanguageSync = getFromCurrentScope(kLanguageSync, m_LanguageSync).toBool(); m_InvertScrollDirection = getFromCurrentScope(kInvertScrollDirection, m_InvertScrollDirection).toBool(); m_EnableService = getFromCurrentScope(kEnableService, m_EnableService).toBool(); - m_CloseToTray = getFromCurrentScope(kCloseToTray, m_CloseToTray).toBool(); m_TlsEnabled = getFromCurrentScope(kTlsEnabled, m_TlsEnabled).toBool(); m_TlsCertPath = getFromCurrentScope(kTlsCertPath, m_TlsCertPath).toString(); m_TlsKeyLength = getFromCurrentScope(kTlsKeyLength, m_TlsKeyLength).toInt(); @@ -190,7 +189,6 @@ void AppConfig::commit() setInCurrentScope(kLanguageSync, m_LanguageSync); setInCurrentScope(kInvertScrollDirection, m_InvertScrollDirection); setInCurrentScope(kEnableService, m_EnableService); - setInCurrentScope(kCloseToTray, m_CloseToTray); setInCurrentScope(kMainWindowSize, m_MainWindowSize); setInCurrentScope(kMainWindowPosition, m_MainWindowPosition); setInCurrentScope(kShowCloseReminder, m_ShowCloseReminder); @@ -501,11 +499,6 @@ bool AppConfig::enableService() const return m_EnableService; } -bool AppConfig::closeToTray() const -{ - return m_CloseToTray; -} - bool AppConfig::serverGroupChecked() const { return m_ServerGroupChecked; @@ -691,11 +684,6 @@ void AppConfig::setEnableService(bool enabled) m_EnableService = enabled; } -void AppConfig::setCloseToTray(bool minimize) -{ - m_CloseToTray = minimize; -} - void AppConfig::setRequireClientCerts(bool requireClientCerts) { if (requireClientCerts == m_RequireClientCert) diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index bc8d0b364..c37542a25 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -93,7 +93,7 @@ private: // 35 = client-host-mode, obsolete // 36 = server-client-mode, obsolete kEnableService = 37, - kCloseToTray = 38, + // 38, close to tray moved to deskflow settings kMainWindowSize = 39, kMainWindowPosition = 40, // 41 = show dev thanks, obsolete @@ -157,7 +157,6 @@ public: bool isActiveScopeSystem() const override; int logLevel() const override; bool enableService() const override; - bool closeToTray() const override; bool clientGroupChecked() const override; bool requireClientCerts() const override; @@ -190,7 +189,6 @@ public: void setLanguageSync(bool b) override; void setPreventSleep(bool b) override; void setEnableService(bool enabled) override; - void setCloseToTray(bool minimize) override; void setTlsCertPath(const QString &path) override; void setTlsKeyLength(int length) override; void setRequireClientCerts(bool requireClientCerts) override; @@ -305,7 +303,6 @@ private: bool m_ClientGroupChecked = false; QString m_ServerHostname = ""; bool m_EnableService = deskflow::gui::kDefaultProcessMode == ProcessMode::kService; - bool m_CloseToTray = true; int m_TlsKeyLength = deskflow::gui::kDefaultTlsKeyLength; std::optional m_MainWindowSize; std::optional m_MainWindowPosition; diff --git a/src/lib/gui/config/IAppConfig.h b/src/lib/gui/config/IAppConfig.h index e4510f6f5..25a6b4fbd 100644 --- a/src/lib/gui/config/IAppConfig.h +++ b/src/lib/gui/config/IAppConfig.h @@ -54,7 +54,6 @@ public: virtual const QString &serverHostname() const = 0; virtual int logLevel() const = 0; virtual bool enableService() const = 0; - virtual bool closeToTray() const = 0; virtual bool isActiveScopeSystem() const = 0; virtual bool isActiveScopeWritable() const = 0; virtual bool clientGroupChecked() const = 0; @@ -79,7 +78,6 @@ public: virtual void setLanguageSync(bool languageSync) = 0; virtual void setInvertScrollDirection(bool invertScrollDirection) = 0; virtual void setEnableService(bool enableService) = 0; - virtual void setCloseToTray(bool closeToTray) = 0; virtual void setRequireClientCerts(bool requireClientCerts) = 0; }; diff --git a/src/test/shared/gui/mocks/AppConfigMock.h b/src/test/shared/gui/mocks/AppConfigMock.h index 6babe09b4..62aee845e 100644 --- a/src/test/shared/gui/mocks/AppConfigMock.h +++ b/src/test/shared/gui/mocks/AppConfigMock.h @@ -55,7 +55,6 @@ public: MOCK_METHOD(const QString &, serverHostname, (), (const, override)); MOCK_METHOD(int, logLevel, (), (const, override)); MOCK_METHOD(bool, enableService, (), (const, override)); - MOCK_METHOD(bool, closeToTray, (), (const, override)); MOCK_METHOD(bool, isActiveScopeSystem, (), (const, override)); MOCK_METHOD(bool, isActiveScopeWritable, (), (const, override)); MOCK_METHOD(bool, clientGroupChecked, (), (const, override)); @@ -80,7 +79,6 @@ public: MOCK_METHOD(void, setLanguageSync, (bool languageSync), (override)); MOCK_METHOD(void, setInvertScrollDirection, (bool invertScrollDirection), (override)); MOCK_METHOD(void, setEnableService, (bool enableService), (override)); - MOCK_METHOD(void, setCloseToTray, (bool closeToTray), (override)); MOCK_METHOD(void, setRequireClientCerts, (bool requireClientCerts), (override)); private: