feat: save and reload app settings when opening a project

Saving only takes place if it's applicable.
KDAB · Mar 3, 2025 · ac2de57 · ac2de57
1 parent f64c4f3
commit ac2de57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
@@ -49,9 +49,7 @@ Settings::Settings(Mode mode, QObject *parent)
     Q_ASSERT(m_instance == nullptr);
     m_instance = this;
 
-    loadKnutSettings();
-    if (!isTesting()) // Only load if not testing
-        loadUserSettings();
+    loadBaseSettings();
 
     m_saveTimer->callOnTimeout(this, &Settings::saveSettings);
     m_saveTimer->setSingleShot(true);
@@ -63,6 +61,13 @@ Settings::~Settings()
     m_instance = nullptr;
 }
 
+void Settings::loadBaseSettings()
+{
+    loadKnutSettings();
+    if (!isTesting()) // Only load if not testing
+        loadUserSettings();
+}
+
 Settings *Settings::instance()
 {
     Q_ASSERT(m_instance);
@@ -85,6 +90,9 @@ void Settings::loadUserSettings()
 
 void Settings::loadProjectSettings(const QString &rootDir)
 {
+    saveOnExit();
+    loadBaseSettings();
+
     m_projectPath = rootDir;
 
     const QString fileName = projectFilePath();

diff --git a/src/core/settings.h b/src/core/settings.h
@@ -133,6 +133,7 @@ public slots:
 
     void loadKnutSettings();
     void loadUserSettings();
+    void loadBaseSettings();
     void updatePaths(const QString &path, const std::string &json_path, bool add);
     void saveSettings();
     void saveOnExit();