NOISSUE redo new instance dialog

48 files changed, 1204 insertions, 30 deletions

diff --git a/application/pages/BasePage.h b/application/pages/BasePage.h
index 63a26239..d4547770 100644
--- a/application/pages/BasePage.h
+++ b/application/pages/BasePage.h
@@ -31,8 +31,18 @@ public:
 	virtual bool apply() { return true; }
 	virtual bool shouldDisplay() const { return true; }
 	virtual QString helpPage() const { return QString(); }
-	virtual void opened() {}
-	virtual void closed() {}
+	void opened()
+	{
+		isOpened = true;
+		openedImpl();
+	}
+	void closed()
+	{
+		isOpened = false;
+		closedImpl();
+	}
+	virtual void openedImpl() {}
+	virtual void closedImpl() {}
 	virtual void setParentContainer(BasePageContainer * container)
 	{
 		m_container = container;
@@ -42,6 +52,7 @@ public:
 	int listIndex = -1;
 protected:
 	BasePageContainer * m_container = nullptr;
+	bool isOpened = false;
 };
 
 typedef std::shared_ptr<BasePage> BasePagePtr;
diff --git a/application/pages/BasePageProvider.h b/application/pages/BasePageProvider.h
index 0ebcff7a..1cc7458a 100644
--- a/application/pages/BasePageProvider.h
+++ b/application/pages/BasePageProvider.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <memory>
 #include <functional>
 
@@ -65,5 +65,3 @@ private:
 	QList<PageCreator> m_creators;
 	QString m_dialogTitle;
 };
-
-typedef std::shared_ptr<BasePageProvider> BasePageProviderPtr;
diff --git a/application/pages/global/PackagesPage.cpp b/application/pages/global/PackagesPage.cpp
index 5fd4934c..7cf1e3f5 100644
--- a/application/pages/global/PackagesPage.cpp
+++ b/application/pages/global/PackagesPage.cpp
@@ -218,7 +218,7 @@ void PackagesPage::updateVersion()
 	}
 }
 
-void PackagesPage::opened()
+void PackagesPage::openedImpl()
 {
 	ENV.metadataIndex()->load(Net::Mode::Offline);
 }
diff --git a/application/pages/global/PackagesPage.h b/application/pages/global/PackagesPage.h
index 2afbcf8e..ad155d9e 100644
--- a/application/pages/global/PackagesPage.h
+++ b/application/pages/global/PackagesPage.h
@@ -36,7 +36,7 @@ public:
 	QString id() const override { return "packages-global"; }
 	QString displayName() const override { return tr("Packages"); }
 	QIcon icon() const override;
-	void opened() override;
+	void openedImpl() override;
 
 private slots:
 	void on_refreshIndexBtn_clicked();
diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/instance/InstanceSettingsPage.cpp
index 71e90a32..71e90a32 100644
--- a/application/pages/InstanceSettingsPage.cpp
+++ b/application/pages/instance/InstanceSettingsPage.cpp
diff --git a/application/pages/InstanceSettingsPage.h b/application/pages/instance/InstanceSettingsPage.h
index 4959bdbe..c5d7d3b6 100644
--- a/application/pages/InstanceSettingsPage.h
+++ b/application/pages/instance/InstanceSettingsPage.h
@@ -20,7 +20,7 @@
 #include "java/JavaChecker.h"
 #include "BaseInstance.h"
 #include <QObjectPtr.h>
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include "JavaCommon.h"
 #include "MultiMC.h"
 
