Moving testing options to Advanced page

apps/launcher/advancedpage.cpp

@@ -1,10 +1,14 @@
 #include "advancedpage.hpp"
 
-#include <components/files/configurationmanager.hpp>
+#include <components/config/gamesettings.hpp>
+#include <QFileDialog>
 
-Launcher::AdvancedPage::AdvancedPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent)
+Launcher::AdvancedPage::AdvancedPage(Files::ConfigurationManager &cfg,
+                                     Config::GameSettings &gameSettings,
+                                     Settings::Manager &engineSettings, QWidget *parent)
         : QWidget(parent)
         , mCfgMgr(cfg)
+        , mGameSettings(gameSettings)
         , mEngineSettings(engineSettings)
 {
     setObjectName ("AdvancedPage");
@@ -13,8 +17,45 @@ Launcher::AdvancedPage::AdvancedPage(Files::ConfigurationManager &cfg, Settings:
     loadSettings();
 }
 
+void Launcher::AdvancedPage::on_skipMenuCheckBox_stateChanged(int state) {
+    startDefaultCharacterAtLabel->setEnabled(state == Qt::Checked);
+    startDefaultCharacterAtField->setEnabled(state == Qt::Checked);
+}
+
+void Launcher::AdvancedPage::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()));
+
+}
+
 bool Launcher::AdvancedPage::loadSettings()
 {
+    // Testing
+    bool skipMenu = mGameSettings.value("skip-menu").toInt() == 1;
+    if (skipMenu) {
+        skipMenuCheckBox->setCheckState(Qt::Checked);
+    }
+    startDefaultCharacterAtLabel->setEnabled(skipMenu);
+    startDefaultCharacterAtField->setEnabled(skipMenu);
+
+    startDefaultCharacterAtField->setText(mGameSettings.value("start"));
+    runScriptAfterStartupField->setText(mGameSettings.value("script-run"));
+
     // Game Settings
     loadSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
     loadSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
@@ -53,6 +94,19 @@ void Launcher::AdvancedPage::saveSettings()
     // Ensure we only set the new settings if they changed. This is to avoid cluttering the
     // user settings file (which by definition should only contain settings the user has touched)
 
+    // 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);
+
     // Game Settings
     saveSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
     saveSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");

apps/launcher/advancedpage.hpp

@@ -8,6 +8,7 @@
 #include <components/settings/settings.hpp>
 
 namespace Files { struct ConfigurationManager; }
+namespace Config { class GameSettings; }
 
 namespace Launcher
 {
@@ -16,13 +17,19 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        AdvancedPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = 0);
+        AdvancedPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
+                     Settings::Manager &engineSettings, QWidget *parent = 0);
 
         bool loadSettings();
         void saveSettings();
 
+    private slots:
+        void on_skipMenuCheckBox_stateChanged(int state);
+        void on_runScriptAfterStartupBrowseButton_clicked();
+
     private:
         Files::ConfigurationManager &mCfgMgr;
+        Config::GameSettings &mGameSettings;
         Settings::Manager &mEngineSettings;
 
         void loadSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);

apps/launcher/maindialog.cpp

@@ -119,7 +119,7 @@ void Launcher::MainDialog::createPages()
     mDataFilesPage = new DataFilesPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
     mGraphicsPage = new GraphicsPage(mCfgMgr, mEngineSettings, this);
     mSettingsPage = new SettingsPage(mCfgMgr, mGameSettings, mLauncherSettings, this);
-    mAdvancedPage = new AdvancedPage(mCfgMgr, mEngineSettings, this);
+    mAdvancedPage = new AdvancedPage(mCfgMgr, mGameSettings, mEngineSettings, this);
 
     // Set the combobox of the play page to imitate the combobox on the datafilespage
     mPlayPage->setProfilesModel(mDataFilesPage->profilesModel());

apps/launcher/settingspage.cpp

@@ -247,33 +247,6 @@ void Launcher::SettingsPage::updateOkButton(const QString &text)
             : mProfileDialog->setOkButtonEnabled(true);
 }
 
-void Launcher::SettingsPage::on_skipMenuCheckBox_stateChanged(int state) {
-    startDefaultCharacterAtLabel->setEnabled(state == Qt::Checked);
-    startDefaultCharacterAtField->setEnabled(state == Qt::Checked);
-}
-
-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::saveSettings()
 {
     QString language(languageComboBox->currentText());
@@ -287,19 +260,6 @@ 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()
@@ -311,16 +271,5 @@ bool Launcher::SettingsPage::loadSettings()
     if (index != -1)
         languageComboBox->setCurrentIndex(index);
 
-    // Testing
-    bool skipMenu = mGameSettings.value("skip-menu").toInt() == 1;
-    if (skipMenu) {
-        skipMenuCheckBox->setCheckState(Qt::Checked);
-    }
-    startDefaultCharacterAtLabel->setEnabled(skipMenu);
-    startDefaultCharacterAtField->setEnabled(skipMenu);
-
-    startDefaultCharacterAtField->setText(mGameSettings.value("start"));
-    runScriptAfterStartupField->setText(mGameSettings.value("script-run"));
-
     return true;
 }

apps/launcher/settingspage.hpp

