Add explicit firsRun setting #299

ra3xdh · Aug 18, 2023 · 7b11881 · 7b11881
1 parent 3d693e1
commit 7b11881
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/qucs/main.cpp b/qucs/main.cpp
@@ -79,6 +79,10 @@ bool loadSettings()
         QucsSettings.DefaultSimulator = settings.value("DefaultSimulator").toInt();
     else QucsSettings.DefaultSimulator = spicecompat::simNotSpecified;
 
+    if(settings.contains("firstRun"))
+        QucsSettings.firstRun = settings.value("firstRun").toBool();
+    else QucsSettings.firstRun = true;
+
     if(settings.contains("x"))QucsSettings.x=settings.value("x").toInt();
     if(settings.contains("y"))QucsSettings.y=settings.value("y").toInt();
     if(settings.contains("dx"))QucsSettings.dx=settings.value("dx").toInt();
@@ -220,6 +224,7 @@ bool saveApplSettings()
     QSettings settings ("qucs","qucs_s");
 
     settings.setValue("DefaultSimulator", QucsSettings.DefaultSimulator);
+    settings.setValue("firstRun", false);
 
     settings.setValue("x", QucsSettings.x);
     settings.setValue("y", QucsSettings.y);

diff --git a/qucs/main.h b/qucs/main.h
@@ -112,6 +112,8 @@ struct tQucsSettings {
   bool ViewToolbar;
   bool WorkToolbar;
   bool SimulateToolbar;
+
+  bool firstRun;
 };
 
 extern tQucsSettings QucsSettings;  // extern because nearly everywhere used

diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp
@@ -209,7 +209,7 @@ QucsApp::QucsApp()
     }
   }
 
-  if (QucsSettings.DefaultSimulator == spicecompat::simNotSpecified) { // try to find Ngspice
+  if (QucsSettings.firstRun) { // try to find Ngspice
 #ifdef Q_OS_WIN
       QString ngspice_exe1 = QucsSettings.BinDir + QDir::separator() + "ngspice_con.exe";
       QString ngspice_exe2 = "C:\\Spice64\\bin\\ngspice_con.exe";
@@ -237,17 +237,14 @@ QucsApp::QucsApp()
           QucsSettings.DefaultSimulator = spicecompat::simNgspice;
           QucsSettings.NgspiceExecutable = ngspice_exe;
           fillSimulatorsComboBox();
+      } else {
+          QMessageBox::information(this,tr("Qucs"),tr("Ngspice not found automatically. Please specify simulators"
+                                                      " in the next dialog window."));
+          slotSimSettings();
       }
+      QucsSettings.firstRun = false;
   }
 
-  if (QucsSettings.DefaultSimulator == spicecompat::simNotSpecified) {
-      QMessageBox::information(this,tr("Qucs"),tr("Default simulator is not specified yet.\n"
-                                         "Please setup it in the next dialog window.\n"
-                                         "If you have no simulators except Qucs installed\n"
-                                         "in your system leave default Qucsator setting\n"
-                                         "and simple press Apply button"));
-      slotSimSettings();
-  }
 //  fillLibrariesTreeView();
 }