diff options
| author | Andrew <forkk@forkk.net> | 2013-11-28 21:40:40 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-28 21:40:40 -0600 |
| commit | f3a9dde52e99385eba01c9356ed8ef9548833e34 (patch) | |
| tree | 557ddb2f51f4f1517f58a4a3e43201229a5b1abc /gui/MainWindow.cpp | |
| parent | bfc9e1e5d598f354dd39e5c2eb51d5e51585359b (diff) | |
| download | MultiMC-f3a9dde52e99385eba01c9356ed8ef9548833e34.tar MultiMC-f3a9dde52e99385eba01c9356ed8ef9548833e34.tar.gz MultiMC-f3a9dde52e99385eba01c9356ed8ef9548833e34.tar.lz MultiMC-f3a9dde52e99385eba01c9356ed8ef9548833e34.tar.xz MultiMC-f3a9dde52e99385eba01c9356ed8ef9548833e34.zip | |
Rework the password dialog
It's now used as a general purpose "account edit dialog". It'll be used
for entering usernames, passwords, or both.
Diffstat (limited to 'gui/MainWindow.cpp')
| -rw-r--r-- | gui/MainWindow.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 72e754ee..65d9f4cc 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -60,7 +60,7 @@ #include "gui/dialogs/CopyInstanceDialog.h" #include "gui/dialogs/AccountListDialog.h" #include "gui/dialogs/AccountSelectDialog.h" -#include "gui/dialogs/PasswordDialog.h" +#include "gui/dialogs/EditAccountDialog.h" #include "gui/ConsoleWindow.h" @@ -599,7 +599,6 @@ void MainWindow::on_actionSettings_triggered() void MainWindow::on_actionManageAccounts_triggered() { AccountListDialog dialog(this); - connect(&dialog, SIGNAL(activeAccountChanged()), SLOT(activeAccountChanged())); dialog.exec(); } @@ -812,7 +811,7 @@ void MainWindow::doLaunchInst(BaseInstance* instance, MojangAccountPtr account) bool MainWindow::doRefreshToken(MojangAccountPtr account, const QString& errorMsg) { - PasswordDialog passDialog(errorMsg, this); + EditAccountDialog passDialog(errorMsg, this, EditAccountDialog::PasswordField); if (passDialog.exec() == QDialog::Accepted) { // To refresh the token, we just create an authenticate task with the given account and the user's password. |