@@ -47,9 +47,6 @@ namespace Launcher
 
         void updateOkButton(const QString &text);
 
-        void on_skipMenuCheckBox_stateChanged(int state);
-        void on_runScriptAfterStartupBrowseButton_clicked();
-
     private:
 
         Process::ProcessInvoker *mWizardInvoker;

files/ui/advancedpage.ui

@@ -11,13 +11,6 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="pageVerticalLayout">
-   <item>
-    <widget class="QLabel" name="pageDescriptionLabel">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This temporary page contains new settings that will be available in-game in a post-1.0 release of OpenMW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="widgetResizable">
@@ -27,9 +20,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-187</y>
+        <y>0</y>
         <width>630</width>
-        <height>510</height>
+        <height>746</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
@@ -266,6 +259,94 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="testingGroup">
+         <property name="title">
+          <string>Testing</string>
+         </property>
+         <layout class="QVBoxLayout" name="testingGroupVerticalLayout">
+          <item>
+           <widget class="QLabel" name="testingLabel">
+            <property name="text">
+             <string>These settings are intended for testing mods and will cause issues if used for normal gameplay.</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="Line" name="testingLine">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <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::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <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>
        <item>
         <widget class="QGroupBox" name="otherGroup">
          <property name="title">

files/ui/settingspage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>514</width>
-    <height>532</height>
+    <height>397</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,247 +15,153 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QScrollArea" name="scrollArea">
+    <widget class="QGroupBox" name="generalGroup">
-     <property name="widgetResizable">
+     <property name="title">
-      <bool>true</bool>
+      <string>Morrowind Content Language</string>
      </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
+     <layout class="QGridLayout" name="gridLayout">
-      <property name="geometry">
+      <item row="0" column="0">
-       <rect>
+       <widget class="QComboBox" name="languageComboBox">
-        <x>0</x>
+        <property name="minimumSize">
-        <y>-44</y>
+         <size>
-        <width>473</width>
+          <width>250</width>
-        <height>567</height>
+          <height>0</height>
-       </rect>
+         </size>
-      </property>
+        </property>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+       </widget>
-       <item>
+      </item>
-        <widget class="QGroupBox" name="generalGroup">
+      <item row="0" column="1">
-         <property name="title">
+       <spacer name="horizontalSpacer">
-          <string>Morrowind Content Language</string>
+        <property name="orientation">
-         </property>
+         <enum>Qt::Horizontal</enum>
-         <layout class="QGridLayout" name="gridLayout">
+        </property>
-          <item row="0" column="1">
+        <property name="sizeHint" stdset="0">
-           <spacer name="horizontalSpacer">
+         <size>
-            <property name="orientation">
+          <width>40</width>
-             <enum>Qt::Horizontal</enum>
+          <height>20</height>
-            </property>
+         </size>
-            <property name="sizeHint" stdset="0">
+        </property>
-             <size>
+       </spacer>
-              <width>40</width>
+      </item>
-              <height>20</height>
+     </layout>
-             </size>
-            </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>
-       <item>
-        <widget class="QGroupBox" name="wizardGroup">
-         <property name="title">
-          <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">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="importerGroup">
-         <property name="title">
-          <string>Morrowind Settings Importer</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="1,0">
-            <item row="0" column="0">
-             <widget class="QLabel" name="importerLabel">
-              <property name="text">
-               <string>File to import settings from:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QComboBox" name="settingsComboBox"/>
-            </item>
-            <item row="1" column="1">
-             <widget class="QPushButton" name="browseButton">
-              <property name="text">
-               <string>Browse...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="addonsCheckBox">
-            <property name="text">
-             <string>Import add-on and plugin selection (creates a new Content List)</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <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">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QProgressBar" name="progressBar">
-            <property name="maximum">
-             <number>4</number>
-            </property>
-            <property name="textVisible">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="testingGroup">
-         <property name="title">
-          <string>Testing</string>
-         </property>
-         <layout class="QVBoxLayout" name="testingGroupVerticalLayout">
-          <item>
-           <widget class="QLabel" name="testingLabel">
-            <property name="text">
-             <string>These settings are intended for testing mods and will cause issues if used for normal gameplay.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="testingLine">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <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::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Fixed</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <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>
+   <item>
+    <widget class="QGroupBox" name="wizardGroup">
+     <property name="title">
+      <string>Morrowind Installation Wizard</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,1">
+      <item row="1" column="1">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </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>
+   <item>
+    <widget class="QGroupBox" name="importerGroup">
+     <property name="title">
+      <string>Morrowind Settings Importer</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="1,0">
+        <item row="0" column="0">
+         <widget class="QLabel" name="importerLabel">
+          <property name="text">
+           <string>File to import settings from:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QComboBox" name="settingsComboBox"/>
+        </item>
+        <item row="1" column="1">
+         <widget class="QPushButton" name="browseButton">
+          <property name="text">
+           <string>Browse...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="addonsCheckBox">
+        <property name="text">
+         <string>Import add-on and plugin selection (creates a new Content List)</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1">
+        <item row="2" column="1">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </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>
+       <widget class="QProgressBar" name="progressBar">
+        <property name="maximum">
+         <number>4</number>
+        </property>
+        <property name="textVisible">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>