refactor: move autohide setting to Settings

newkey: gui/autoHide <= General/autoHide
auto hide has been removed from `AppConfig`

src/apps/deskflow-gui/MainWindow.cpp

@@ -637,11 +637,7 @@ void MainWindow::open()
     m_coreProcess.start();
   }
 
-  if (m_appConfig.autoHide()) {
-    hide();
-  } else {
-    showAndActivate();
-  }
+  Settings::value(Settings::Gui::Autohide).toBool() ? hide() : showAndActivate();
 }
 
 void MainWindow::coreProcessStarting()

src/apps/deskflow-gui/dialogs/SettingsDialog.cpp

@@ -9,6 +9,7 @@
 #include "SettingsDialog.h"
 #include "ui_SettingsDialog.h"
 
+#include "common/Settings.h"
 #include "gui/core/CoreProcess.h"
 #include "gui/messages.h"
 #include "gui/tls/TlsCertificate.h"
@@ -148,7 +149,7 @@ void SettingsDialog::accept()
   m_appConfig.setLogToFile(ui->cbLogToFile->isChecked());
   m_appConfig.setLogFilename(ui->lineLogFilename->text());
   m_appConfig.setElevateMode(static_cast<ElevateMode>(ui->comboElevate->currentIndex()));
-  m_appConfig.setAutoHide(ui->cbAutoHide->isChecked());
+  Settings::setValue(Settings::Gui::Autohide, ui->cbAutoHide->isChecked());
   m_appConfig.setEnableUpdateCheck(ui->cbAutoUpdate->isChecked());
   m_appConfig.setPreventSleep(ui->cbPreventSleep->isChecked());
   m_appConfig.setTlsCertPath(ui->lineTlsCertPath->text());
@@ -182,7 +183,7 @@ void SettingsDialog::loadFromConfig()
   ui->comboLogLevel->setCurrentIndex(m_appConfig.logLevel());
   ui->cbLogToFile->setChecked(m_appConfig.logToFile());
   ui->lineLogFilename->setText(m_appConfig.logFilename());
-  ui->cbAutoHide->setChecked(m_appConfig.autoHide());
+  ui->cbAutoHide->setChecked(Settings::value(Settings::Gui::Autohide).toBool());
   ui->cbPreventSleep->setChecked(m_appConfig.preventSleep());
   ui->cbLanguageSync->setChecked(m_appConfig.languageSync());
   ui->cbScrollDirection->setChecked(m_appConfig.invertScrollDirection());

src/lib/common/Settings.cpp

