summaryrefslogtreecommitdiffstats
path: root/application/dialogs
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2019-06-29 01:13:39 +0200
committerPetr Mrázek <peterix@gmail.com>2019-06-29 01:13:39 +0200
commitf74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259 (patch)
tree11e91448dd85a701142fbbd11b7b3d3f4bc1372b /application/dialogs
parentfde43c993e0a143b9dddcaff2190c91f4e5e3cb9 (diff)
downloadMultiMC-f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.tar
MultiMC-f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.tar.gz
MultiMC-f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.tar.lz
MultiMC-f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.tar.xz
MultiMC-f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.zip
NOISSUE Import page is now a MultiMC pack page
Diffstat (limited to 'application/dialogs')
-rw-r--r--application/dialogs/NewInstanceDialog.cpp6
-rw-r--r--application/dialogs/NewInstanceDialog.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp
index 402a3417..e850d728 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/ImportPage.h>
+#include <pages/modplatform/MultiMCPage.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 ImportPage(this);
+ importPage = new MultiMCPage(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 c86ab73f..afeab4d1 100644
--- a/application/dialogs/NewInstanceDialog.h
+++ b/application/dialogs/NewInstanceDialog.h
@@ -28,7 +28,7 @@ class NewInstanceDialog;
class PageContainer;
class QDialogButtonBox;
-class ImportPage;
+class MultiMCPage;
class NewInstanceDialog : public QDialog, public BasePageProvider
{
@@ -66,7 +66,7 @@ private:
QDialogButtonBox * m_buttons = nullptr;
QString InstIconKey;
- ImportPage *importPage = nullptr;
+ MultiMCPage *importPage = nullptr;
std::unique_ptr<InstanceTask> creationTask;
bool importIcon = false;