CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1793 rearrange setup wizard logic to only check if they are needed once

Browse Source
This commit is contained in:
Petr Mrázek
2017-01-21 18:18:53 +01:00
parent ceb5fc6d75
commit 782384f185
10 changed files with 70 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
application/setupwizard/SetupWizard.cpp
View File

@ -11,13 +11,6 @@
#include <QAbstractButton>
enum Page
{
Language,
Java,
Analytics,
};
SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent)
{
setObjectName(QStringLiteral("SetupWizard"));
@ -29,19 +22,6 @@ SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent)
retranslate();
connect(this, &QWizard::currentIdChanged, this, &SetupWizard::pageChanged);
if (LanguageWizardPage::isRequired())
{
setPage(Page::Language, new LanguageWizardPage(this));
}
if (JavaWizardPage::isRequired())
{
setPage(Page::Java, new JavaWizardPage(this));
}
if(AnalyticsWizardPage::isRequired())
{
setPage(Page::Analytics, new AnalyticsWizardPage(this));
}
}
void SetupWizard::retranslate()
@ -106,15 +86,3 @@ void SetupWizard::changeEvent(QEvent *event)
SetupWizard::~SetupWizard()
{
}
bool SetupWizard::isRequired()
{
if (LanguageWizardPage::isRequired())
return true;
if (JavaWizardPage::isRequired())
return true;
if (AnalyticsWizardPage::isRequired())
return true;
return false;
}