From 55e62a81b69663041cb2402f779d0d957c499cb1 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 28 Dec 2013 14:22:36 +0100
Subject: LiteLoader support

---
 gui/dialogs/OneSixModEditDialog.cpp | 10 ++++++++++
 gui/dialogs/OneSixModEditDialog.h   |  1 +
 gui/dialogs/OneSixModEditDialog.ui  |  7 +++++++
 3 files changed, 18 insertions(+)

(limited to 'gui/dialogs')

diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index 51ea2d19..0d54328a 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -38,6 +38,7 @@
 #include "logic/EnabledItemFilter.h"
 #include "logic/lists/ForgeVersionList.h"
 #include "logic/ForgeInstaller.h"
+#include "logic/LiteLoaderInstaller.h"
 
 OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 	: QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst)
@@ -204,6 +205,15 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 	}
 }
 
+void OneSixModEditDialog::on_liteloaderBtn_clicked()
+{
+	LiteLoaderInstaller liteloader;
+	if (!liteloader.apply(m_version))
+	{
+		// failure notice
+	}
+}
+
 bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
 {
 	switch (keyEvent->key())
diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h
index 5376e526..09bd7946 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/OneSixModEditDialog.h
@@ -44,6 +44,7 @@ slots:
 	// Questionable: SettingsDialog doesn't need this for some reason?
 	void on_buttonBox_rejected();
 	void on_forgeBtn_clicked();
+	void on_liteloaderBtn_clicked();
 	void on_customizeBtn_clicked();
 	void on_revertBtn_clicked();
 	void updateVersionControls();
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui
index 48aa87ee..ad20cd73 100644
--- a/gui/dialogs/OneSixModEditDialog.ui
+++ b/gui/dialogs/OneSixModEditDialog.ui
@@ -77,6 +77,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="liteloaderBtn">
+           <property name="text">
+            <string>Install LiteLoader</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="customizeBtn">
            <property name="toolTip">
-- 
cgit 


From 5b54a4ca8c4849a4476bb9a5e1c2414463949621 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 28 Dec 2013 23:34:18 +0100
Subject: Don't hardcode stuff!!!

---
 gui/dialogs/OneSixModEditDialog.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'gui/dialogs')

diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index 0d54328a..fb422941 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -72,6 +72,8 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		auto smodel = ui->loaderModTreeView->selectionModel();
 		connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
 				SLOT(loaderCurrent(QModelIndex, QModelIndex)));
+
+		ui->liteloaderBtn->setEnabled(LiteLoaderInstaller(m_inst->intendedVersionId()).canApply());
 	}
 	// resource packs
 	{
@@ -207,7 +209,15 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 
 void OneSixModEditDialog::on_liteloaderBtn_clicked()
 {
-	LiteLoaderInstaller liteloader;
+	LiteLoaderInstaller liteloader(m_inst->intendedVersionId());
+	if (!liteloader.canApply())
+	{
+		QMessageBox::critical(
+			this, tr("LiteLoader"),
+			tr("There is no information available on how to install LiteLoader "
+			   "into this version of Minecraft"));
+		return;
+	}
 	if (!liteloader.apply(m_version))
 	{
 		// failure notice
-- 
cgit