From 739a86f17194e60f44767d5830d7c214edc5d276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 9 Jul 2019 21:51:19 +0200 Subject: Revert "NOISSUE Import page is now a MultiMC pack page" This reverts commit f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259. --- application/dialogs/NewInstanceDialog.cpp | 6 +++--- application/dialogs/NewInstanceDialog.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'application/dialogs') diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp index e850d728..402a3417 100644 --- a/application/dialogs/NewInstanceDialog.cpp +++ b/application/dialogs/NewInstanceDialog.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString & url, QWidget *parent) @@ -118,13 +118,13 @@ void NewInstanceDialog::accept() QList NewInstanceDialog::getPages() { - importPage = new MultiMCPage(this); + importPage = new ImportPage(this); return { new VanillaPage(this), + new FTBPage(this), importPage, new TwitchPage(this), - new FTBPage(this), new TechnicPage(this) }; } diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h index afeab4d1..c86ab73f 100644 --- a/application/dialogs/NewInstanceDialog.h +++ b/application/dialogs/NewInstanceDialog.h @@ -28,7 +28,7 @@ class NewInstanceDialog; class PageContainer; class QDialogButtonBox; -class MultiMCPage; +class ImportPage; class NewInstanceDialog : public QDialog, public BasePageProvider { @@ -66,7 +66,7 @@ private: QDialogButtonBox * m_buttons = nullptr; QString InstIconKey; - MultiMCPage *importPage = nullptr; + ImportPage *importPage = nullptr; std::unique_ptr creationTask; bool importIcon = false; -- cgit v1.2.3