Instance settings moved to a page.

4 files changed, 719 insertions, 1 deletions

diff --git a/gui/pages/BasePage.h b/gui/pages/BasePage.h
index d057d8f7..feb19a79 100644
--- a/gui/pages/BasePage.h
+++ b/gui/pages/BasePage.h
@@ -41,7 +41,8 @@ public:
 	{
 		return true;
 	}
-	int index = -1;
+	int stackIndex = -1;
+	int listIndex = -1;
 };
 
 typedef std::shared_ptr<BasePage> BasePagePtr;
\ No newline at end of file
diff --git a/gui/pages/InstanceSettingsPage.cpp b/gui/pages/InstanceSettingsPage.cpp
new file mode 100644
index 00000000..0bcfc7f2
--- /dev/null
+++ b/gui/pages/InstanceSettingsPage.cpp
@@ -0,0 +1,228 @@
+#include "InstanceSettingsPage.h"
+#include <gui/dialogs/VersionSelectDialog.h>
+#include "logic/NagUtils.h"
+#include <logic/java/JavaVersionList.h>
+#include "MultiMC.h"
+#include <QDialog>
+#include <QFileDialog>
+#include <QMessageBox>
+#include "ui_InstanceSettingsPage.h"
+
+QString InstanceSettingsPage::displayName()
+{
+	return tr("Settings");
+}
+
+QIcon InstanceSettingsPage::icon()
+{
+	return QIcon::fromTheme("settings");
+}
+
+QString InstanceSettingsPage::id()
+{
+	return "settings";
+}
+
+InstanceSettingsPage::InstanceSettingsPage(SettingsObject *s, QWidget *parent)
+	: QWidget(parent), ui(new Ui::InstanceSettingsPage), m_settings(s)
+{
+	ui->setupUi(this);
+	loadSettings();
+	connect(ui->buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked(bool)), this,
+			SLOT(applySettings()));
+	connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this,
+			SLOT(loadSettings()));
+}
+
+InstanceSettingsPage::~InstanceSettingsPage()
+{
+	delete ui;
+}
+
+bool InstanceSettingsPage::apply()
+{
+	applySettings();
+	loadSettings();
+	return true;
+}
+
+void InstanceSettingsPage::applySettings()
+{
+	// Console
+	bool console = ui->consoleSettingsBox->isChecked();
+	m_settings->set("OverrideConsole", console);
+	if (console)
+	{
+		m_settings->set("ShowConsole", ui->showConsoleCheck->isChecked());
+		m_settings->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
+	}
+	else
+	{
+		m_settings->reset("ShowConsole");
+		m_settings->reset("AutoCloseConsole");
+	}
+
+	// Window Size
+	bool window = ui->windowSizeGroupBox->isChecked();
+	m_settings->set("OverrideWindow", window);
+	if (window)
+	{
+		m_settings->set("LaunchMaximized", ui->maximizedCheckBox->isChecked());
+		m_settings->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
+		m_settings->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
+	}
+	else
+	{
+		m_settings->reset("LaunchMaximized");
+		m_settings->reset("MinecraftWinWidth");
+		m_settings->reset("MinecraftWinHeight");
+	}
+
+	// Memory
+	bool memory = ui->memoryGroupBox->isChecked();
+	m_settings->set("OverrideMemory", memory);
+	if (memory)
+	{
+		m_settings->set("MinMemAlloc", ui->minMemSpinBox->value());
+		m_settings->set("MaxMemAlloc", ui->maxMemSpinBox->value());
+		m_settings->set("PermGen", ui->permGenSpinBox->value());
+	}
+	else
+	{
+		m_settings->reset("MinMemAlloc");
+		m_settings->reset("MaxMemAlloc");
+		m_settings->reset("PermGen");
+	}
+
+	// Java Install Settings
+	bool javaInstall = ui->javaSettingsGroupBox->isChecked();
+	m_settings->set("OverrideJavaLocation", javaInstall);
+	if (javaInstall)
+	{
+		m_settings->set("JavaPath", ui->javaPathTextBox->text());
+	}
+	else
+	{
+		m_settings->reset("JavaPath");
+	}
+
+	// Java arguments
+	bool javaArgs = ui->javaArgumentsGroupBox->isChecked();
+	m_settings->set("OverrideJavaArgs", javaArgs);
+	if(javaArgs)
+	{
+		m_settings->set("JvmArgs", ui->jvmArgsTextBox->toPlainText().replace("\n", " "));
+		NagUtils::checkJVMArgs(m_settings->get("JvmArgs").toString(), this->parentWidget());
+	}
+	else
+	{
+		m_settings->reset("JvmArgs");
+	}
+
+	// old generic 'override both' is removed.
+	m_settings->reset("OverrideJava");
+
+	// Custom Commands
+	bool custcmd = ui->customCommandsGroupBox->isChecked();
+	m_settings->set("OverrideCommands", custcmd);
+	if (custcmd)
+	{
+		m_settings->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text());
+		m_settings->set("PostExitCommand", ui->postExitCmdTextBox->text());
+	}
+	else
+	{
+		m_settings->reset("PreLaunchCommand");
+		m_settings->reset("PostExitCommand");
+	}
+}
+
+void InstanceSettingsPage::loadSettings()
+{
+	// Console
+	ui->consoleSettingsBox->setChecked(m_settings->get("OverrideConsole").toBool());
+	ui->showConsoleCheck->setChecked(m_settings->get("ShowConsole").toBool());
+	ui->autoCloseConsoleCheck->setChecked(m_settings->get("AutoCloseConsole").toBool());
+
+	// Window Size
+	ui->windowSizeGroupBox->setChecked(m_settings->get("OverrideWindow").toBool());
+	ui->maximizedCheckBox->setChecked(m_settings->get("LaunchMaximized").toBool());
+	ui->windowWidthSpinBox->setValue(m_settings->get("MinecraftWinWidth").toInt());
+	ui->windowHeightSpinBox->setValue(m_settings->get("MinecraftWinHeight").toInt());
+
+	// Memory
+	ui->memoryGroupBox->setChecked(m_settings->get("OverrideMemory").toBool());
+	ui->minMemSpinBox->setValue(m_settings->get("MinMemAlloc").toInt());
+	ui->maxMemSpinBox->setValue(m_settings->get("MaxMemAlloc").toInt());
+	ui->permGenSpinBox->setValue(m_settings->get("PermGen").toInt());
+
+	// Java Settings
+	bool overrideJava = m_settings->get("OverrideJava").toBool();
+	bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool() || overrideJava;
+	bool overrideArgs = m_settings->get("OverrideJavaArgs").toBool() || overrideJava;
+	
+	ui->javaSettingsGroupBox->setChecked(overrideLocation);
+	ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString());
+
+	ui->javaArgumentsGroupBox->setChecked(overrideArgs);
+	ui->jvmArgsTextBox->setPlainText(m_settings->get("JvmArgs").toString());
+
+	// Custom Commands
+	ui->customCommandsGroupBox->setChecked(m_settings->get("OverrideCommands").toBool());
+	ui->preLaunchCmdTextBox->setText(m_settings->get("PreLaunchCommand").toString());
+	ui->postExitCmdTextBox->setText(m_settings->get("PostExitCommand").toString());
+}
+
+void InstanceSettingsPage::on_javaDetectBtn_clicked()
+{
+	JavaVersionPtr java;
+
+	VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true);
+	vselect.setResizeOn(2);
+	vselect.exec();
+
+	if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
+	{
+		java = std::dynamic_pointer_cast<JavaVersion>(vselect.selectedVersion());
+		ui->javaPathTextBox->setText(java->path);
+	}
+}
+
+void InstanceSettingsPage::on_javaBrowseBtn_clicked()
+{
+	QString dir = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
+	if (!dir.isNull())
+	{
+		ui->javaPathTextBox->setText(dir);
+	}
+}
+
+void InstanceSettingsPage::on_javaTestBtn_clicked()
+{
+	checker.reset(new JavaChecker());
+	connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
+			SLOT(checkFinished(JavaCheckResult)));
+	checker->path = ui->javaPathTextBox->text();
+	checker->performCheck();
+}
+
+void InstanceSettingsPage::checkFinished(JavaCheckResult result)
+{
+	if (result.valid)
+	{
+		QString text;
+		text += "Java test succeeded!\n";
+		if (result.is_64bit)
+			text += "Using 64bit java.\n";
+		text += "\n";
+		text += "Platform reported: " + result.realPlatform;
+		QMessageBox::information(this, tr("Java test success"), text);
+	}
+	else
+	{
+		QMessageBox::warning(
+			this, tr("Java test failure"),
+			tr("The specified java binary didn't work. You should use the auto-detect feature, "
+			   "or set the path to the java executable."));
+	}
+}
diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h
new file mode 100644
index 00000000..7b736b0b
--- /dev/null
+++ b/gui/pages/InstanceSettingsPage.h
@@ -0,0 +1,59 @@
+/* Copyright 2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <QWidget>
+
+#include <logic/OneSixInstance.h>
+#include <logic/net/NetJob.h>
+#include <logic/java/JavaChecker.h>
+#include "BasePage.h"
+
+class JavaChecker;
+namespace Ui
+{
+class InstanceSettingsPage;
+}
+
+class InstanceSettingsPage : public QWidget, public BasePage
+{
+	Q_OBJECT
+
+public:
+	explicit InstanceSettingsPage(SettingsObject *s, QWidget *parent = 0);
+	virtual ~InstanceSettingsPage();
+	virtual QString displayName() override;
+	virtual QIcon icon() override;
+	virtual QString id() override;
+	virtual bool apply();
+
+private:
+	void updateCheckboxStuff();
+private slots:
+	void on_javaDetectBtn_clicked();
+
+	void on_javaTestBtn_clicked();
+
+	void on_javaBrowseBtn_clicked();
+
+	void checkFinished(JavaCheckResult result);
+
+	void applySettings();
+	void loadSettings();
+private:
+	Ui::InstanceSettingsPage *ui;
+	SettingsObject *m_settings;
+	std::shared_ptr<JavaChecker> checker;
+};
diff --git a/gui/pages/InstanceSettingsPage.ui b/gui/pages/InstanceSettingsPage.ui
new file mode 100644
index 00000000..9bf4c0cc
--- /dev/null
+++ b/gui/pages/InstanceSettingsPage.ui
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InstanceSettingsPage</class>
+ <widget class="QWidget" name="InstanceSettingsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>458</width>
+    <height>476</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="settingsTabs">
+     <property name="tabShape">
+      <enum>QTabWidget::Rounded</enum>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="minecraftTab">
+      <attribute name="title">
+       <string>Java</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <widget class="QGroupBox" name="javaSettingsGroupBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Java installation</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0" colspan="3">
+           <widget class="QLineEdit" name="javaPathTextBox"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QPushButton" name="javaDetectBtn">
+            <property name="text">
+             <string>Auto-detect...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QPushButton" name="javaBrowseBtn">
+            <property name="text">
+             <string>Browse...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QPushButton" name="javaTestBtn">
+            <property name="text">
+             <string>Test</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="memoryGroupBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Memory</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="maxMemSpinBox">
+            <property name="toolTip">
+             <string>The maximum amount of memory Minecraft is allowed to use.</string>
+            </property>
+            <property name="suffix">
+             <string> MB</string>
+            </property>
+            <property name="minimum">
+             <number>512</number>
+            </property>
+            <property name="maximum">
+             <number>65536</number>
+            </property>
+            <property name="singleStep">
+             <number>128</number>
+            </property>
+            <property name="value">
+             <number>1024</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelMinMem">
+            <property name="text">
+             <string>Minimum memory allocation:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelMaxMem">
+            <property name="text">
+             <string>Maximum memory allocation:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="minMemSpinBox">
+            <property name="toolTip">
+             <string>The amount of memory Minecraft is started with.</string>
+            </property>
+            <property name="suffix">
+             <string> MB</string>
+            </property>
+            <property name="minimum">
+             <number>256</number>
+            </property>
+            <property name="maximum">
+             <number>65536</number>
+            </property>
+            <property name="singleStep">
+             <number>128</number>
+            </property>
+            <property name="value">
+             <number>256</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QSpinBox" name="permGenSpinBox">
+            <property name="toolTip">
+             <string>The amount of memory available to store loaded Java classes.</string>
+            </property>
+            <property name="suffix">
+             <string> MB</string>
+            </property>
+            <property name="minimum">
+             <number>64</number>
+            </property>
+            <property name="maximum">
+             <number>999999999</number>
+            </property>
+            <property name="singleStep">
+             <number>8</number>
+            </property>
+            <property name="value">
+             <number>64</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelPermGen">
+            <property name="text">
+             <string>PermGen:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="javaArgumentsGroupBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Java arguments</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="1" column="1">
+           <widget class="QPlainTextEdit" name="jvmArgsTextBox"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacerMinecraft">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="javaTab">
+      <attribute name="title">
+       <string>Game windows</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="windowSizeGroupBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Game Window</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QCheckBox" name="maximizedCheckBox">
+            <property name="text">
+             <string>Start Minecraft maximized?</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QGridLayout" name="gridLayoutWindowSize">
+            <item row="1" column="0">
+             <widget class="QLabel" name="labelWindowHeight">
+              <property name="text">
+               <string>Window height:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="labelWindowWidth">
+              <property name="text">
+               <string>Window width:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QSpinBox" name="windowWidthSpinBox">
+              <property name="minimum">
+               <number>854</number>
+              </property>
+              <property name="maximum">
+               <number>65536</number>
+              </property>
+              <property name="singleStep">
+               <number>1</number>
+              </property>
+              <property name="value">
+               <number>854</number>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QSpinBox" name="windowHeightSpinBox">
+              <property name="minimum">
+               <number>480</number>
+              </property>
+              <property name="maximum">
+               <number>65536</number>
+              </property>
+              <property name="value">
+               <number>480</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="consoleSettingsBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Console Settings</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QCheckBox" name="showConsoleCheck">
+            <property name="text">
+             <string>Show console while the game is running?</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="autoCloseConsoleCheck">
+            <property name="text">
+             <string>Automatically close console when the game quits?</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacerMinecraft_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>88</width>
+           <height>125</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Custom commands</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <widget class="QGroupBox" name="customCommandsGroupBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Custom Commands</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelPostExitCmd">
+            <property name="text">
+             <string>Post-exit command:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelPreLaunchCmd">
+            <property name="text">
+             <string>Pre-launch command:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="postExitCmdTextBox"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelCustomCmdsDescription">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacerMinecraft_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>88</width>
+           <height>186</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>