Add testing options to the Settings page

apps/launcher/settingspage.cpp

@@ -177,6 +177,28 @@ void Launcher::SettingsPage::on_browseButton_clicked()
     }
 }
 
+void Launcher::SettingsPage::on_runScriptAfterStartupBrowseButton_clicked()
+{
+    QString scriptFile = QFileDialog::getOpenFileName(
+            this,
+            QObject::tr("Select script file"),
+            QDir::currentPath(),
+            QString(tr("Text file (*.txt)")));
+
+
+    if (scriptFile.isEmpty())
+        return;
+
+    QFileInfo info(scriptFile);
+
+    if (!info.exists() || !info.isReadable())
+        return;
+
+    const QString path(QDir::toNativeSeparators(info.absoluteFilePath()));
+
+    runScriptAfterStartupField->setText(path);
+}
+
 void Launcher::SettingsPage::wizardStarted()
 {
     mMain->hide(); // Hide the launcher
@@ -260,6 +282,19 @@ void Launcher::SettingsPage::saveSettings()
     }  else {
         mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
     }
+
+    // Testing
+    int skipMenu = skipMenuCheckBox->checkState() == Qt::Checked;
+    if (skipMenu != mGameSettings.value("skip-menu").toInt())
+        mGameSettings.setValue("skip-menu", QString::number(skipMenu));
+
+    QString startCell = startDefaultCharacterAtField->text();
+    if (startCell != mGameSettings.value("start")) {
+        mGameSettings.setValue("start", startCell);
+    }
+    QString scriptRun = runScriptAfterStartupField->text();
+    if (scriptRun != mGameSettings.value("script-run"))
+        mGameSettings.setValue("script-run", scriptRun);
 }
 
 bool Launcher::SettingsPage::loadSettings()
@@ -271,5 +306,12 @@ bool Launcher::SettingsPage::loadSettings()
     if (index != -1)
         languageComboBox->setCurrentIndex(index);
 
+    // Testing
+    if (mGameSettings.value("skip-menu").toInt() == 1)
+        skipMenuCheckBox->setCheckState(Qt::Checked);
+
+    startDefaultCharacterAtField->setText(mGameSettings.value("start"));
+    runScriptAfterStartupField->setText(mGameSettings.value("script-run"));
+
     return true;
 }

apps/launcher/settingspage.hpp

@@ -38,6 +38,7 @@ namespace Launcher
         void on_wizardButton_clicked();
         void on_importerButton_clicked();
         void on_browseButton_clicked();
+        void on_runScriptAfterStartupBrowseButton_clicked();
 
         void wizardStarted();
         void wizardFinished(int exitCode, QProcess::ExitStatus exitStatus);

files/ui/settingspage.ui

@@ -7,29 +7,34 @@
     <x>0</x>
     <y>0</y>
     <width>514</width>
-    <height>397</height>
+    <height>532</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>473</width>
+        <height>510</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QGroupBox" name="generalGroup">
          <property name="title">
           <string>Morrowind Content Language</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QComboBox" name="languageComboBox">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
           <item row="0" column="1">
            <spacer name="horizontalSpacer">
             <property name="orientation">
@@ -43,6 +48,16 @@
             </property>
            </spacer>
           </item>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="languageComboBox">
+            <property name="minimumSize">
+             <size>
+              <width>250</width>
+              <height>0</height>
+             </size>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -52,6 +67,13 @@
           <string>Morrowind Installation Wizard</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,1">
+          <item row="1" column="0">
+           <widget class="QPushButton" name="wizardButton">
+            <property name="text">
+             <string>Run &amp;Installation Wizard</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1">
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
@@ -65,13 +87,6 @@
             </property>
            </spacer>
           </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="wizardButton">
-        <property name="text">
-         <string>Run &amp;Installation Wizard</string>
-        </property>
-       </widget>
-      </item>
          </layout>
         </widget>
        </item>
@@ -113,7 +128,14 @@
            </widget>
           </item>
           <item>
-       <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1">
+           <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0">
+            <item row="2" column="0">
+             <widget class="QPushButton" name="importerButton">
+              <property name="text">
+               <string>Run &amp;Settings Importer</string>
+              </property>
+             </widget>
+            </item>
             <item row="2" column="1">
              <spacer name="horizontalSpacer_3">
               <property name="orientation">
@@ -127,13 +149,6 @@
               </property>
              </spacer>
             </item>
-        <item row="2" column="0">
-         <widget class="QPushButton" name="importerButton">
-          <property name="text">
-           <string>Run &amp;Settings Importer</string>
-          </property>
-         </widget>
-        </item>
            </layout>
           </item>
           <item>
@@ -150,18 +165,80 @@
         </widget>
        </item>
        <item>
-    <spacer name="verticalSpacer">
+        <widget class="QGroupBox" name="testingGroup">
+         <property name="title">
+          <string>Testing</string>
+         </property>
+         <layout class="QVBoxLayout" name="testingGroupVerticalLayout">
+          <item>
+           <widget class="QCheckBox" name="skipMenuCheckBox">
+            <property name="text">
+             <string>Skip menu and generate default character</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="startDefaultCharacterAtHorizontalLayout">
+            <item>
+             <spacer name="startDefaultCharacterAtHorizontalSpacer">
               <property name="orientation">
-      <enum>Qt::Vertical</enum>
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
-       <height>40</height>
+                <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
+            <item>
+             <widget class="QLabel" name="startDefaultCharacterAtLabel">
+              <property name="text">
+               <string>Start default character at</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="startDefaultCharacterAtField">
+              <property name="placeholderText">
+               <string>default cell</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Run script after startup:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="runScriptAfterStartupHorizontalLayout">
+            <item>
+             <widget class="QLineEdit" name="runScriptAfterStartupField"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="runScriptAfterStartupBrowseButton">
+              <property name="text">
+               <string>Browse…</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>