Save window geometry into correct file

�# Please enter the commit message for your changes. Lines starting

Author: timschneeb

src/MainWindow.cpp

@@ -107,7 +107,7 @@ MainWindow::MainWindow(bool     statupInTray,
         this->setWindowIcon(QIcon::fromTheme("jamesdsp", QIcon(":/icons/icon.png")));
 
         // Restore window size and position
-        const QByteArray geometry = QSettings().value("geometry", QByteArray()).toByteArray();
+        const QByteArray geometry = AppConfig::instance().get<QByteArray>(AppConfig::LastWindowGeometry);
         if (!geometry.isEmpty())
         {
             restoreGeometry(geometry);
@@ -422,7 +422,7 @@ MainWindow::~MainWindow()
 // Overrides
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-    QSettings().setValue("geometry", saveGeometry());
+    AppConfig::instance().setBytes(AppConfig::LastWindowGeometry, saveGeometry());
     saveGraphicEQView();
 
 #ifdef Q_OS_OSX
@@ -444,7 +444,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 void MainWindow::resizeEvent(QResizeEvent *event)
 {
     QMainWindow::resizeEvent(event);
-    QSettings().setValue("geometry", saveGeometry());
+    AppConfig::instance().setBytes(AppConfig::LastWindowGeometry, saveGeometry());
 }
 
 

src/config/AppConfig.cpp

@@ -27,6 +27,7 @@ AppConfig::AppConfig()
     DEFINE_KEY(SetupDone, false);
     DEFINE_KEY(ExecutablePath, "");
     DEFINE_KEY(VdcLastDatabaseId, -1);
+    DEFINE_KEY(LastWindowGeometry, QByteArray());
 
     DEFINE_KEY(AudioOutputUseDefault, true);
     DEFINE_KEY(AudioOutputDevice, "");
@@ -46,6 +47,11 @@ AppConfig::AppConfig()
     load();
 }
 
+void AppConfig::setBytes(const Key &key, const QByteArray &value)
+{
+    set(key, QVariant(QString::fromLocal8Bit(value.toBase64())));
+}
+
 void AppConfig::set(const Key &key, const QStringList &value)
 {
     set(key, value.join(';'));

src/config/AppConfig.h

@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include <QMetaEnum>
+#include <optional>
 
 using namespace std;
 
@@ -57,6 +58,7 @@ class AppConfig :
         SetupDone,
         ExecutablePath,
         VdcLastDatabaseId,
+        LastWindowGeometry,
 
         AudioOutputUseDefault,
         AudioOutputDevice,
@@ -73,6 +75,9 @@ class AppConfig :
     };
     Q_ENUM(Key);
 
+    void setBytes(const Key &key,
+             const QByteArray &value);
+
     void set(const Key &key,
              const QStringList &value);
 
@@ -84,6 +89,9 @@ class AppConfig :
         if constexpr (std::is_same_v<T, QVariant>) {
             return variant;
         }
+        if constexpr (std::is_same_v<T, QByteArray>) {
+            return QByteArray::fromBase64(variant.toString().toLocal8Bit());
+        }
         if constexpr (std::is_same_v<T, std::string>) {
             return variant.toString().toStdString();
         }
@@ -113,11 +121,9 @@ class AppConfig :
         auto skey = QVariant::fromValue(key).toString();
         auto variant = _appconf->getVariant(skey, true, &exists);
 
-        QVariant defaultValue = definitions[key];
-
-        if(!exists)
+        if(!exists && definitions.contains(key))
         {
-            return convertVariant<T>(defaultValue);
+            return convertVariant<T>(definitions[key]);
         }
 
         return convertVariant<T>(variant);