1 files changed, 43 insertions, 7 deletions

diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index 2dd19077..5108daa2 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -22,21 +22,31 @@
 #include "gui/dialogs/VersionSelectDialog.h"
 #include "gui/dialogs/CustomMessageBox.h"
 
-#include "logic/JavaUtils.h"
 #include "logic/NagUtils.h"
-#include "logic/lists/JavaVersionList.h"
-#include <logic/JavaChecker.h>
+
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaChecker.h"
 
 #include "logic/updater/UpdateChecker.h"
 
 #include "logic/tools/BaseProfiler.h"
 
-#include <settingsobject.h>
+#include "logic/settings/SettingsObject.h"
 #include <pathutils.h>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QDir>
 
+// FIXME: possibly move elsewhere
+enum InstSortMode
+{
+	// Sort alphabetically by name.
+	Sort_Name,
+	// Sort by which instance was launched most recently.
+	Sort_LastLaunch
+};
+
 SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::SettingsDialog)
 {
 	MultiMCPlatform::fixWM_CLASS(this);
@@ -316,7 +326,20 @@ void SettingsDialog::applySettings(SettingsObject *s)
 	// Updates
 	s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked());
 	s->set("UpdateChannel", m_currentUpdateChannel);
-
+	//FIXME: make generic
+	switch (ui->themeComboBox->currentIndex())
+	{
+	case 1:
+		s->set("IconTheme", "pe_dark");
+		break;
+	case 2:
+		s->set("IconTheme", "pe_light");
+		break;
+	case 0:
+	default:
+		s->set("IconTheme", "multimc");
+		break;
+	}
 	// FTB
 	s->set("TrackFTBInstances", ui->trackFtbBox->isChecked());
 	s->set("FTBLauncherRoot", ui->ftbLauncherBox->text());
@@ -410,7 +433,7 @@ void SettingsDialog::loadSettings(SettingsObject *s)
 	foreach(const QString & lang, QDir(MMC->staticData() + "/translations")
 									  .entryList(QStringList() << "*.qm", QDir::Files))
 	{
-		QLocale locale(lang.section(QRegExp("[_\.]"), 1));
+		QLocale locale(lang.section(QRegExp("[_\\.]"), 1));
 		ui->languageBox->addItem(QLocale::languageToString(locale.language()), locale);
 	}
 	ui->languageBox->setCurrentIndex(
@@ -419,7 +442,20 @@ void SettingsDialog::loadSettings(SettingsObject *s)
 	// Updates
 	ui->autoUpdateCheckBox->setChecked(s->get("AutoUpdate").toBool());
 	m_currentUpdateChannel = s->get("UpdateChannel").toString();
-
+	//FIXME: make generic
+	auto theme = s->get("IconTheme").toString();
+	if (theme == "pe_dark")
+	{
+		ui->themeComboBox->setCurrentIndex(1);
+	}
+	else if (theme == "pe_light")
+	{
+		ui->themeComboBox->setCurrentIndex(2);
+	}
+	else
+	{
+		ui->themeComboBox->setCurrentIndex(0);
+	}
 	// FTB
 	ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool());
 	ui->ftbLauncherBox->setText(s->get("FTBLauncherRoot").toString());