From b7960eecb479b7da99fd887f28a56f51e9f6b6b9 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 6 Mar 2025 22:07:14 -0500 Subject: [PATCH] refactor: move preventSleep to Settings newkey: core/preventSleep <= General/preventSleep remove prevent sleep from app config --- src/apps/deskflow-gui/dialogs/SettingsDialog.cpp | 4 ++-- src/lib/common/Settings.cpp | 3 ++- 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/lib/gui/core/CoreProcess.cpp | 2 +- src/test/shared/gui/mocks/AppConfigMock.h | 2 -- 8 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp index d9d8ce5e3..5272a9a2f 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp @@ -151,7 +151,7 @@ void SettingsDialog::accept() m_appConfig.setElevateMode(static_cast(ui->comboElevate->currentIndex())); Settings::setValue(Settings::Gui::Autohide, ui->cbAutoHide->isChecked()); Settings::setValue(Settings::Gui::AutoUpdateCheck, ui->cbAutoUpdate->isChecked()); - m_appConfig.setPreventSleep(ui->cbPreventSleep->isChecked()); + Settings::setValue(Settings::Core::PreventSleep, ui->cbPreventSleep->isChecked()); Settings::setValue(Settings::Security::Certificate, ui->lineTlsCertPath->text()); Settings::setValue(Settings::Security::KeySize, ui->comboTlsKeyLength->currentText().toInt()); Settings::setValue(Settings::Security::TlsEnabled, ui->groupSecurity->isChecked()); @@ -184,7 +184,7 @@ void SettingsDialog::loadFromConfig() ui->cbLogToFile->setChecked(m_appConfig.logToFile()); ui->lineLogFilename->setText(m_appConfig.logFilename()); ui->cbAutoHide->setChecked(Settings::value(Settings::Gui::Autohide).toBool()); - ui->cbPreventSleep->setChecked(m_appConfig.preventSleep()); + ui->cbPreventSleep->setChecked(Settings::value(Settings::Core::PreventSleep).toBool()); ui->cbLanguageSync->setChecked(m_appConfig.languageSync()); ui->cbScrollDirection->setChecked(m_appConfig.invertScrollDirection()); ui->cbServiceEnabled->setChecked(m_appConfig.enableService()); diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 8963ac776..67d3df7dc 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -70,7 +70,8 @@ void Settings::cleanSettings() QVariant Settings::defaultValue(const QString &key) { - if ((key == Core::Scope) || (key == Gui::Autohide) || (key == Core::StartedBefore)) { + if ((key == Core::Scope) || (key == Gui::Autohide) || (key == Core::StartedBefore) || + (key == Core::PreventSleep)) { return false; } diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 05fbcc06e..56cdeb116 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -32,6 +32,7 @@ public: struct Core { inline static const auto LastVersion = QStringLiteral("core/lastVersion"); + inline static const auto PreventSleep = QStringLiteral("core/preventSleep"); inline static const auto Scope = QStringLiteral("core/loadFromSystemScope"); inline static const auto StartedBefore = QStringLiteral("core/startedBefore"); }; @@ -84,6 +85,7 @@ private: // clang-format off inline static const QStringList m_validKeys = { Core::LastVersion + , Core::PreventSleep , Core::Scope , Core::StartedBefore , Gui::Autohide diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp index 5d58184da..4b3d37feb 100644 --- a/src/lib/gui/config/AppConfig.cpp +++ b/src/lib/gui/config/AppConfig.cpp @@ -61,7 +61,7 @@ const char *const AppConfig::m_SettingsName[] = { "serverHostname", "", // 26 cert path moved to deskflow settings "", // 27 key length Moved to Deskflow settings - "preventSleep", + "", // 28 Prevent sleep moved to deskflow settings "languageSync", "invertScrollDirection", "", // 31 = guid, obsolete @@ -125,7 +125,6 @@ void AppConfig::recallFromCurrentScope() m_UseInternalConfig = getFromCurrentScope(kUseInternalConfig, m_UseInternalConfig).toBool(); m_ClientGroupChecked = getFromCurrentScope(kClientGroupChecked, m_ClientGroupChecked).toBool(); m_ServerHostname = getFromCurrentScope(kServerHostname, m_ServerHostname).toString(); - m_PreventSleep = getFromCurrentScope(kPreventSleep, m_PreventSleep).toBool(); m_LanguageSync = getFromCurrentScope(kLanguageSync, m_LanguageSync).toBool(); m_InvertScrollDirection = getFromCurrentScope(kInvertScrollDirection, m_InvertScrollDirection).toBool(); m_EnableService = getFromCurrentScope(kEnableService, m_EnableService).toBool(); @@ -171,7 +170,6 @@ void AppConfig::commit() setInCurrentScope(kConfigFile, m_ConfigFile); setInCurrentScope(kUseInternalConfig, m_UseInternalConfig); setInCurrentScope(kServerHostname, m_ServerHostname); - setInCurrentScope(kPreventSleep, m_PreventSleep); setInCurrentScope(kLanguageSync, m_LanguageSync); setInCurrentScope(kInvertScrollDirection, m_InvertScrollDirection); setInCurrentScope(kEnableService, m_EnableService); @@ -441,11 +439,6 @@ bool AppConfig::languageSync() const return m_LanguageSync; } -bool AppConfig::preventSleep() const -{ - return m_PreventSleep; -} - bool AppConfig::enableService() const { return m_EnableService; @@ -568,11 +561,6 @@ void AppConfig::setLanguageSync(bool newValue) m_LanguageSync = newValue; } -void AppConfig::setPreventSleep(bool newValue) -{ - m_PreventSleep = newValue; -} - void AppConfig::setEnableService(bool enabled) { m_EnableService = enabled; diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index 5101d4fd9..d39f0fee8 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -82,7 +82,7 @@ private: kServerHostname = 25, // 26 = kTlsCertPath moved to deskflow settings // 27 = tlsKeyLength Moved to deskflow settings - kPreventSleep = 28, + // 28 = Prevent Sleep moved to deskflow settings kLanguageSync = 29, kInvertScrollDirection = 30, // 31 = guid, obsolete @@ -133,7 +133,6 @@ public: QString logLevelText() const override; const QString &screenName() const override; bool logToFile() const override; - bool preventSleep() const override; const QString &logFilename() const override; QString coreServerName() const override; QString coreClientName() const override; @@ -172,7 +171,6 @@ public: void setElevateMode(ElevateMode em) override; void setInvertScrollDirection(bool b) override; void setLanguageSync(bool b) override; - void setPreventSleep(bool b) override; void setEnableService(bool enabled) override; // @@ -264,7 +262,6 @@ private: ElevateMode m_ElevateMode = deskflow::gui::kDefaultElevateMode; bool m_InvertScrollDirection = false; bool m_LanguageSync = true; - bool m_PreventSleep = false; bool m_ServerGroupChecked = false; bool m_UseExternalConfig = false; QString m_ConfigFile = QStringLiteral("%1/%2.%3").arg(QDir::homePath(), kAppId, s_ConfigFileExt); diff --git a/src/lib/gui/config/IAppConfig.h b/src/lib/gui/config/IAppConfig.h index 0f6712213..87c013f01 100644 --- a/src/lib/gui/config/IAppConfig.h +++ b/src/lib/gui/config/IAppConfig.h @@ -36,7 +36,6 @@ public: virtual ElevateMode elevateMode() const = 0; virtual QString logLevelText() const = 0; virtual const QString &screenName() const = 0; - virtual bool preventSleep() const = 0; virtual bool logToFile() const = 0; virtual const QString &logFilename() const = 0; virtual QString coreServerName() const = 0; @@ -67,7 +66,6 @@ public: virtual void setLogToFile(bool logToFile) = 0; virtual void setLogFilename(const QString &logFilename) = 0; virtual void setElevateMode(ElevateMode elevateMode) = 0; - virtual void setPreventSleep(bool preventSleep) = 0; virtual void setLanguageSync(bool languageSync) = 0; virtual void setInvertScrollDirection(bool invertScrollDirection) = 0; virtual void setEnableService(bool enableService) = 0; diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index 5093d3368..88ca633bb 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -512,7 +512,7 @@ bool CoreProcess::addGenericArgs(QStringList &args, const ProcessMode processMod args << "--profile-dir" << m_pDeps->getProfileRoot(); #endif - if (m_appConfig.preventSleep()) { + if (Settings::value(Settings::Core::PreventSleep).toBool()) { args << "--prevent-sleep"; } diff --git a/src/test/shared/gui/mocks/AppConfigMock.h b/src/test/shared/gui/mocks/AppConfigMock.h index b8a95e158..c375f0595 100644 --- a/src/test/shared/gui/mocks/AppConfigMock.h +++ b/src/test/shared/gui/mocks/AppConfigMock.h @@ -37,7 +37,6 @@ public: MOCK_METHOD(ElevateMode, elevateMode, (), (const, override)); MOCK_METHOD(QString, logLevelText, (), (const, override)); MOCK_METHOD(const QString &, screenName, (), (const, override)); - MOCK_METHOD(bool, preventSleep, (), (const, override)); MOCK_METHOD(bool, logToFile, (), (const, override)); MOCK_METHOD(const QString &, logFilename, (), (const, override)); MOCK_METHOD(QString, coreServerName, (), (const, override)); @@ -68,7 +67,6 @@ public: MOCK_METHOD(void, setLogToFile, (bool logToFile), (override)); MOCK_METHOD(void, setLogFilename, (const QString &logFilename), (override)); MOCK_METHOD(void, setElevateMode, (ElevateMode elevateMode), (override)); - MOCK_METHOD(void, setPreventSleep, (bool preventSleep), (override)); MOCK_METHOD(void, setLanguageSync, (bool languageSync), (override)); MOCK_METHOD(void, setInvertScrollDirection, (bool invertScrollDirection), (override)); MOCK_METHOD(void, setEnableService, (bool enableService), (override));