1 files changed, 228 insertions, 194 deletions

diff --git a/application/pages/instance/InstanceSettingsPage.cpp b/application/pages/instance/InstanceSettingsPage.cpp
index 71e90a32..b7b0a863 100644
--- a/application/pages/instance/InstanceSettingsPage.cpp
+++ b/application/pages/instance/InstanceSettingsPage.cpp
@@ -15,237 +15,271 @@
 #include <widgets/CustomCommands.h>
 
 InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
-	: QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
+    : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
 {
-	m_settings = inst->settings();
-	ui->setupUi(this);
-	auto sysMB = Sys::getSystemRam() / Sys::megabyte;
-	ui->maxMemSpinBox->setMaximum(sysMB);
-	loadSettings();
+    m_settings = inst->settings();
+    ui->setupUi(this);
+    auto sysMB = Sys::getSystemRam() / Sys::megabyte;
+    ui->maxMemSpinBox->setMaximum(sysMB);
+    connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
+    connect(MMC, &MultiMC::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
+    connect(MMC, &MultiMC::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
+    loadSettings();
 }
 
 bool InstanceSettingsPage::shouldDisplay() const
 {
-	return !m_instance->isRunning();
+    return !m_instance->isRunning();
 }
 
 InstanceSettingsPage::~InstanceSettingsPage()
 {
-	delete ui;
+    delete ui;
+}
+
+void InstanceSettingsPage::globalSettingsButtonClicked(bool)
+{
+    switch(ui->settingsTabs->currentIndex()) {
+        case 0:
+            MMC->ShowGlobalSettings(this, "java-settings");
+            return;
+        case 1:
+            MMC->ShowGlobalSettings(this, "minecraft-settings");
+            return;
+        case 2:
+            MMC->ShowGlobalSettings(this, "custom-commands");
+            return;
+    }
 }
 
 bool InstanceSettingsPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void InstanceSettingsPage::applySettings()
 {
-	SettingsObject::Lock lock(m_settings);
-
-	// 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());
-		m_settings->set("ShowConsoleOnError", ui->showConsoleErrorCheck->isChecked());
-	}
-	else
-	{
-		m_settings->reset("ShowConsole");
-		m_settings->reset("AutoCloseConsole");
-		m_settings->reset("ShowConsoleOnError");
-	}
-
-	// 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)
-	{
-		int min = ui->minMemSpinBox->value();
-		int max = ui->maxMemSpinBox->value();
-		if(min < max)
-		{
-			m_settings->set("MinMemAlloc", min);
-			m_settings->set("MaxMemAlloc", max);
-		}
-		else
-		{
-			m_settings->set("MinMemAlloc", max);
-			m_settings->set("MaxMemAlloc", min);
-		}
-		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", " "));
-		JavaCommon::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->customCommands->checked();
-	m_settings->set("OverrideCommands", custcmd);
-	if (custcmd)
-	{
-		m_settings->set("PreLaunchCommand", ui->customCommands->prelaunchCommand());
-		m_settings->set("WrapperCommand", ui->customCommands->wrapperCommand());
-		m_settings->set("PostExitCommand", ui->customCommands->postexitCommand());
-	}
-	else
-	{
-		m_settings->reset("PreLaunchCommand");
-		m_settings->reset("WrapperCommand");
-		m_settings->reset("PostExitCommand");
-	}
+    SettingsObject::Lock lock(m_settings);
+
+    // 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());
+        m_settings->set("ShowConsoleOnError", ui->showConsoleErrorCheck->isChecked());
+    }
+    else
+    {
+        m_settings->reset("ShowConsole");
+        m_settings->reset("AutoCloseConsole");
+        m_settings->reset("ShowConsoleOnError");
+    }
+
+    // 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)
+    {
+        int min = ui->minMemSpinBox->value();
+        int max = ui->maxMemSpinBox->value();
+        if(min < max)
+        {
+            m_settings->set("MinMemAlloc", min);
+            m_settings->set("MaxMemAlloc", max);
+        }
+        else
+        {
+            m_settings->set("MinMemAlloc", max);
+            m_settings->set("MaxMemAlloc", min);
+        }
+        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", " "));
+        JavaCommon::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->customCommands->checked();
+    m_settings->set("OverrideCommands", custcmd);
+    if (custcmd)
+    {
+        m_settings->set("PreLaunchCommand", ui->customCommands->prelaunchCommand());
+        m_settings->set("WrapperCommand", ui->customCommands->wrapperCommand());
+        m_settings->set("PostExitCommand", ui->customCommands->postexitCommand());
+    }
+    else
+    {
+        m_settings->reset("PreLaunchCommand");
+        m_settings->reset("WrapperCommand");
+        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());
-	ui->showConsoleErrorCheck->setChecked(m_settings->get("ShowConsoleOnError").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());
-	int min = m_settings->get("MinMemAlloc").toInt();
-	int max = m_settings->get("MaxMemAlloc").toInt();
-	if(min < max)
-	{
-		ui->minMemSpinBox->setValue(min);
-		ui->maxMemSpinBox->setValue(max);
-	}
-	else
-	{
-		ui->minMemSpinBox->setValue(max);
-		ui->maxMemSpinBox->setValue(min);
-	}
-	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->customCommands->initialize(
-		true,
-		m_settings->get("OverrideCommands").toBool(),
-		m_settings->get("PreLaunchCommand").toString(),
-		m_settings->get("WrapperCommand").toString(),
-		m_settings->get("PostExitCommand").toString()
-	);
+    // 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());
+    ui->showConsoleErrorCheck->setChecked(m_settings->get("ShowConsoleOnError").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());
+    int min = m_settings->get("MinMemAlloc").toInt();
+    int max = m_settings->get("MaxMemAlloc").toInt();
+    if(min < max)
+    {
+        ui->minMemSpinBox->setValue(min);
+        ui->maxMemSpinBox->setValue(max);
+    }
+    else
+    {
+        ui->minMemSpinBox->setValue(max);
+        ui->maxMemSpinBox->setValue(min);
+    }
+    ui->permGenSpinBox->setValue(m_settings->get("PermGen").toInt());
+    bool permGenVisible = m_settings->get("PermGenVisible").toBool();
+    ui->permGenSpinBox->setVisible(permGenVisible);
+    ui->labelPermGen->setVisible(permGenVisible);
+    ui->labelPermgenNote->setVisible(permGenVisible);
+
+
+    // 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->customCommands->initialize(
+        true,
+        m_settings->get("OverrideCommands").toBool(),
+        m_settings->get("PreLaunchCommand").toString(),
+        m_settings->get("WrapperCommand").toString(),
+        m_settings->get("PostExitCommand").toString()
+    );
 }
 
 void InstanceSettingsPage::on_javaDetectBtn_clicked()
 {
-	JavaInstallPtr java;
+    JavaInstallPtr java;
 
-	VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true);
-	vselect.setResizeOn(2);
-	vselect.exec();
+    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<JavaInstall>(vselect.selectedVersion());
-		ui->javaPathTextBox->setText(java->path);
-	}
+    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
+    {
+        java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
+        ui->javaPathTextBox->setText(java->path);
+        bool visible = java->id.requiresPermGen() && m_settings->get("OverrideMemory").toBool();
+        ui->permGenSpinBox->setVisible(visible);
+        ui->labelPermGen->setVisible(visible);
+        ui->labelPermgenNote->setVisible(visible);
+        m_settings->set("PermGenVisible", visible);
+    }
 }
 
 void InstanceSettingsPage::on_javaBrowseBtn_clicked()
 {
-	QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if(raw_path.isEmpty())
-	{
-		return;
-	}
-	QString cooked_path = FS::NormalizePath(raw_path);
-
-	QFileInfo javaInfo(cooked_path);;
-	if(!javaInfo.exists() || !javaInfo.isExecutable())
-	{
-		return;
-	}
-	ui->javaPathTextBox->setText(cooked_path);
+    QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
+
+    // do not allow current dir - it's dirty. Do not allow dirs that don't exist
+    if(raw_path.isEmpty())
+    {
+        return;
+    }
+    QString cooked_path = FS::NormalizePath(raw_path);
+
+    QFileInfo javaInfo(cooked_path);
+    if(!javaInfo.exists() || !javaInfo.isExecutable())
+    {
+        return;
+    }
+    ui->javaPathTextBox->setText(cooked_path);
+
+    // custom Java could be anything... enable perm gen option
+    ui->permGenSpinBox->setVisible(true);
+    ui->labelPermGen->setVisible(true);
+    ui->labelPermgenNote->setVisible(true);
+    m_settings->set("PermGenVisible", true);
 }
 
 void InstanceSettingsPage::on_javaTestBtn_clicked()
 {
-	if(checker)
-	{
-		return;
-	}
-	checker.reset(new JavaCommon::TestCheck(
-		this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "),
-		ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
-	connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
-	checker->run();
+    if(checker)
+    {
+        return;
+    }
+    checker.reset(new JavaCommon::TestCheck(
+        this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "),
+        ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
+    connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
+    checker->run();
 }
 
 void InstanceSettingsPage::checkerFinished()
 {
-	checker.reset();
+    checker.reset();
 }