0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Import page is now a MultiMC pack page

Browse Source
This commit is contained in:
Petr Mrázek
2019-06-29 01:13:39 +02:00
parent fde43c993e
commit f74e3db804
10 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/dialogs/NewInstanceDialog.cpp
View File

@@ -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)
};
}

4
application/dialogs/NewInstanceDialog.h
View File

@@ -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;