diff options
author | Petr Mrázek <peterix@gmail.com> | 2019-07-09 21:51:19 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2019-07-09 21:51:19 +0200 |
commit | 739a86f17194e60f44767d5830d7c214edc5d276 (patch) | |
tree | 4fd43d9a4f97670895d3c7fd77f9be40e36bbfe3 /application/dialogs | |
parent | 48b2f95129cb8ad67932ae000e32ce212080e037 (diff) | |
download | MultiMC-739a86f17194e60f44767d5830d7c214edc5d276.tar MultiMC-739a86f17194e60f44767d5830d7c214edc5d276.tar.gz MultiMC-739a86f17194e60f44767d5830d7c214edc5d276.tar.lz MultiMC-739a86f17194e60f44767d5830d7c214edc5d276.tar.xz MultiMC-739a86f17194e60f44767d5830d7c214edc5d276.zip |
Revert "NOISSUE Import page is now a MultiMC pack page"
This reverts commit f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.
Diffstat (limited to 'application/dialogs')
-rw-r--r-- | application/dialogs/NewInstanceDialog.cpp | 6 | ||||
-rw-r--r-- | application/dialogs/NewInstanceDialog.h | 4 |
2 files changed, 5 insertions, 5 deletions
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 <pages/modplatform/VanillaPage.h> #include <pages/modplatform/FTBPage.h> #include <pages/modplatform/TwitchPage.h> -#include <pages/modplatform/MultiMCPage.h> +#include <pages/modplatform/ImportPage.h> #include <pages/modplatform/TechnicPage.h> NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString & url, QWidget *parent) @@ -118,13 +118,13 @@ void NewInstanceDialog::accept() QList<BasePage *> 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<InstanceTask> creationTask; bool importIcon = false; |