only show welcome window if no settings exists

AllanChain · Jan 26, 2025 · 29afda2 · 29afda2
1 parent b62873a
commit 29afda2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -35,14 +35,14 @@ int main(int argc, char *argv[]) {
   LinuxSystemSupport::check();
 #endif  // Q_OS_LINUX
 
-  if (SanePreferences::shownWelcome->get() == false) {
+  if (!QFile::exists(getSettings().fileName())) {
     WelcomeWindow *welcome = new WelcomeWindow();
-    welcome->show();
     if (welcome->exec() == QDialog::Rejected) {
       return 0;
     } else {
       SanePreferences::shownWelcome->set(true);
     }
+    welcome->deleteLater();
   }
 
   SaneBreakApp *app = new SaneBreakApp();

diff --git a/src/preferences.cpp b/src/preferences.cpp
@@ -4,12 +4,21 @@
 
 #include "preferences.h"
 
+#include <QCoreApplication>
 #include <QObject>
+#include <QSettings>
 #include <QString>
 #include <QtContainerFwd>
 
 Setting<bool>* SanePreferences::shownWelcome =
     new Setting<bool>("shown-welcome", false);
+QSettings getSettings() {
+  // We prefer settings file next to the app executable to make app more portable
+  QFile portableSettings(QCoreApplication::applicationDirPath() + "/SaneBreak.ini");
+  if (!portableSettings.exists()) return QSettings();
+  return QSettings(portableSettings.fileName(), QSettings::IniFormat);
+};
+
 Setting<int>* SanePreferences::smallEvery = new Setting<int>("break/small-every", 1200);
 Setting<int>* SanePreferences::smallFor = new Setting<int>("break/small-for", 20);
 Setting<int>* SanePreferences::bigAfter = new Setting<int>("break/big-after", 3);

diff --git a/src/preferences.h b/src/preferences.h
@@ -5,22 +5,17 @@
 #ifndef SANE_PREFERENCES_H
 #define SANE_PREFERENCES_H
 
-#include <QCoreApplication>
 #include <QFile>
 #include <QObject>
 #include <QSettings>
 #include <QtContainerFwd>
 
+QSettings getSettings();
+
 class SettingWithSignal : public QObject {
   Q_OBJECT
  public:
   SettingWithSignal(QObject *parent = 0) : QObject(parent) {}
-  QSettings getSettings() {
-    // We prefer settings file next to the app executable to make app more portable
-    QFile portableSettings(QCoreApplication::applicationDirPath() + "/SaneBreak.ini");
-    if (!portableSettings.exists()) return QSettings();
-    return QSettings(portableSettings.fileName(), QSettings::IniFormat);
-  };
  signals:
   void changed();
 };