NOISSUE move everything.

18 files changed, 0 insertions, 3134 deletions

diff --git a/gui/pages/global/AccountListPage.cpp b/gui/pages/global/AccountListPage.cpp
deleted file mode 100644
index 72e18405..00000000
--- a/gui/pages/global/AccountListPage.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2013-2015 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.
- */
-
-#include "AccountListPage.h"
-#include "ui_AccountListPage.h"
-
-#include <QItemSelectionModel>
-
-#include <QDebug>
-
-#include "logic/net/NetJob.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
-
-#include "gui/dialogs/EditAccountDialog.h"
-#include "gui/dialogs/ProgressDialog.h"
-#include "gui/dialogs/AccountSelectDialog.h"
-#include "gui/dialogs/LoginDialog.h"
-#include "gui/dialogs/CustomMessageBox.h"
-#include "logic/tasks/Task.h"
-#include "logic/auth/YggdrasilTask.h"
-
-#include <MultiMC.h>
-
-AccountListPage::AccountListPage(QWidget *parent)
-	: QWidget(parent), ui(new Ui::AccountListPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	m_accounts = MMC->accounts();
-
-	ui->listView->setModel(m_accounts.get());
-	ui->listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-
-	// Expand the account column
-	ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
-
-	QItemSelectionModel *selectionModel = ui->listView->selectionModel();
-
-	connect(selectionModel, &QItemSelectionModel::selectionChanged,
-			[this](const QItemSelection &sel, const QItemSelection &dsel)
-	{ updateButtonStates(); });
-
-	connect(m_accounts.get(), SIGNAL(listChanged()), SLOT(listChanged()));
-	connect(m_accounts.get(), SIGNAL(activeAccountChanged()), SLOT(listChanged()));
-
-	updateButtonStates();
-}
-
-AccountListPage::~AccountListPage()
-{
-	delete ui;
-}
-
-void AccountListPage::listChanged()
-{
-	updateButtonStates();
-}
-
-void AccountListPage::on_addAccountBtn_clicked()
-{
-	addAccount(tr("Please enter your Mojang or Minecraft account username and password to add "
-				  "your account."));
-}
-
-void AccountListPage::on_rmAccountBtn_clicked()
-{
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		m_accounts->removeAccount(selected);
-	}
-}
-
-void AccountListPage::on_setDefaultBtn_clicked()
-{
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		MojangAccountPtr account =
-			selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
-		m_accounts->setActiveAccount(account->username());
-	}
-}
-
-void AccountListPage::on_noDefaultBtn_clicked()
-{
-	m_accounts->setActiveAccount("");
-}
-
-void AccountListPage::updateButtonStates()
-{
-	// If there is no selection, disable buttons that require something selected.
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-
-	ui->rmAccountBtn->setEnabled(selection.size() > 0);
-	ui->setDefaultBtn->setEnabled(selection.size() > 0);
-
-	ui->noDefaultBtn->setDown(m_accounts->activeAccount().get() == nullptr);
-}
-
-void AccountListPage::addAccount(const QString &errMsg)
-{
-	// TODO: The login dialog isn't quite done yet
-	MojangAccountPtr account = LoginDialog::newAccount(this, errMsg);
-
-	if (account != nullptr)
-	{
-		m_accounts->addAccount(account);
-		if (m_accounts->count() == 1)
-			m_accounts->setActiveAccount(account->username());
-
-		// Grab associated player skins
-		auto job = new NetJob("Player skins: " + account->username());
-
-		for (AccountProfile profile : account->profiles())
-		{
-			auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.name + ".png");
-			auto action = CacheDownload::make(
-				QUrl("http://" + URLConstants::SKINS_BASE + profile.name + ".png"), meta);
-			job->addNetAction(action);
-			meta->stale = true;
-		}
-
-		job->start();
-	}
-}
diff --git a/gui/pages/global/AccountListPage.h b/gui/pages/global/AccountListPage.h
deleted file mode 100644
index 9fd894b8..00000000
--- a/gui/pages/global/AccountListPage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2013-2015 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 <QDialog>
-#include <memory>
-
-#include "gui/pages/BasePage.h"
-
-#include "logic/auth/MojangAccountList.h"
-#include <MultiMC.h>
-
-namespace Ui
-{
-class AccountListPage;
-}
-
-class AuthenticateTask;
-
-class AccountListPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-public:
-	explicit AccountListPage(QWidget *parent = 0);
-	~AccountListPage();
-
-	QString displayName() const override
-	{
-		return tr("Accounts");
-	}
-	QIcon icon() const override
-	{
-		auto icon = MMC->getThemedIcon("accounts");
-		if(icon.isNull())
-		{
-			icon = MMC->getThemedIcon("noaccount");
-		}
-		return icon;
-	}
-	QString id() const override
-	{
-		return "accounts";
-	}
-	QString helpPage() const override
-	{
-		return "Accounts";
-	}
-
-public
-slots:
-	void on_addAccountBtn_clicked();
-
-	void on_rmAccountBtn_clicked();
-
-	void on_setDefaultBtn_clicked();
-
-	void on_noDefaultBtn_clicked();
-
-	void listChanged();
-
-	//! Updates the states of the dialog's buttons.
-	void updateButtonStates();
-
-protected:
-	std::shared_ptr<MojangAccountList> m_accounts;
-
-protected
-slots:
-	void addAccount(const QString& errMsg="");
-
-private:
-	Ui::AccountListPage *ui;
-};
diff --git a/gui/pages/global/AccountListPage.ui b/gui/pages/global/AccountListPage.ui
deleted file mode 100644
index 8ad78cf4..00000000
--- a/gui/pages/global/AccountListPage.ui
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AccountListPage</class>
- <widget class="QWidget" name="AccountListPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>694</width>
-    <height>609</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Manage Accounts</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <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="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLabel" name="welcomeLabel">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Welcome! If you're new here, you can click the &amp;quot;Add&amp;quot; button to add your Mojang or Minecraft account.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QTreeView" name="listView"/>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="manageAcctsBtnBox">
-           <item>
-            <widget class="QPushButton" name="addAccountBtn">
-             <property name="text">
-              <string>&amp;Add</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="rmAccountBtn">
-             <property name="text">
-              <string>&amp;Remove</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="buttonSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="setDefaultBtn">
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the currently selected account as the active account. The active account is the account that is used to log in (unless it is overridden in an instance-specific setting).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&amp;Set Default</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="noDefaultBtn">
-             <property name="toolTip">
-              <string>Set no default account. This will cause MultiMC to prompt you to select an account every time you launch an instance that doesn't have its own default set.</string>
-             </property>
-             <property name="text">
-              <string>&amp;No Default</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/ExternalToolsPage.cpp b/gui/pages/global/ExternalToolsPage.cpp
deleted file mode 100644
index e2dd70dd..00000000
--- a/gui/pages/global/ExternalToolsPage.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2013-2015 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.
- */
-
-#include "ExternalToolsPage.h"
-#include "ui_ExternalToolsPage.h"
-
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QStandardPaths>
-
-#include <pathutils.h>
-
-#include "logic/settings/SettingsObject.h"
-#include "logic/tools/BaseProfiler.h"
-#include "MultiMC.h"
-
-ExternalToolsPage::ExternalToolsPage(QWidget *parent) :
-	QWidget(parent),
-	ui(new Ui::ExternalToolsPage)
-{
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-
-	#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-	ui->jsonEditorTextBox->setClearButtonEnabled(true);
-	#endif
-
-	ui->mceditLink->setOpenExternalLinks(true);
-	ui->jvisualvmLink->setOpenExternalLinks(true);
-	ui->jprofilerLink->setOpenExternalLinks(true);
-	loadSettings();
-}
-
-ExternalToolsPage::~ExternalToolsPage()
-{
-	delete ui;
-}
-
-void ExternalToolsPage::loadSettings()
-{
-	auto s = MMC->settings();
-	ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString());
-	ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString());
-	ui->mceditPathEdit->setText(s->get("MCEditPath").toString());
-
-	// Editors
-	ui->jsonEditorTextBox->setText(s->get("JsonEditor").toString());
-}
-void ExternalToolsPage::applySettings()
-{
-	auto s = MMC->settings();
-	s->set("JProfilerPath", ui->jprofilerPathEdit->text());
-	s->set("JVisualVMPath", ui->jvisualvmPathEdit->text());
-	s->set("MCEditPath", ui->mceditPathEdit->text());
-
-	// Editors
-	QString jsonEditor = ui->jsonEditorTextBox->text();
-	if (!jsonEditor.isEmpty() &&
-		(!QFileInfo(jsonEditor).exists() || !QFileInfo(jsonEditor).isExecutable()))
-	{
-		QString found = QStandardPaths::findExecutable(jsonEditor);
-		if (!found.isEmpty())
-		{
-			jsonEditor = found;
-		}
-	}
-	s->set("JsonEditor", jsonEditor);
-}
-
-void ExternalToolsPage::on_jprofilerPathBtn_clicked()
-{
-	QString raw_dir = ui->jprofilerPathEdit->text();
-	QString error;
-	do
-	{
-		raw_dir = QFileDialog::getExistingDirectory(this, tr("JProfiler Directory"), raw_dir);
-		if (raw_dir.isEmpty())
-		{
-			break;
-		}
-		QString cooked_dir = NormalizePath(raw_dir);
-		if (!MMC->profilers()["jprofiler"]->check(cooked_dir, &error))
-		{
-			QMessageBox::critical(this, tr("Error"),
-								  tr("Error while checking JProfiler install:\n%1").arg(error));
-			continue;
-		}
-		else
-		{
-			ui->jprofilerPathEdit->setText(cooked_dir);
-			break;
-		}
-	} while (1);
-}
-void ExternalToolsPage::on_jprofilerCheckBtn_clicked()
-{
-	QString error;
-	if (!MMC->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error))
-	{
-		QMessageBox::critical(this, tr("Error"),
-							  tr("Error while checking JProfiler install:\n%1").arg(error));
-	}
-	else
-	{
-		QMessageBox::information(this, tr("OK"), tr("JProfiler setup seems to be OK"));
-	}
-}
-
-void ExternalToolsPage::on_jvisualvmPathBtn_clicked()
-{
-	QString raw_dir = ui->jvisualvmPathEdit->text();
-	QString error;
-	do
-	{
-		raw_dir = QFileDialog::getOpenFileName(this, tr("JVisualVM Executable"), raw_dir);
-		if (raw_dir.isEmpty())
-		{
-			break;
-		}
-		QString cooked_dir = NormalizePath(raw_dir);
-		if (!MMC->profilers()["jvisualvm"]->check(cooked_dir, &error))
-		{
-			QMessageBox::critical(this, tr("Error"),
-								  tr("Error while checking JVisualVM install:\n%1").arg(error));
-			continue;
-		}
-		else
-		{
-			ui->jvisualvmPathEdit->setText(cooked_dir);
-			break;
-		}
-	} while (1);
-}
-void ExternalToolsPage::on_jvisualvmCheckBtn_clicked()
-{
-	QString error;
-	if (!MMC->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error))
-	{
-		QMessageBox::critical(this, tr("Error"),
-							  tr("Error while checking JVisualVM install:\n%1").arg(error));
-	}
-	else
-	{
-		QMessageBox::information(this, tr("OK"), tr("JVisualVM setup seems to be OK"));
-	}
-}
-
-void ExternalToolsPage::on_mceditPathBtn_clicked()
-{
-	QString raw_dir = ui->mceditPathEdit->text();
-	QString error;
-	do
-	{
-#ifdef Q_OS_OSX
-#warning stuff
-		raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
-#else
-		raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Directory"), raw_dir);
-#endif
-		if (raw_dir.isEmpty())
-		{
-			break;
-		}
-		QString cooked_dir = NormalizePath(raw_dir);
-		if (!MMC->tools()["mcedit"]->check(cooked_dir, &error))
-		{
-			QMessageBox::critical(this, tr("Error"),
-								  tr("Error while checking MCEdit install:\n%1").arg(error));
-			continue;
-		}
-		else
-		{
-			ui->mceditPathEdit->setText(cooked_dir);
-			break;
-		}
-	} while (1);
-}
-void ExternalToolsPage::on_mceditCheckBtn_clicked()
-{
-	QString error;
-	if (!MMC->tools()["mcedit"]->check(ui->mceditPathEdit->text(), &error))
-	{
-		QMessageBox::critical(this, tr("Error"),
-							  tr("Error while checking MCEdit install:\n%1").arg(error));
-	}
-	else
-	{
-		QMessageBox::information(this, tr("OK"), tr("MCEdit setup seems to be OK"));
-	}
-}
-
-void ExternalToolsPage::on_jsonEditorBrowseBtn_clicked()
-{
-	QString raw_file = QFileDialog::getOpenFileName(
-		this, tr("JSON Editor"),
-		ui->jsonEditorTextBox->text().isEmpty()
-#if defined(Q_OS_LINUX)
-				? QString("/usr/bin")
-#else
-			? QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).first()
-#endif
-			: ui->jsonEditorTextBox->text());
-	QString cooked_file = NormalizePath(raw_file);
-
-	if (cooked_file.isEmpty())
-	{
-		return;
-	}
-
-	// it has to exist and be an executable
-	if (QFileInfo(cooked_file).exists() && QFileInfo(cooked_file).isExecutable())
-	{
-		ui->jsonEditorTextBox->setText(cooked_file);
-	}
-	else
-	{
-		QMessageBox::warning(this, tr("Invalid"),
-							 tr("The file chosen does not seem to be an executable"));
-	}
-}
-
-bool ExternalToolsPage::apply()
-{
-	applySettings();
-	return true;
-}
diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h
deleted file mode 100644
index 7c5efad6..00000000
--- a/gui/pages/global/ExternalToolsPage.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2013-2015 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 "gui/pages/BasePage.h"
-#include <MultiMC.h>
-
-namespace Ui {
-class ExternalToolsPage;
-}
-
-class ExternalToolsPage : public QWidget, public BasePage
-{
-	Q_OBJECT
-
-public:
-	explicit ExternalToolsPage(QWidget *parent = 0);
-	~ExternalToolsPage();
-
-	QString displayName() const override
-	{
-		return tr("External Tools");
-	}
-	QIcon icon() const override
-	{
-		auto icon = MMC->getThemedIcon("externaltools");
-		if(icon.isNull())
-		{
-			icon = MMC->getThemedIcon("loadermods");
-		}
-		return icon;
-	}
-	QString id() const override
-	{
-		return "external-tools";
-	}
-	QString helpPage() const override
-	{
-		return "External-tools";
-	}
-	virtual bool apply();
-
-private:
-	void loadSettings();
-	void applySettings();
-
-private:
-	Ui::ExternalToolsPage *ui;
-
-private
-slots:
-	void on_jprofilerPathBtn_clicked();
-	void on_jprofilerCheckBtn_clicked();
-	void on_jvisualvmPathBtn_clicked();
-	void on_jvisualvmCheckBtn_clicked();
-	void on_mceditPathBtn_clicked();
-	void on_mceditCheckBtn_clicked();
-	void on_jsonEditorBrowseBtn_clicked();
-};
diff --git a/gui/pages/global/ExternalToolsPage.ui b/gui/pages/global/ExternalToolsPage.ui
deleted file mode 100644
index ba1b6f01..00000000
--- a/gui/pages/global/ExternalToolsPage.ui
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ExternalToolsPage</class>
- <widget class="QWidget" name="ExternalToolsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>673</width>
-    <height>751</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <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="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>JProfiler</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_10">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <item>
-             <widget class="QLineEdit" name="jprofilerPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="jprofilerPathBtn">
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="jprofilerCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="jprofilerLink">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.ej-technologies.com/products/jprofiler/overview.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.ej-technologies.com/products/jprofiler/overview.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string>JVisualVM</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_11">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <widget class="QLineEdit" name="jvisualvmPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="jvisualvmPathBtn">
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="jvisualvmCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="jvisualvmLink">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://visualvm.java.net/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://visualvm.java.net/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_4">
-         <property name="title">
-          <string>MCEdit</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_12">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <item>
-             <widget class="QLineEdit" name="mceditPathEdit"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="mceditPathBtn">
-              <property name="text">
-               <string>...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QPushButton" name="mceditCheckBtn">
-            <property name="text">
-             <string>Check</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="mceditLink">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.mcedit.net/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.mcedit.net/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="editorsBox">
-         <property name="title">
-          <string>External Editors (leave empty for system default)</string>
-         </property>
-         <layout class="QGridLayout" name="foldersBoxLayout_2">
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="jsonEditorTextBox"/>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelJsonEditor">
-            <property name="text">
-             <string>Text Editor:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="jsonEditorBrowseBtn">
-            <property name="text">
-             <string>...</string>
-            </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>216</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/pages/global/JavaPage.cpp b/gui/pages/global/JavaPage.cpp
deleted file mode 100644
index b0ed23ea..00000000
--- a/gui/pages/global/JavaPage.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2013-2015 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.
- */
-
-#include "JavaPage.h"
-#include "ui_JavaPage.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDir>
-