diff --git a/application/pages/InstanceSettingsPage.ui b/application/pages/instance/InstanceSettingsPage.ui
index 0c180df3..0c180df3 100644
--- a/application/pages/InstanceSettingsPage.ui
+++ b/application/pages/instance/InstanceSettingsPage.ui
diff --git a/application/pages/LegacyUpgradePage.cpp b/application/pages/instance/LegacyUpgradePage.cpp
index a8f4a08c..f808ab88 100644
--- a/application/pages/LegacyUpgradePage.cpp
+++ b/application/pages/instance/LegacyUpgradePage.cpp
@@ -35,7 +35,12 @@ void LegacyUpgradePage::runModalTask(Task *task)
 
 void LegacyUpgradePage::on_upgradeButton_clicked()
 {
-	std::unique_ptr<Task> task(MMC->folderProvider()->legacyUpgradeTask(m_inst));
+	QString newName = tr("%1 (Migrated)").arg(m_inst->name());
+	auto upgradeTask = new LegacyUpgradeTask(m_inst);
+	upgradeTask->setName(newName);
+	upgradeTask->setGroup(m_inst->group());
+	upgradeTask->setIcon(m_inst->iconKey());
+	std::unique_ptr<Task> task(MMC->folderProvider()->wrapInstanceTask(upgradeTask));
 	runModalTask(task.get());
 }
 
diff --git a/application/pages/LegacyUpgradePage.h b/application/pages/instance/LegacyUpgradePage.h
index 3e1abe93..3e1abe93 100644
--- a/application/pages/LegacyUpgradePage.h
+++ b/application/pages/instance/LegacyUpgradePage.h
diff --git a/application/pages/LegacyUpgradePage.ui b/application/pages/instance/LegacyUpgradePage.ui
index a94ee039..a94ee039 100644
--- a/application/pages/LegacyUpgradePage.ui
+++ b/application/pages/instance/LegacyUpgradePage.ui
diff --git a/application/pages/LogPage.cpp b/application/pages/instance/LogPage.cpp
index 0fa1ee67..0fa1ee67 100644
--- a/application/pages/LogPage.cpp
+++ b/application/pages/instance/LogPage.cpp
diff --git a/application/pages/LogPage.h b/application/pages/instance/LogPage.h
index b830118e..2229418d 100644
--- a/application/pages/LogPage.h
+++ b/application/pages/instance/LogPage.h
@@ -19,7 +19,7 @@
 
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 namespace Ui
diff --git a/application/pages/LogPage.ui b/application/pages/instance/LogPage.ui
index 4843d7c3..4843d7c3 100644
--- a/application/pages/LogPage.ui
+++ b/application/pages/instance/LogPage.ui
diff --git a/application/pages/ModFolderPage.cpp b/application/pages/instance/ModFolderPage.cpp
index 2b3f4416..90155df3 100644
--- a/application/pages/ModFolderPage.cpp
+++ b/application/pages/instance/ModFolderPage.cpp
@@ -59,12 +59,12 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods,
 	connect(ui->filterEdit, &QLineEdit::textChanged, this, &ModFolderPage::on_filterTextChanged );
 }
 
-void ModFolderPage::opened()
+void ModFolderPage::openedImpl()
 {
 	m_mods->startWatching();
 }
 
-void ModFolderPage::closed()
+void ModFolderPage::closedImpl()
 {
 	m_mods->stopWatching();
 }
diff --git a/application/pages/ModFolderPage.h b/application/pages/instance/ModFolderPage.h
index 02282c41..15e728cb 100644
--- a/application/pages/ModFolderPage.h
+++ b/application/pages/instance/ModFolderPage.h
@@ -18,7 +18,7 @@
 #include <QWidget>
 
 #include "minecraft/MinecraftInstance.h"
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 class ModList;
@@ -60,8 +60,8 @@ public:
 	}
 	virtual bool shouldDisplay() const override;
 
-	virtual void opened() override;
-	virtual void closed() override;
+	virtual void openedImpl() override;
+	virtual void closedImpl() override;
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev) override;
 	bool modListFilter(QKeyEvent *ev);
diff --git a/application/pages/ModFolderPage.ui b/application/pages/instance/ModFolderPage.ui
index b5597bdc..b5597bdc 100644
--- a/application/pages/ModFolderPage.ui
+++ b/application/pages/instance/ModFolderPage.ui
diff --git a/application/pages/NotesPage.cpp b/application/pages/instance/NotesPage.cpp
index 48bb468c..48bb468c 100644
--- a/application/pages/NotesPage.cpp
+++ b/application/pages/instance/NotesPage.cpp
diff --git a/application/pages/NotesPage.h b/application/pages/instance/NotesPage.h
index eab446ad..4a25f9b1 100644
--- a/application/pages/NotesPage.h
+++ b/application/pages/instance/NotesPage.h
@@ -18,7 +18,7 @@
 #include <QWidget>
 
 #include "BaseInstance.h"
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 namespace Ui
diff --git a/application/pages/NotesPage.ui b/application/pages/instance/NotesPage.ui
index 88cca92f..88cca92f 100644
--- a/application/pages/NotesPage.ui
+++ b/application/pages/instance/NotesPage.ui
diff --git a/application/pages/OtherLogsPage.cpp b/application/pages/instance/OtherLogsPage.cpp
index 2141e0cc..10cb1145 100644
--- a/application/pages/OtherLogsPage.cpp
+++ b/application/pages/instance/OtherLogsPage.cpp
@@ -54,11 +54,11 @@ OtherLogsPage::~OtherLogsPage()
 	delete ui;
 }
 
-void OtherLogsPage::opened()
+void OtherLogsPage::openedImpl()
 {
 	m_watcher->enable();
 }
-void OtherLogsPage::closed()
+void OtherLogsPage::closedImpl()
 {
 	m_watcher->disable();
 }
diff --git a/application/pages/OtherLogsPage.h b/application/pages/instance/OtherLogsPage.h
index 157f5e9d..ac01ef0a 100644
--- a/application/pages/OtherLogsPage.h
+++ b/application/pages/instance/OtherLogsPage.h
@@ -17,7 +17,7 @@
 
 #include <QWidget>
 
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 #include <pathmatcher/IPathMatcher.h>
 
@@ -52,8 +52,8 @@ public:
 	{
 		return "Minecraft-Logs";
 	}
-	void opened() override;
-	void closed() override;
+	void openedImpl() override;
+	void closedImpl() override;
 
 private slots:
 	void populateSelectLogBox();
diff --git a/application/pages/OtherLogsPage.ui b/application/pages/instance/OtherLogsPage.ui
index 56ff3b62..56ff3b62 100644
--- a/application/pages/OtherLogsPage.ui
+++ b/application/pages/instance/OtherLogsPage.ui
diff --git a/application/pages/ResourcePackPage.h b/application/pages/instance/ResourcePackPage.h
index 19dc78da..19dc78da 100644
--- a/application/pages/ResourcePackPage.h
+++ b/application/pages/instance/ResourcePackPage.h
diff --git a/application/pages/ScreenshotsPage.cpp b/application/pages/instance/ScreenshotsPage.cpp
index 7d32576a..71458386 100644
--- a/application/pages/ScreenshotsPage.cpp
+++ b/application/pages/instance/ScreenshotsPage.cpp
@@ -347,7 +347,7 @@ void ScreenshotsPage::on_renameBtn_clicked()
 	// TODO: mass renaming
 }
 
