From d45d6baacb0d2e8582f7a7a6656731382bf4e43b Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 8 Mar 2025 16:51:41 -0500 Subject: [PATCH] refactor: move langageSync to Settings newkey: client/languageSync <= General/languageSync removed languageSync from appconfig --- src/apps/deskflow-gui/dialogs/SettingsDialog.cpp | 4 ++-- src/lib/common/Settings.cpp | 6 +++--- 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, 10 insertions(+), 27 deletions(-) diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp index 0f8a8169a..be1888bca 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp @@ -155,7 +155,7 @@ void SettingsDialog::accept() 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()); - m_appConfig.setLanguageSync(ui->cbLanguageSync->isChecked()); + Settings::setValue(Settings::Client::LanguageSync, ui->cbLanguageSync->isChecked()); Settings::setValue(Settings::Client::InvertScrollDirection, ui->cbScrollDirection->isChecked()); m_appConfig.setEnableService(ui->cbServiceEnabled->isChecked()); Settings::setValue(Settings::Gui::CloseToTray, ui->cbCloseToTray->isChecked()); @@ -185,7 +185,7 @@ void SettingsDialog::loadFromConfig() ui->lineLogFilename->setText(m_appConfig.logFilename()); ui->cbAutoHide->setChecked(Settings::value(Settings::Gui::Autohide).toBool()); ui->cbPreventSleep->setChecked(Settings::value(Settings::Core::PreventSleep).toBool()); - ui->cbLanguageSync->setChecked(m_appConfig.languageSync()); + ui->cbLanguageSync->setChecked(Settings::value(Settings::Client::LanguageSync).toBool()); ui->cbScrollDirection->setChecked(Settings::value(Settings::Client::InvertScrollDirection).toBool()); ui->cbServiceEnabled->setChecked(m_appConfig.enableService()); ui->cbCloseToTray->setChecked(Settings::value(Settings::Gui::CloseToTray).toBool()); diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 98fe49fe5..8999cfec8 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -71,13 +71,13 @@ void Settings::cleanSettings() QVariant Settings::defaultValue(const QString &key) { if ((key == Core::Scope) || (key == Gui::Autohide) || (key == Core::StartedBefore) || - (key == Core::PreventSleep) || (key == Server::ExternalConfig) || - (key == Client::InvertScrollDirection)) { + (key == Core::PreventSleep) || (key == Server::ExternalConfig) || (key == Client::InvertScrollDirection)) { return false; } if ((key == Gui::CloseToTray) || (key == Gui::LogExpanded) || (key == Gui::SymbolicTrayIcon) - || (key == Gui::CloseReminder) || (key == Security::TlsEnabled) || (key == Security::CheckPeers)) { + || (key == Gui::CloseReminder) || (key == Security::TlsEnabled) || (key == Security::CheckPeers) + || (key == Client::LanguageSync)) { return true; } diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 428f47d84..5df205d55 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -33,6 +33,7 @@ public: { inline static const auto Binary = QStringLiteral("client/binary"); inline static const auto InvertScrollDirection = QStringLiteral("client/invertscolldirection"); + inline static const auto LanguageSync = QStringLiteral("client/languageSync"); inline static const auto RemoteHost = QStringLiteral("client/remotehost"); }; struct Core @@ -98,6 +99,7 @@ private: inline static const QStringList m_validKeys = { Client::Binary , Client::InvertScrollDirection + , Client::LanguageSync , Client::RemoteHost , Core::LastVersion , Core::PreventSleep diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp index 24570d5e3..694f67156 100644 --- a/src/lib/gui/config/AppConfig.cpp +++ b/src/lib/gui/config/AppConfig.cpp @@ -62,7 +62,7 @@ const char *const AppConfig::m_SettingsName[] = { "", // 26 cert path moved to deskflow settings "", // 27 key length Moved to Deskflow settings "", // 28 Prevent sleep moved to deskflow settings - "languageSync", + "", // 29 Language sync moved to deskflow settings "", // 30 = invertscrolldriection moved to deskflow settings "", // 31 = guid, obsolete "", // 32 = licenseRegistryUrl, obsolete @@ -122,7 +122,6 @@ void AppConfig::recallFromCurrentScope() m_ServerGroupChecked = getFromCurrentScope(kServerGroupChecked, m_ServerGroupChecked).toBool(); m_UseInternalConfig = getFromCurrentScope(kUseInternalConfig, m_UseInternalConfig).toBool(); m_ClientGroupChecked = getFromCurrentScope(kClientGroupChecked, m_ClientGroupChecked).toBool(); - m_LanguageSync = getFromCurrentScope(kLanguageSync, m_LanguageSync).toBool(); m_EnableService = getFromCurrentScope(kEnableService, m_EnableService).toBool(); } @@ -163,7 +162,6 @@ void AppConfig::commit() setInCurrentScope(kElevateMode, static_cast(m_ElevateMode)); setInCurrentScope(kElevateModeLegacy, m_ElevateMode == ElevateMode::kAlways); setInCurrentScope(kUseInternalConfig, m_UseInternalConfig); - setInCurrentScope(kLanguageSync, m_LanguageSync); setInCurrentScope(kEnableService, m_EnableService); } } @@ -403,11 +401,6 @@ ElevateMode AppConfig::elevateMode() const return m_ElevateMode; } -bool AppConfig::languageSync() const -{ - return m_LanguageSync; -} - bool AppConfig::enableService() const { return m_EnableService; @@ -490,11 +483,6 @@ void AppConfig::setElevateMode(ElevateMode em) m_ElevateMode = em; } -void AppConfig::setLanguageSync(bool newValue) -{ - m_LanguageSync = 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 411776f64..227db23b0 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -83,7 +83,7 @@ private: // 26 = kTlsCertPath moved to deskflow settings // 27 = tlsKeyLength Moved to deskflow settings // 28 = Prevent Sleep moved to deskflow settings - kLanguageSync = 29, + // 29 = language Sync moved to deskflow settings // 30 = InvertScrollDirection moved to deskflow settings // 31 = guid, obsolete // 32 = license registry url, obsolete @@ -135,7 +135,6 @@ public: bool logToFile() const override; const QString &logFilename() const override; void persistLogDir() const override; - bool languageSync() const override; int port() const override; const QString &networkInterface() const override; bool isActiveScopeWritable() const override; @@ -163,7 +162,6 @@ public: void setLogToFile(bool b) override; void setLogFilename(const QString &s) override; void setElevateMode(ElevateMode em) override; - void setLanguageSync(bool b) override; void setEnableService(bool enabled) override; // @@ -237,7 +235,6 @@ private: bool m_LogToFile = false; QString m_LogFilename = logDir() + deskflow::gui::kDefaultLogFile; ElevateMode m_ElevateMode = deskflow::gui::kDefaultElevateMode; - bool m_LanguageSync = true; bool m_ServerGroupChecked = false; bool m_UseInternalConfig = false; bool m_ClientGroupChecked = false; diff --git a/src/lib/gui/config/IAppConfig.h b/src/lib/gui/config/IAppConfig.h index f49774b99..64fcbdac1 100644 --- a/src/lib/gui/config/IAppConfig.h +++ b/src/lib/gui/config/IAppConfig.h @@ -39,7 +39,6 @@ public: virtual bool logToFile() const = 0; virtual const QString &logFilename() const = 0; virtual void persistLogDir() const = 0; - virtual bool languageSync() const = 0; virtual int port() const = 0; virtual const QString &networkInterface() const = 0; virtual int logLevel() const = 0; @@ -60,7 +59,6 @@ public: virtual void setLogToFile(bool logToFile) = 0; virtual void setLogFilename(const QString &logFilename) = 0; virtual void setElevateMode(ElevateMode elevateMode) = 0; - virtual void setLanguageSync(bool languageSync) = 0; virtual void setEnableService(bool enableService) = 0; }; diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index 784f6698e..1dfb2a613 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -581,7 +581,7 @@ bool CoreProcess::addClientArgs(QStringList &args, QString &app) args << "--log" << m_appConfig.logFilename(); } - if (m_appConfig.languageSync()) { + if (Settings::value(Settings::Client::LanguageSync).toBool()) { args << "--sync-language"; } diff --git a/src/test/shared/gui/mocks/AppConfigMock.h b/src/test/shared/gui/mocks/AppConfigMock.h index 1c72b53ad..d80f85a13 100644 --- a/src/test/shared/gui/mocks/AppConfigMock.h +++ b/src/test/shared/gui/mocks/AppConfigMock.h @@ -40,7 +40,6 @@ public: MOCK_METHOD(bool, logToFile, (), (const, override)); MOCK_METHOD(const QString &, logFilename, (), (const, override)); MOCK_METHOD(void, persistLogDir, (), (const, override)); - MOCK_METHOD(bool, languageSync, (), (const, override)); MOCK_METHOD(int, port, (), (const, override)); MOCK_METHOD(const QString &, networkInterface, (), (const, override)); MOCK_METHOD(int, logLevel, (), (const, override)); @@ -61,7 +60,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, setLanguageSync, (bool languageSync), (override)); MOCK_METHOD(void, setEnableService, (bool enableService), (override)); private: