Implement new Config tool

CONFIG/MainDlg.cpp

@@ -30,20 +30,38 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
 	// Populate the dialog prior to connecting all signals
 	OnInitDialog();
 
-	connect(m_ui->colorPalette16bitRadioButton, &QRadioButton::toggled, this, &CMainDialog::OnRadiobuttonPalette16bit);
-	connect(m_ui->colorPalette256RadioButton, &QRadioButton::toggled, this, &CMainDialog::OnRadiobuttonPalette256);
 	connect(
-		m_ui->modelQualityFastRadioButton,
+		m_ui->colorPalette16bitRadioButton,
+		 &QRadioButton::toggled,
+		 this,
+		 &CMainDialog::OnRadiobuttonPalette16bit
+	);
+	connect(
+		m_ui->colorPalette256RadioButton,
+		 &QRadioButton::toggled,
+		 this,
+		 &CMainDialog::OnRadiobuttonPalette256
+	);
+
+	connect(
+		m_ui->modelQualityLowRadioButton,
 		&QRadioButton::toggled,
 		this,
 		&CMainDialog::OnRadiobuttonModelLowQuality
 	);
+	connect(
+		m_ui->modelQualityMediumRadioButton,
+		&QRadioButton::toggled,
+		this,
+		&CMainDialog::OnRadiobuttonModelMediumQuality
+	);
 	connect(
 		m_ui->modelQualityHighRadioButton,
 		&QRadioButton::toggled,
 		this,
 		&CMainDialog::OnRadiobuttonModelHighQuality
 	);
+
 	connect(
 		m_ui->textureQualityFastRadioButton,
 		&QRadioButton::toggled,
@@ -64,12 +82,25 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
 	connect(m_ui->joystickCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxJoystick);
 	connect(m_ui->okButton, &QPushButton::clicked, this, &CMainDialog::accept);
 	connect(m_ui->cancelButton, &QPushButton::clicked, this, &CMainDialog::reject);
-	connect(m_ui->advancedButton, &QPushButton::clicked, this, &CMainDialog::OnButtonAdvanced);
+
+	connect(m_ui->diskPathOpen, &QPushButton::clicked, this, &CMainDialog::SelectDiskPathDialog);
+	connect(m_ui->cdPathOpen, &QPushButton::clicked, this, &CMainDialog::SelectCDPathDialog);
+	connect(m_ui->mediaPathOpen, &QPushButton::clicked, this, &CMainDialog::SelectMediaPathDialog);
+	connect(m_ui->savePathOpen, &QPushButton::clicked, this, &CMainDialog::SelectSavePathDialog);
+
+	connect(m_ui->diskPath, &QLineEdit::textEdited, this, &CMainDialog::DiskPathEdited);
+	connect(m_ui->cdPath, &QLineEdit::textEdited, this, &CMainDialog::CDPathEdited);
+	connect(m_ui->mediaPath, &QLineEdit::textEdited, this, &CMainDialog::MediaPathEdited);
+	connect(m_ui->savePath, &QLineEdit::textEdited, this, &CMainDialog::SavePathEdited);
+
+	connect(m_ui->maxLoDSlider, &QSlider::valueChanged, this, &CMainDialog::MaxLoDChanged);
+	connect(m_ui->maxActorsSlider, &QSlider::valueChanged, this, &CMainDialog::MaxActorsChanged);
+
+	layout()->setSizeConstraint( QLayout::SetFixedSize );
 }
 // FUNCTION: CONFIG 0x00403e80
 bool CMainDialog::OnInitDialog()
 {
-	SwitchToAdvanced(false);
 	LegoDeviceEnumerate* enumerator = currentConfigApp->m_device_enumerator;
 	enumerator->FUN_1009d210();
 	m_modified = currentConfigApp->ReadRegisterSettings();
@@ -172,8 +203,11 @@ void CMainDialog::UpdateInterface()
 	m_ui->colorPalette16bitRadioButton->setEnabled(full_screen && currentConfigApp->GetDeviceRenderBitStatus());
 	m_ui->sound3DCheckBox->setChecked(currentConfigApp->m_3d_sound);
 	switch (currentConfigApp->m_model_quality) {
+	case 0:
+		m_ui->modelQualityLowRadioButton->setChecked(true);
+		break;
 	case 1:
-		m_ui->modelQualityFastRadioButton->setChecked(true);
+		m_ui->modelQualityMediumRadioButton->setChecked(true);
 		break;
 	case 2:
 		m_ui->modelQualityHighRadioButton->setChecked(true);
@@ -187,6 +221,10 @@ void CMainDialog::UpdateInterface()
 	}
 	m_ui->joystickCheckBox->setChecked(currentConfigApp->m_use_joystick);
 	m_ui->musicCheckBox->setChecked(currentConfigApp->m_music);
+	m_ui->diskPath->setText(QString::fromStdString(currentConfigApp->m_base_path));
+	m_ui->cdPath->setText(QString::fromStdString(currentConfigApp->m_cd_path));
+	m_ui->mediaPath->setText(QString::fromStdString(currentConfigApp->m_media_path));
+	m_ui->savePath->setText(QString::fromStdString(currentConfigApp->m_save_path));
 }
 
 // FUNCTION: CONFIG 0x004045e0
@@ -239,6 +277,17 @@ void CMainDialog::OnRadiobuttonModelLowQuality(bool checked)
 	if (checked) {
 		// FIXME: are OnRadiobuttonModelLowQuality and OnRadiobuttonModelHighQuality triggered both?
 		qInfo() << "OnRadiobuttonModelLowQuality";
+		currentConfigApp->m_model_quality = 0;
+		m_modified = true;
+		UpdateInterface();
+	}
+}
+
+void CMainDialog::OnRadiobuttonModelMediumQuality(bool checked)
+{
+	if (checked) {
+		// FIXME: are OnRadiobuttonModelLowQuality and OnRadiobuttonModelHighQuality triggered both?
+		qInfo() << "OnRadiobuttonModelMediumQuality";
 		currentConfigApp->m_model_quality = 1;
 		m_modified = true;
 		UpdateInterface();
@@ -288,20 +337,6 @@ void CMainDialog::OnCheckboxJoystick(bool checked)
 	UpdateInterface();
 }
 
-// FUNCTION: CONFIG 0x004047c0
-void CMainDialog::OnButtonAdvanced()
-{
-	SwitchToAdvanced(!m_advanced);
-}
-
-// FUNCTION: CONFIG 0x004047d0
-void CMainDialog::SwitchToAdvanced(bool p_advanced)
-{
-	m_ui->advancedGroup->setVisible(p_advanced);
-	layout()->setSizeConstraint(QLayout::SetMinAndMaxSize);
-	m_advanced = p_advanced;
-}
-
 // FUNCTION: CONFIG 0x004048c0
 void CMainDialog::OnCheckboxMusic(bool checked)
 {
@@ -309,3 +344,94 @@ void CMainDialog::OnCheckboxMusic(bool checked)
 	m_modified = true;
 	UpdateInterface();
 }
+
+
+void CMainDialog::SelectDiskPathDialog()
+{
+	QString disk_path = QString::fromStdString(currentConfigApp->m_base_path);
+	disk_path = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+                                                    disk_path,
+                                                    QFileDialog::ShowDirsOnly
+                                                    | QFileDialog::DontResolveSymlinks);
+	currentConfigApp->m_base_path = disk_path.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+void CMainDialog::SelectCDPathDialog()
+{
+	QString cd_path = QString::fromStdString(currentConfigApp->m_cd_path);
+	cd_path = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+                                                    cd_path,
+                                                    QFileDialog::ShowDirsOnly
+                                                    | QFileDialog::DontResolveSymlinks);
+	currentConfigApp->m_cd_path = cd_path.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+void CMainDialog::SelectMediaPathDialog()
+{
+	QString media_path = QString::fromStdString(currentConfigApp->m_media_path);
+	media_path = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+                                                    media_path,
+                                                    QFileDialog::ShowDirsOnly
+                                                    | QFileDialog::DontResolveSymlinks);
+	currentConfigApp->m_media_path = media_path.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+void CMainDialog::SelectSavePathDialog()
+{
+	QString save_path = QString::fromStdString(currentConfigApp->m_save_path);
+	save_path = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+                                                    save_path,
+                                                    QFileDialog::ShowDirsOnly
+                                                    | QFileDialog::DontResolveSymlinks);
+	currentConfigApp->m_save_path = save_path.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+
+void CMainDialog::DiskPathEdited(QString &text)
+{
+	currentConfigApp->m_base_path = text.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+void CMainDialog::CDPathEdited(QString &text)
+{
+	currentConfigApp->m_cd_path = text.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+void CMainDialog::MediaPathEdited(QString &text)
+{
+	currentConfigApp->m_media_path = text.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+void CMainDialog::SavePathEdited(QString &text)
+{
+	currentConfigApp->m_save_path = text.toStdString();
+	m_modified = true;
+	UpdateInterface();
+}
+
+
+void CMainDialog::MaxLoDChanged(int value)
+{
+	currentConfigApp->m_max_lod = static_cast<float>(value) / 10.0f;
+	m_modified = true;
+}
+
+void CMainDialog::MaxActorsChanged(int value)
+{
+	currentConfigApp->m_max_actors = value;
+	m_modified = true;
+}

CONFIG/MainDlg.h

@@ -6,6 +6,7 @@
 #include "res/resource.h"
 
 #include <QDialog>
+#include <QFileDialog>
 
 namespace Ui
 {
@@ -22,7 +23,6 @@ class CMainDialog : public QDialog {
 
 protected:
 	void UpdateInterface();
-	void SwitchToAdvanced(bool p_advanced);
 
 private:
 	bool m_modified = false;
@@ -39,14 +39,24 @@ private slots:
 	void OnRadiobuttonPalette256(bool checked);
 	void OnCheckboxFlipVideoMemPages(bool checked);
 	void OnRadiobuttonModelLowQuality(bool checked);
+	void OnRadiobuttonModelMediumQuality(bool checked);
 	void OnRadiobuttonModelHighQuality(bool checked);
 	void OnRadiobuttonTextureLowQuality(bool checked);
 	void OnRadiobuttonTextureHighQuality(bool checked);
-	void OnCheckboxJoystick(bool chedked);
+	void OnCheckboxJoystick(bool checked);
 	void OnCheckboxMusic(bool checked);
-	void OnButtonAdvanced();
 	void accept() override;
 	void reject() override;
+	void SelectDiskPathDialog();
+	void SelectCDPathDialog();
+	void SelectMediaPathDialog();
+	void SelectSavePathDialog();
+	void DiskPathEdited(QString &text);
+	void CDPathEdited(QString &text);
+	void MediaPathEdited(QString &text);
+	void SavePathEdited(QString &text);
+	void MaxLoDChanged(int value);
+	void MaxActorsChanged(int value);
 };
 
 // SYNTHETIC: CONFIG 0x00403de0

CONFIG/config.cpp

@@ -74,16 +74,22 @@ bool CConfigApp::InitInstance()
 		m_3d_sound = FALSE;
 		m_model_quality = 0;
 		m_texture_quality = 1;
+		m_max_lod = 1.5f;
+		m_max_actors = 5;
 	}
 	else if (totalRamMiB < 20) {
 		m_3d_sound = FALSE;
 		m_model_quality = 1;
 		m_texture_quality = 1;
+		m_max_lod = 2.5f;
+		m_max_actors = 10;
 	}
 	else {
 		m_model_quality = 2;
 		m_3d_sound = TRUE;
 		m_texture_quality = 1;
+		m_max_lod = 3.5f;
+		m_max_actors = 20;
 	}
 	return true;
 }
@@ -149,6 +155,8 @@ bool CConfigApp::ReadRegisterSettings()
 	m_use_joystick = iniparser_getboolean(dict, "isle:UseJoystick", m_use_joystick);
 	m_music = iniparser_getboolean(dict, "isle:Music", m_music);
 	m_joystick_index = iniparser_getint(dict, "isle:JoystickIndex", m_joystick_index);
+	m_max_lod = iniparser_getdouble(dict, "isle:Max LOD", m_max_lod);
+	m_max_actors = iniparser_getint(dict, "isle:Max Allowed Extras", m_max_actors);
 	return true;
 }
 
@@ -211,6 +219,16 @@ bool CConfigApp::ValidateSettings()
 		m_texture_quality = 0;
 		is_modified = TRUE;
 	}
+
+	if (m_max_lod < 0.0f || m_max_lod > 5.0f) {
+		m_max_lod = 3.5f;
+		is_modified = TRUE;
+	}
+	if (m_max_actors < 5 || m_max_actors > 40) {
+		m_max_actors = 20;
+		is_modified = TRUE;
+	}
+
 	return is_modified;
 }
 