@@ -69,7 +69,7 @@ void Settings::cleanSettings()
 
 QVariant Settings::defaultValue(const QString &key)
 {
-  if (key == Core::Scope) {
+  if ((key == Core::Scope) || (key == Gui::Autohide)) {
     return false;
   }
 

src/lib/common/Settings.h

@@ -36,6 +36,7 @@ public:
   };
   struct Gui
   {
+    inline static const auto Autohide = QStringLiteral("gui/autoHide");
     inline static const auto LogExpanded = QStringLiteral("gui/logExpanded");
   };
 
@@ -70,6 +71,7 @@ private:
   // clang-format off
   inline static const QStringList m_validKeys = {
       Core::Scope
+    , Gui::Autohide
     , Gui::LogExpanded
   };
   // clang-format on

src/lib/gui/config/AppConfig.cpp

@@ -45,8 +45,8 @@ const char *const AppConfig::m_SettingsName[] = {
     "elevateModeEnum",
     "",              // 10 = edition, obsolete (using serial key instead)
     "cryptoEnabled", // 11 = kTlsEnabled (retain legacy string value)
-    "autoHide",
-    "", // 13 = serialKey, obsolete
+    "",              // 12 AutoHide, moved to Settings
+    "",              // 13 = serialKey, obsolete
     "lastVersion",
     "", // 15 = lastExpiringWarningTime, obsolete
     "", // 16 = activationHasRun, obsolete
@@ -121,7 +121,6 @@ void AppConfig::recallFromCurrentScope()
   m_LogToFile = getFromCurrentScope(kLogToFile, m_LogToFile).toBool();
   m_LogFilename = getFromCurrentScope(kLogFilename, m_LogFilename).toString();
   m_StartedBefore = getFromCurrentScope(kStartedBefore, m_StartedBefore).toBool();
-  m_AutoHide = getFromCurrentScope(kAutoHide, m_AutoHide).toBool();
   m_LastVersion = getFromCurrentScope(kLastVersion, m_LastVersion).toString();
   m_ServerGroupChecked = getFromCurrentScope(kServerGroupChecked, m_ServerGroupChecked).toBool();
   m_UseExternalConfig = getFromCurrentScope(kUseExternalConfig, m_UseExternalConfig).toBool();
@@ -184,7 +183,6 @@ void AppConfig::commit()
     setInCurrentScope(kElevateMode, static_cast<int>(m_ElevateMode));
     setInCurrentScope(kElevateModeLegacy, m_ElevateMode == ElevateMode::kAlways);
     setInCurrentScope(kTlsEnabled, m_TlsEnabled);
-    setInCurrentScope(kAutoHide, m_AutoHide);
     setInCurrentScope(kLastVersion, m_LastVersion);
     setInCurrentScope(kUseExternalConfig, m_UseExternalConfig);
     setInCurrentScope(kConfigFile, m_ConfigFile);
@@ -477,11 +475,6 @@ bool AppConfig::tlsEnabled() const
   return m_TlsEnabled;
 }
 
-bool AppConfig::autoHide() const
-{
-  return m_AutoHide;
-}
-
 bool AppConfig::invertScrollDirection() const
 {
   return m_InvertScrollDirection;
@@ -692,11 +685,6 @@ void AppConfig::setElevateMode(ElevateMode em)
   m_ElevateMode = em;
 }
 
-void AppConfig::setAutoHide(bool b)
-{
-  m_AutoHide = b;
-}
-
 void AppConfig::setInvertScrollDirection(bool newValue)
 {
   m_InvertScrollDirection = newValue;

src/lib/gui/config/AppConfig.h

@@ -67,7 +67,7 @@ private:
     kElevateMode = 9,
     // 10 = edition, obsolete (related to obsolete licensing)
     kTlsEnabled = 11,
-    kAutoHide = 12,
+    // 12 = auto hide, Moved to Settings
     // 13 = serial key, obsolete
     kLastVersion = 14,
     // 15 = last expire time, obsolete
@@ -156,7 +156,6 @@ public:
   bool isActiveScopeWritable() const override;
   bool isActiveScopeSystem() const override;
   int logLevel() const override;
-  bool autoHide() const override;
   bool enableService() const override;
   bool closeToTray() const override;
   bool clientGroupChecked() const override;
@@ -189,7 +188,6 @@ public:
   void setLogFilename(const QString &s) override;
   void setElevateMode(ElevateMode em) override;
   void setTlsEnabled(bool e) override;
-  void setAutoHide(bool b) override;
   void setInvertScrollDirection(bool b) override;
   void setLanguageSync(bool b) override;
   void setPreventSleep(bool b) override;
@@ -300,7 +298,6 @@ private:
   bool m_StartedBefore = false;
   ElevateMode m_ElevateMode = deskflow::gui::kDefaultElevateMode;
   bool m_TlsEnabled = true;
-  bool m_AutoHide = false;
   QString m_LastVersion = "";
   bool m_InvertScrollDirection = false;
   bool m_LanguageSync = true;

src/lib/gui/config/IAppConfig.h

@@ -53,7 +53,6 @@ public:
   virtual const QString &networkInterface() const = 0;
   virtual const QString &serverHostname() const = 0;
   virtual int logLevel() const = 0;
-  virtual bool autoHide() const = 0;
   virtual bool enableService() const = 0;
   virtual bool closeToTray() const = 0;
   virtual bool isActiveScopeSystem() const = 0;
@@ -73,7 +72,6 @@ public:
   virtual void setLogToFile(bool logToFile) = 0;
   virtual void setLogFilename(const QString &logFilename) = 0;
   virtual void setElevateMode(ElevateMode elevateMode) = 0;
-  virtual void setAutoHide(bool autoHide) = 0;
   virtual void setPreventSleep(bool preventSleep) = 0;
   virtual void setTlsCertPath(const QString &tlsCertPath) = 0;
   virtual void setTlsKeyLength(int tlsKeyLength) = 0;

src/test/shared/gui/mocks/AppConfigMock.h

@@ -54,7 +54,6 @@ public:
   MOCK_METHOD(const QString &, networkInterface, (), (const, override));
   MOCK_METHOD(const QString &, serverHostname, (), (const, override));
   MOCK_METHOD(int, logLevel, (), (const, override));
-  MOCK_METHOD(bool, autoHide, (), (const, override));
   MOCK_METHOD(bool, enableService, (), (const, override));
   MOCK_METHOD(bool, closeToTray, (), (const, override));
   MOCK_METHOD(bool, isActiveScopeSystem, (), (const, override));
@@ -74,7 +73,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, setAutoHide, (bool autoHide), (override));
   MOCK_METHOD(void, setPreventSleep, (bool preventSleep), (override));
   MOCK_METHOD(void, setTlsCertPath, (const QString &tlsCertPath), (override));
   MOCK_METHOD(void, setTlsKeyLength, (int tlsKeyLength), (override));