summaryrefslogtreecommitdiffstats
path: root/gui/MainWindow.cpp
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-27 16:14:18 -0600
committerAndrew <forkk@forkk.net>2013-11-27 16:14:18 -0600
commita4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20 (patch)
treee6b379e6a49e4dabb48ed216f0468a8daa276dac /gui/MainWindow.cpp
parentd794a4d0bfac0341c15bd5273e8dc81fe82531ef (diff)
downloadMultiMC-a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20.tar
MultiMC-a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20.tar.gz
MultiMC-a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20.tar.lz
MultiMC-a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20.tar.xz
MultiMC-a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20.zip
Allow setting no default account
This allows the user to select an account to use every time they launch an instance.
Diffstat (limited to 'gui/MainWindow.cpp')
-rw-r--r--gui/MainWindow.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 3fdbed44..e817d50d 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -58,6 +58,7 @@
#include "gui/dialogs/EditNotesDialog.h"
#include "gui/dialogs/CopyInstanceDialog.h"
#include "gui/dialogs/AccountListDialog.h"
+#include "gui/dialogs/AccountSelectDialog.h"
#include "gui/ConsoleWindow.h"
@@ -627,19 +628,21 @@ void MainWindow::doLogin(const QString &errorMsg)
}
else if (account.get() == nullptr)
{
- // Tell the user they need to log in at least one account in order to play.
- auto reply = CustomMessageBox::selectable(this, tr("No Account Selected"),
- tr("You don't have an account selected as an active account."
- "Would you like to open the account manager to select one now?"),
- QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)->exec();
+ // If no default account is set, ask the user which one to use.
+ AccountSelectDialog selectDialog(tr("Which account would you like to use?"),
+ AccountSelectDialog::GlobalDefaultCheckbox, this);
- if (reply == QMessageBox::Yes)
- {
- // Open the account manager.
- on_actionManageAccounts_triggered();
- }
+ selectDialog.exec();
+
+ // Launch the instance with the selected account.
+ account = selectDialog.selectedAccount();
+
+ // If the user said to use the account as default, do that.
+ if (selectDialog.useAsGlobalDefault() && account.get() != nullptr)
+ accounts->setActiveAccount(account->username());
}
- else
+
+ if (account.get() != nullptr)
{
// We'll need to validate the access token to make sure the account is still logged in.
// TODO: Do that ^