From a4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 27 Nov 2013 16:14:18 -0600 Subject: Allow setting no default account This allows the user to select an account to use every time they launch an instance. --- gui/dialogs/AccountListDialog.cpp | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gui/dialogs/AccountListDialog.cpp') diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp index ea6861c6..5feed13d 100644 --- a/gui/dialogs/AccountListDialog.cpp +++ b/gui/dialogs/AccountListDialog.cpp @@ -25,6 +25,7 @@ #include #include +#include #include @@ -37,6 +38,14 @@ AccountListDialog::AccountListDialog(QWidget *parent) : m_accounts = MMC->accounts(); // TODO: Make the "Active?" column show checkboxes or radio buttons. ui->listView->setModel(m_accounts.get()); + + QItemSelectionModel* selectionModel = ui->listView->selectionModel(); + connect(selectionModel, &QItemSelectionModel::selectionChanged, + [this] (const QItemSelection& sel, const QItemSelection& dsel) { updateButtonStates(); }); + connect(m_accounts.get(), &MojangAccountList::listChanged, + [this] () { updateButtonStates(); }); + + updateButtonStates(); } AccountListDialog::~AccountListDialog() @@ -67,7 +76,7 @@ void AccountListDialog::on_editAccountBtn_clicked() // TODO } -void AccountListDialog::on_setActiveBtn_clicked() +void AccountListDialog::on_setDefaultBtn_clicked() { QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes(); if (selection.size() > 0) @@ -80,11 +89,28 @@ void AccountListDialog::on_setActiveBtn_clicked() } } +void AccountListDialog::on_noDefaultBtn_clicked() +{ + m_accounts->setActiveAccount(""); +} + void AccountListDialog::on_closeBtnBox_rejected() { close(); } +void AccountListDialog::updateButtonStates() +{ + // If there is no selection, disable buttons that require something selected. + QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes(); + + ui->rmAccountBtn->setEnabled(selection.size() > 0); + ui->editAccountBtn->setEnabled(selection.size() > 0); + ui->setDefaultBtn->setEnabled(selection.size() > 0); + + ui->noDefaultBtn->setDown(m_accounts->activeAccount().get() == nullptr); +} + void AccountListDialog::doLogin(const QString& errMsg) { // TODO: We can use the login dialog for this for now, but we'll have to make something better for it eventually. -- cgit v1.2.3