This commit is contained in:
Jan Dalheimer
2014-04-16 17:54:07 +02:00
parent 3ed5b1570b
commit f67ca674c4
2 changed files with 11 additions and 16 deletions

View File

@@ -1,7 +1,4 @@
/* Copyright 2014 MultiMC Contributors
*
* Authors:
* Taeyeon Mori <orochimarufan.x3@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,12 +42,12 @@ void LoginDialog::accept()
ui->progressBar->setVisible(true);
m_account = MojangAccount::createFromUsername(ui->userTextBox->text());
auto task = m_account->login(nullptr, ui->passTextBox->text());
connect(task.get(), &Task::failed, this, &LoginDialog::onTaskFailed);
connect(task.get(), &Task::succeeded, this, &LoginDialog::onTaskSucceeded);
connect(task.get(), &Task::status, this, &LoginDialog::onTaskStatus);
connect(task.get(), &Task::progress, this, &LoginDialog::onTaskProgress);
task->start();
m_loginTask = m_account->login(nullptr, ui->passTextBox->text());
connect(m_loginTask.get(), &ProgressProvider::failed, this, &LoginDialog::onTaskFailed);
connect(m_loginTask.get(), &ProgressProvider::succeeded, this, &LoginDialog::onTaskSucceeded);
connect(m_loginTask.get(), &ProgressProvider::status, this, &LoginDialog::onTaskStatus);
connect(m_loginTask.get(), &ProgressProvider::progress, this, &LoginDialog::onTaskProgress);
m_loginTask->start();
}
void LoginDialog::setUserInputsEnabled(bool enable)
@@ -91,10 +88,10 @@ void LoginDialog::onTaskStatus(const QString &status)
ui->label->setText(status);
}
void LoginDialog::onTaskProgress(qint64 value, qint64 max)
void LoginDialog::onTaskProgress(qint64 current, qint64 total)
{
ui->progressBar->setMaximum(max);
ui->progressBar->setValue(value);
ui->progressBar->setMaximum(total);
ui->progressBar->setValue(current);
}
// Public interface