1 files changed, 18 insertions, 68 deletions

diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 4073f6b7..620fc3a3 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 #include <QDir>
 #include <QTextCharFormat>
 
-#include <ColumnResizer.h>
 #include "updater/UpdateChecker.h"
 
 #include "settings/SettingsObject.h"
@@ -49,10 +48,6 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP
 	ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
 	ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
 
-	auto resizer = new ColumnResizer(this);
-	resizer->addWidgetsFromLayout(ui->groupBox->layout(), 1);
-	resizer->addWidgetsFromLayout(ui->foldersBox->layout(), 1);
-
 	defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat());
 
 	m_languageModel = MMC->translations();
@@ -97,40 +92,14 @@ bool MultiMCPage::apply()
 	return true;
 }
 
-void MultiMCPage::on_ftbLauncherBrowseBtn_clicked()
-{
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("FTB Launcher Folder"),
-														ui->ftbLauncherBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->ftbLauncherBox->setText(cooked_dir);
-	}
-}
-void MultiMCPage::on_ftbBrowseBtn_clicked()
-{
-	QString raw_dir =
-		QFileDialog::getExistingDirectory(this, tr("FTB Folder"), ui->ftbBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->ftbBox->setText(cooked_dir);
-	}
-}
-
 void MultiMCPage::on_instDirBrowseBtn_clicked()
 {
-    QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"),
-                                                        ui->instDirTextBox->text());
-    QString cooked_dir = FS::NormalizePath(raw_dir);
+	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"), ui->instDirTextBox->text());
 
 	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
+	if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
 	{
+		QString cooked_dir = FS::NormalizePath(raw_dir);
 		if (FS::checkProblemticPathJava(QDir(cooked_dir)))
 		{
 			QMessageBox warning;
@@ -157,40 +126,26 @@ void MultiMCPage::on_instDirBrowseBtn_clicked()
 
 void MultiMCPage::on_iconsDirBrowseBtn_clicked()
 {
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Folder"),
-														ui->iconsDirTextBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
+	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Folder"), ui->iconsDirTextBox->text());
 
 	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
+	if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
 	{
+		QString cooked_dir = FS::NormalizePath(raw_dir);
 		ui->iconsDirTextBox->setText(cooked_dir);
 	}
 }
 void MultiMCPage::on_modsDirBrowseBtn_clicked()
 {
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"),
-														ui->modsDirTextBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
+	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), ui->modsDirTextBox->text());
 
 	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
+	if (!raw_dir.isEmpty() && QDir(raw_dir).exists())
 	{
+		QString cooked_dir = FS::NormalizePath(raw_dir);
 		ui->modsDirTextBox->setText(cooked_dir);
 	}
 }
-void MultiMCPage::on_lwjglDirBrowseBtn_clicked()
-{
-	QString raw_dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Folder"),
-														ui->lwjglDirTextBox->text());
-	QString cooked_dir = FS::NormalizePath(raw_dir);
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
-	{
-		ui->lwjglDirTextBox->setText(cooked_dir);
-	}
-}
 
 void MultiMCPage::languageIndexChanged(int index)
 {
@@ -315,6 +270,9 @@ void MultiMCPage::applySettings()
 		s->set("IconTheme", "iOS");
 		break;
 	case 7:
+		s->set("IconTheme", "flat");
+		break;
+	case 8:
 		s->set("IconTheme", "custom");
 		break;
 	case 0:
@@ -346,16 +304,10 @@ void MultiMCPage::applySettings()
 	s->set("ConsoleMaxLines", ui->lineLimitSpinBox->value());
 	s->set("ConsoleOverflowStop", ui->checkStopLogging->checkState() != Qt::Unchecked);
 
-	// FTB
-	s->set("TrackFTBInstances", ui->trackFtbBox->isChecked());
-	s->set("FTBLauncherLocal", FS::NormalizePath(ui->ftbLauncherBox->text()));
-	s->set("FTBRoot", FS::NormalizePath(ui->ftbBox->text()));
-
 	// Folders
 	// TODO: Offer to move instances to new instance folder.
 	s->set("InstanceDir", ui->instDirTextBox->text());
 	s->set("CentralModsDir", ui->modsDirTextBox->text());
-	s->set("LWJGLDir", ui->lwjglDirTextBox->text());
 	s->set("IconsDir", ui->iconsDirTextBox->text());
 
 	auto sortMode = (InstSortMode)ui->sortingModeGroup->checkedId();
@@ -414,10 +366,14 @@ void MultiMCPage::loadSettings()
 	{
 		ui->themeComboBox->setCurrentIndex(6);
 	}
-	else if (theme == "custom")
+	else if (theme == "flat")
 	{
 		ui->themeComboBox->setCurrentIndex(7);
 	}
+	else if (theme == "custom")
+	{
+		ui->themeComboBox->setCurrentIndex(8);
+	}
 	else
 	{
 		ui->themeComboBox->setCurrentIndex(0);
@@ -457,15 +413,9 @@ void MultiMCPage::loadSettings()
 	ui->lineLimitSpinBox->setValue(s->get("ConsoleMaxLines").toInt());
 	ui->checkStopLogging->setChecked(s->get("ConsoleOverflowStop").toBool());
 
-	// FTB
-	ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool());
-	ui->ftbLauncherBox->setText(s->get("FTBLauncherLocal").toString());
-	ui->ftbBox->setText(s->get("FTBRoot").toString());
-
 	// Folders
 	ui->instDirTextBox->setText(s->get("InstanceDir").toString());
 	ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
-	ui->lwjglDirTextBox->setText(s->get("LWJGLDir").toString());
 	ui->iconsDirTextBox->setText(s->get("IconsDir").toString());
 
 	QString sortMode = s->get("InstSortMode").toString();