@@ -303,6 +321,9 @@ void CConfigApp::WriteRegisterSettings() const
 	SetIniInt(dict, "isle:Island Quality", m_model_quality);
 	SetIniInt(dict, "isle:Island Texture", m_texture_quality);
 
+	iniparser_set(dict, "isle:Max LOD", (const char)m_max_lod);
+	SetIniInt(dict, "isle:Max Allowed Extras", m_max_actors);
+
 #undef SetIniBool
 #undef SetIniInt
 

CONFIG/config.h

@@ -79,6 +79,8 @@ class CConfigApp {
 	std::string m_cd_path;
 	std::string m_media_path;
 	std::string m_save_path;
+	float m_max_lod;
+	int m_max_actors;
 };
 
 extern CConfigApp g_theApp;

CONFIG/res/maindialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>549</width>
+    <width>575</width>
-    <height>563</height>
+    <height>750</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -27,7 +27,7 @@
    <item>
     <widget class="QLabel" name="sharkImageLabel">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -35,7 +35,13 @@
      <property name="minimumSize">
       <size>
        <width>143</width>
-       <height>545</height>
+       <height>383</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
       </size>
      </property>
      <property name="text">
@@ -45,81 +51,216 @@
       <pixmap resource="config.qrc">:/shark.png</pixmap>
      </property>
      <property name="scaledContents">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QWidget" name="settingsWidget" native="true">
      <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
       <item>