-void ScreenshotsPage::opened()
+void ScreenshotsPage::openedImpl()
 {
 	if(!m_valid)
 	{
diff --git a/application/pages/ScreenshotsPage.h b/application/pages/instance/ScreenshotsPage.h
index c3ccbdee..e31fb8b4 100644
--- a/application/pages/ScreenshotsPage.h
+++ b/application/pages/instance/ScreenshotsPage.h
@@ -17,7 +17,7 @@
 
 #include <QWidget>
 
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 
 class QFileSystemModel;
@@ -39,7 +39,7 @@ public:
 	explicit ScreenshotsPage(QString path, QWidget *parent = 0);
 	virtual ~ScreenshotsPage();
 
-	virtual void opened() override;
+	virtual void openedImpl() override;
 
 	enum
 	{
diff --git a/application/pages/ScreenshotsPage.ui b/application/pages/instance/ScreenshotsPage.ui
index d05c4384..d05c4384 100644
--- a/application/pages/ScreenshotsPage.ui
+++ b/application/pages/instance/ScreenshotsPage.ui
diff --git a/application/pages/TexturePackPage.h b/application/pages/instance/TexturePackPage.h
index b03614f0..b03614f0 100644
--- a/application/pages/TexturePackPage.h
+++ b/application/pages/instance/TexturePackPage.h
diff --git a/application/pages/VersionPage.cpp b/application/pages/instance/VersionPage.cpp
index 00ae0a7e..00ae0a7e 100644
--- a/application/pages/VersionPage.cpp
+++ b/application/pages/instance/VersionPage.cpp
diff --git a/application/pages/VersionPage.h b/application/pages/instance/VersionPage.h
index 49620c56..85304ea5 100644
--- a/application/pages/VersionPage.h
+++ b/application/pages/instance/VersionPage.h
@@ -19,7 +19,7 @@
 
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/ComponentList.h"
-#include "BasePage.h"
+#include "pages/BasePage.h"
 
 namespace Ui
 {
diff --git a/application/pages/VersionPage.ui b/application/pages/instance/VersionPage.ui
index d54dd840..d54dd840 100644
--- a/application/pages/VersionPage.ui
+++ b/application/pages/instance/VersionPage.ui
diff --git a/application/pages/WorldListPage.cpp b/application/pages/instance/WorldListPage.cpp
index 56a7e791..539d26a0 100644
--- a/application/pages/WorldListPage.cpp
+++ b/application/pages/instance/WorldListPage.cpp
@@ -55,12 +55,12 @@ WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worl
 	worldChanged(QModelIndex(), QModelIndex());
 }
 
-void WorldListPage::opened()
+void WorldListPage::openedImpl()
 {
 	m_worlds->startWatching();
 }
 
-void WorldListPage::closed()
+void WorldListPage::closedImpl()
 {
 	m_worlds->stopWatching();
 }
diff --git a/application/pages/WorldListPage.h b/application/pages/instance/WorldListPage.h
index d0aa6150..71b87bda 100644
--- a/application/pages/WorldListPage.h
+++ b/application/pages/instance/WorldListPage.h
@@ -18,7 +18,7 @@
 #include <QWidget>
 
 #include "minecraft/MinecraftInstance.h"
-#include "BasePage.h"
+#include "pages/BasePage.h"
 #include <MultiMC.h>
 #include <LoggedProcess.h>
 
@@ -56,8 +56,8 @@ public:
 	}
 	virtual bool shouldDisplay() const override;
 
-	virtual void opened() override;
-	virtual void closed() override;
+	virtual void openedImpl() override;
+	virtual void closedImpl() override;
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev) override;
diff --git a/application/pages/WorldListPage.ui b/application/pages/instance/WorldListPage.ui
index 0018ddf3..0018ddf3 100644
--- a/application/pages/WorldListPage.ui
+++ b/application/pages/instance/WorldListPage.ui
diff --git a/application/pages/modplatform/FTBPage.cpp b/application/pages/modplatform/FTBPage.cpp
new file mode 100644
index 00000000..a8ec6577
--- /dev/null
+++ b/application/pages/modplatform/FTBPage.cpp
@@ -0,0 +1,152 @@
+#include "FTBPage.h"
+#include "ui_FTBPage.h"
+
+#include "MultiMC.h"
+#include "FolderInstanceProvider.h"
+#include "dialogs/CustomMessageBox.h"
+#include "dialogs/NewInstanceDialog.h"
+#include "modplatform/ftb/FtbPackDownloader.h"
+#include "modplatform/ftb/FtbPackInstallTask.h"
+#include <FtbListModel.h>
+
+FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
+	: QWidget(parent), dialog(dialog), ui(new Ui::FTBPage)
+{
+	ui->setupUi(this);
+	ftbPackDownloader = new FtbPackDownloader();
+
+	connect(ftbPackDownloader, &FtbPackDownloader::ready, this, &FTBPage::ftbPackDataDownloadSuccessfully);
+	connect(ftbPackDownloader, &FtbPackDownloader::packFetchFailed, this, &FTBPage::ftbPackDataDownloadFailed);
+
+	filterModel = new FtbFilterModel(this);
+	listModel = new FtbListModel(this);
+	filterModel->setSourceModel(listModel);
+
+	ui->packList->setModel(filterModel);
+	ui->packList->setSortingEnabled(true);
+	ui->packList->header()->hide();
+	ui->packList->setIndentation(0);
+
+	filterModel->setSorting(FtbFilterModel::Sorting::ByName);
+
+	for(int i = 0; i < filterModel->getAvailableSortings().size(); i++)
+	{
+		ui->sortByBox->addItem(filterModel->getAvailableSortings().keys().at(i));
+	}
+
+	ui->sortByBox->setCurrentText(filterModel->getAvailableSortings().key(filterModel->getCurrentSorting()));
+
+	connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FTBPage::onSortingSelectionChanged);
+	connect(ui->packVersionSelection, &QComboBox::currentTextChanged, this, &FTBPage::onVersionSelectionItemChanged);
+	connect(ui->packList->selectionModel(), &QItemSelectionModel::currentChanged, this, &FTBPage::onPackSelectionChanged);
+
+	ui->modpackInfo->setOpenExternalLinks(true);
+}
+
+FTBPage::~FTBPage()
+{
+	delete ui;
+	if(ftbPackDownloader)
+	{
+		ftbPackDownloader->deleteLater();
+	}
+}
+
+bool FTBPage::shouldDisplay() const
+{
+	return true;
+}
+
+void FTBPage::openedImpl()
+{
+	if(!initialized)
+	{
+		ftbPackDownloader->fetchModpacks(false);
+		initialized = true;
+	}
+	suggestCurrent();
+}
+
+void FTBPage::suggestCurrent()
+{
+	if(isOpened)
+	{
+		if(!selected.broken)
+		{
+			dialog->setSuggestedPack(selected.name, new FtbPackInstallTask(selected, selectedVersion));
+		}
+		else
+		{
+			dialog->setSuggestedPack();
+		}
+	}
+}
+
+FtbPackDownloader *FTBPage::getFtbPackDownloader()
+{
+	return ftbPackDownloader;
+}
+
+void FTBPage::ftbPackDataDownloadSuccessfully()
+{
+	listModel->fill(ftbPackDownloader->getModpacks());
+}
+
+void FTBPage::ftbPackDataDownloadFailed()
+{
+	qDebug() << "Stuff went missing while grabbing FTB pack list or something...";
+}
+
+void FTBPage::onPackSelectionChanged(QModelIndex now, QModelIndex prev)
+{
+	ui->packVersionSelection->clear();
+	FtbModpack selectedPack = filterModel->data(now, Qt::UserRole).value<FtbModpack>();
+
+	ui->modpackInfo->setHtml("Pack by <b>" + selectedPack.author + "</b>" + "<br>Minecraft " + selectedPack.mcVersion + "<br>"
+				"<br>" + selectedPack.description + "<ul><li>" + selectedPack.mods.replace(";", "</li><li>") + "</li></ul>");
+
+	bool currentAdded = false;
+
+	for(int i = 0; i < selectedPack.oldVersions.size(); i++)
+	{
+		if(selectedPack.currentVersion == selectedPack.oldVersions.at(i))
+		{
+			currentAdded = true;
+		}
+		ui->packVersionSelection->addItem(selectedPack.oldVersions.at(i));
+	}
+
+	if(!currentAdded)
+	{
+		ui->packVersionSelection->addItem(selectedPack.currentVersion);
+	}
+
+	selected = selectedPack;
+	suggestCurrent();
+}
+
+void FTBPage::onVersionSelectionItemChanged(QString data)
+{
+	if(data.isNull() || data.isEmpty())
+	{
+		selectedVersion = "";
+		return;