Show prefs dialog at end

Author: dcwhite

src/Interface/Application/CMakeLists.txt

@@ -104,6 +104,7 @@ SET(Interface_Application_FORMS
   Module.ui
   ModuleLogWindow.ui
   ConnectionStyleWizardPage.ui
+  OtherSettingsWizardPage.ui
   NetworkSearch.ui
   NoteEditor.ui
   Preferences.ui

src/Interface/Application/MainWindowCollaborators.h

@@ -179,15 +179,21 @@ namespace Gui {
     Q_OBJECT
   public:
     explicit NewUserWizard(QWidget* parent);
+    ~NewUserWizard();
+  public Q_SLOTS:
+    void setShowPrefs(int state);
   private Q_SLOTS:
     void updatePathLabel(const QString& dir);
+    void showPrefs();
   private:
     QWizardPage* createIntroPage();
     QWizardPage* createPathSettingPage();
     QWizardPage* createLicensePage();
     QWizardPage* createConnectionChoicePage();
     QWizardPage* createDocPage();
+    QWizardPage* createOtherSettingsPage();
     QLineEdit* pathWidget_;
+    bool showPrefs_{ false };
   };
 }
 }

src/Interface/Application/OtherSettingsWizardPage.ui

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OtherSettingsWizardPage</class>
+ <widget class="QWizardPage" name="OtherSettingsWizardPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>270</width>
+    <height>90</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <property name="title">
+   <string>Other settings</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="saveBeforeExecuteCheckBox_">
+     <property name="text">
+      <string>Save network before executing</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>For all options, check the preferences screen:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="loadPreferencesCheckBox_">
+     <property name="text">
+      <string>Load Preferences after setup complete</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/Interface/Application/SCIRunMainWindow.cc

@@ -1503,7 +1503,7 @@ void SCIRunMainWindow::addToDataDirectory(const QString& dir)
 
 void SCIRunMainWindow::setDataDirectoryFromGUI()
 {
-  auto dir = QFileDialog::getExistingDirectory(this, tr("Choose Data Directory"), ".");
+  auto dir = QFileDialog::getExistingDirectory(this, tr("Choose Data Directory"), QString::fromStdString(Core::Preferences::Instance().dataDirectory().parent_path().string()));
   setDataDirectory(dir);
 }