-       <widget class="QWidget" name="normalWidget" native="true">
+       <widget class="QWidget" name="dataPaths" native="true">
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>41</height>
+          <height>0</height>
          </size>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="2" column="1">
+          <widget class="QLineEdit" name="cdPath"/>
+         </item>
+         <item row="3" column="1">
+          <widget class="QLineEdit" name="mediaPath"/>
+         </item>
+         <item row="7" column="2">
+          <widget class="QPushButton" name="savePathOpen">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>55</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Open</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="2">
+          <widget class="QPushButton" name="mediaPathOpen">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>55</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Open</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2">
+          <widget class="QPushButton" name="cdPathOpen">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>55</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Open</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="cdPathLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>CD Path:</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="diskPath"/>
+         </item>
+         <item row="0" column="2">
+          <widget class="QPushButton" name="diskPathOpen">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>55</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Open</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="diskPathLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Disk Path:</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
+          <widget class="QLabel" name="savePathLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Save Path:</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="mediaPathLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Media Path:</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
+          <widget class="QLineEdit" name="savePath"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="QualityOptionsHolder" native="true">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>80</height>
+         </size>
+        </property>
+        <layout class="QGridLayout" name="gridLayout">
          <property name="leftMargin">
           <number>0</number>
          </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
          <property name="rightMargin">
           <number>0</number>
          </property>
-         <property name="bottomMargin">
+         <item row="0" column="3">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="textureQualityGroup">
-           <property name="title">
-            <string>Island Texture Quality</string>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QRadioButton" name="textureQualityFastRadioButton">
-              <property name="text">
-               <string>Fast</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="textureQualityHighRadioButton">
-              <property name="text">
-               <string>High</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
           <widget class="QGroupBox" name="modelQualityGroup">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>120</height>
+            </size>
+           </property>
            <property name="title">
             <string>Island Model Quality</string>
            </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QVBoxLayout" name="verticalLayout_6">
             <item>
              <widget class="QRadioButton" name="modelQualityLowRadioButton">
               <property name="text">
@@ -144,107 +285,121 @@
            </layout>
           </widget>
          </item>
-         <item>
+         <item row="1" column="2">
-          <widget class="QGroupBox" name="colorPaletteGroup">
+          <widget class="QGroupBox" name="maxLoDGroup">
-           <property name="title">
+           <property name="minimumSize">
-            <string>Color Palette</string>
+            <size>
+             <width>0</width>
+             <height>70</height>
+            </size>
            </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <property name="toolTip">
-            <property name="topMargin">
+            <string>Maximum Level of Detail (LOD). A higher setting will cause higher quality textures to be drawn regardless of distance.</string>
-             <number>0</number>
+           </property>
-            </property>
+           <property name="title">
-            <property name="bottomMargin">
+            <string>Maximum LOD</string>
-             <number>0</number>
+           </property>
-            </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
-             <widget class="QRadioButton" name="colorPalette256RadioButton">
+             <widget class="QSlider" name="maxLoDSlider">
-              <property name="text">
+              <property name="maximum">
-               <string>256 Color</string>
+               <number>50</number>
               </property>
-             </widget>
+              <property name="singleStep">
-            </item>
+               <number>5</number>
-            <item>
-             <widget class="QRadioButton" name="colorPalette16bitRadioButton">
-              <property name="text">
-               <string>High Color (16 bit)</string>
               </property>
-             </widget>
+              <property name="pageStep">
-            </item>
+               <number>10</number>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="musicJoystickWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QCheckBox" name="sound3DCheckBox">
-              <property name="text">
-               <string>3D Sound</string>
               </property>
