mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2557

Browse Source 
Don’t show main dialog right away if wizard is selected.
This commit is contained in:
Nikolay Kasyanov 2015-05-16 13:18:04 +03:00
parent 5abeab21ed
commit 7d321e0fb7
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/launcher/main.cpp
View File

@ -59,14 +59,16 @@ int main(int argc, char *argv[])
Launcher::MainDialog mainWin; Launcher::MainDialog mainWin;
if (!mainWin.showFirstRunDialog()) Launcher::FirstRunDialogResult result = mainWin.showFirstRunDialog();
if (result == Launcher::FirstRunDialogResultFailure)
return 0; return 0;
// if (!mainWin.setup()) { // if (!mainWin.setup()) {
// return 0; // return 0;
// } // }
mainWin.show(); if (result == Launcher::FirstRunDialogResultContinue)
mainWin.show();
int returnValue = app.exec(); int returnValue = app.exec();
SDL_Quit(); SDL_Quit();

10
apps/launcher/maindialog.cpp
View File

@ -148,10 +148,10 @@ void Launcher::MainDialog::createPages()
} }
bool Launcher::MainDialog::showFirstRunDialog() Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
{ {
if (!setupLauncherSettings()) if (!setupLauncherSettings())
return false; return FirstRunDialogResultFailure;
if (mLauncherSettings.value(QString("General/firstrun"), QString("true")) == QLatin1String("true")) if (mLauncherSettings.value(QString("General/firstrun"), QString("true")) == QLatin1String("true"))
{ {
@ -176,14 +176,14 @@ bool Launcher::MainDialog::showFirstRunDialog()
if (msgBox.clickedButton() == wizardButton) if (msgBox.clickedButton() == wizardButton)
{ {
if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false)) { if (!mWizardInvoker->startProcess(QLatin1String("openmw-wizard"), false)) {
return false; return FirstRunDialogResultFailure;
} else { } else {
return true; return FirstRunDialogResultWizard;
} }
} }
} }
return setup(); return setup() ? FirstRunDialogResultContinue : FirstRunDialogResultFailure;
} }
bool Launcher::MainDialog::setup() bool Launcher::MainDialog::setup()

8
apps/launcher/maindialog.hpp
View File

@ -31,6 +31,12 @@ namespace Launcher
class UnshieldThread; class UnshieldThread;
class SettingsPage; class SettingsPage;
typedef enum {
FirstRunDialogResultFailure,
FirstRunDialogResultContinue,
FirstRunDialogResultWizard
} FirstRunDialogResult;
#ifndef WIN32 #ifndef WIN32
bool expansions(Launcher::UnshieldThread& cd); bool expansions(Launcher::UnshieldThread& cd);
#endif #endif
@ -44,7 +50,7 @@ namespace Launcher
~MainDialog(); ~MainDialog();
bool setup(); bool setup();
bool showFirstRunDialog(); FirstRunDialogResult showFirstRunDialog();
bool reloadSettings(); bool reloadSettings();
bool writeSettings(); bool writeSettings();