External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various task related improvements.

Browse Source 
* Errors are reported back to task users via Failure signals.
* Lwjgl doesn't download on each legacy instance start anymore.
* Tasks were unified when it comes to success/failure.
* Task dialogs don't get spawned after short tasks finish anymore.
This commit is contained in:
Petr Mrázek
2013-08-09 00:26:35 +02:00
parent c8925e0f66
commit bf5f5091ef
16 changed files with 122 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main.cpp
View File

@@ -61,9 +61,11 @@ private slots:
QApplication::instance()->quit();
}
void onLoginComplete(QString instId, LoginResponse response)
void onLoginComplete()
{
proc = instance->prepareForLaunch(response.username, response.sessionID);
LoginTask * task = (LoginTask *) QObject::sender();
auto result = task->getResult();
proc = instance->prepareForLaunch(result.username, result.sessionID);
if(!proc)
{
//FIXME: report error
@@ -78,7 +80,7 @@ private slots:
proc->launch();
}
void doLogin(QString instId, const QString &errorMsg)
void doLogin(const QString &errorMsg)
{
LoginDialog* loginDlg = new LoginDialog(nullptr, errorMsg);
if (loginDlg->exec())
@@ -87,10 +89,8 @@ private slots:
TaskDialog* tDialog = new TaskDialog(nullptr);
LoginTask* loginTask = new LoginTask(uInfo, tDialog);
connect(loginTask, SIGNAL(loginComplete(QString, LoginResponse)),
SLOT(onLoginComplete(QString, LoginResponse)), Qt::QueuedConnection);
connect(loginTask, SIGNAL(loginFailed(QString, QString)),
SLOT(doLogin(QString, QString)), Qt::QueuedConnection);
connect(loginTask, SIGNAL(succeeded()),SLOT(onLoginComplete()), Qt::QueuedConnection);
connect(loginTask, SIGNAL(failed(QString)),SLOT(doLogin(QString)), Qt::QueuedConnection);
tDialog->exec(loginTask);
}
//onLoginComplete(LoginResponse("Offline","Offline", 1));
@@ -111,7 +111,7 @@ public:
}
std::cout << "Logging in..." << std::endl;
doLogin(instance->id(),"");
doLogin("");
return QApplication::instance()->exec();
}