-             </widget>
+              <property name="value">
-            </item>
+               <number>35</number>
-            <item>
-             <widget class="QCheckBox" name="musicCheckBox">
-              <property name="text">
-               <string>Music</string>
               </property>
-             </widget>
+              <property name="tracking">
-            </item>
-            <item>
-             <widget class="QCheckBox" name="joystickCheckBox">
-              <property name="text">
-               <string>Use Joystick</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="buttonWidgets" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <property name="spacing">
-             <number>30</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="advancedButton">
-              <property name="text">
-               <string>Advanced</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="okButton">
-              <property name="text">
-               <string>OK</string>
-              </property>
-              <property name="default">
                <bool>true</bool>
               </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="tickPosition">
+               <enum>QSlider::TicksBothSides</enum>
+              </property>
+              <property name="tickInterval">
+               <number>10</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QGroupBox" name="textureQualityGroup">
+           <property name="title">
+            <string>Island Texture Quality</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_5">
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QRadioButton" name="textureQualityFastRadioButton">
+              <property name="text">
+               <string>Fast</string>
+              </property>
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="cancelButton">
+             <widget class="QRadioButton" name="textureQualityHighRadioButton">
               <property name="text">
-               <string>Cancel</string>
+               <string>High</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QGroupBox" name="maxActorsGroup">
+           <property name="toolTip">
+            <string>Maximum number of LEGO actors to exist in the world at a time. The game will gradually increase the number of actors until this maximum is reached and while performance is acceptable.</string>
+           </property>
+           <property name="title">
+            <string>Maximum Actors (5..40)</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_8">
+            <item>
+             <widget class="QSlider" name="maxActorsSlider">
+              <property name="minimum">
+               <number>5</number>
+              </property>
+              <property name="maximum">
+               <number>40</number>
+              </property>
+              <property name="singleStep">
+               <number>5</number>
+              </property>
+              <property name="value">
+               <number>20</number>
+              </property>
+              <property name="sliderPosition">
+               <number>20</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="tickPosition">
+               <enum>QSlider::TicksBothSides</enum>
+              </property>
+              <property name="tickInterval">
+               <number>5</number>
               </property>
              </widget>
             </item>
@@ -255,9 +410,89 @@
        </widget>
       </item>
       <item>
-       <widget class="QGroupBox" name="advancedGroup">
+       <widget class="QGroupBox" name="colorPaletteGroup">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>60</height>
+         </size>
+        </property>
         <property name="title">
-         <string>Advanced Settings</string>
+         <string>Color Palette</string>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QRadioButton" name="colorPalette256RadioButton">
+           <property name="text">
+            <string>256 Color</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="colorPalette16bitRadioButton">
+           <property name="text">
+            <string>High Color (16 bit)</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="musicJoystickWidget" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="sound3DCheckBox">
+           <property name="text">
+            <string>3D Sound</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="musicCheckBox">
+           <property name="text">
+            <string>Music</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="joystickCheckBox">
+           <property name="text">
+            <string>Use Joystick</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="advancedGroup">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>225</height>
+         </size>
+        </property>
+        <property name="title">
+         <string/>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="flat">
+         <bool>false</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <property name="leftMargin">
@@ -293,6 +528,12 @@
            <property name="enabled">
             <bool>true</bool>
            </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>125</height>
+            </size>
+           </property>
            <property name="editTriggers">
             <set>QAbstractItemView::NoEditTriggers</set>
            </property>
@@ -306,7 +547,13 @@
          </item>
          <item>
           <widget class="QWidget" name="D3DCheckboxWidget" native="true">
-           <layout class="QVBoxLayout" name="verticalLayout_4">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>20</height>
+            </size>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
             <property name="leftMargin">
              <number>0</number>
             </property>
@@ -319,13 +566,6 @@
             <property name="bottomMargin">
              <number>0</number>
             </property>
-            <item>
-             <widget class="QCheckBox" name="videomemoryCheckBox">
-              <property name="text">
-               <string>Draw 3D to Video Memory</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="QCheckBox" name="flipVideoMemoryPagesCheckBox">
               <property name="text">
@@ -333,12 +573,64 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QCheckBox" name="videomemoryCheckBox">
+              <property name="text">
+               <string>Draw 3D to Video Memory</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QWidget" name="buttonWidgets" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <property name="spacing">
+          <number>30</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QPushButton" name="okButton">
+           <property name="text">
+            <string>OK</string>
+           </property>
+           <property name="default">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="saveAs">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cancelButton">
+           <property name="text">
+            <string>Cancel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>