From 9cf8b42d8923454b335159b08cc6dd551afd9301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 15 Nov 2016 09:18:55 +0100 Subject: [PATCH] NOISSUE mark profile in use also on the main window profile button --- application/MainWindow.cpp | 30 +++++++++++++++++++++++------- application/MainWindow.h | 22 +++++++++++----------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 5ef32804..e5ea81f6 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -699,6 +699,18 @@ void MainWindow::updateToolsMenu() ui->actionLaunchInstance->setMenu(launchMenu); } +QString profileInUseFilter(const QString & profile, bool used) +{ + if(used) + { + return profile + QObject::tr(" (in use)"); + } + else + { + return profile; + } +} + void MainWindow::repopulateAccountsMenu() { accountMenu->clear(); @@ -709,7 +721,14 @@ void MainWindow::repopulateAccountsMenu() QString active_username = ""; if (active_account != nullptr) { - active_username = accounts->activeAccount()->username(); + active_username = active_account->username(); + const AccountProfile *profile = active_account->currentProfile(); + // this can be called before accountMenuButton exists + if (profile != nullptr && accountMenuButton) + { + auto profileLabel = profileInUseFilter(profile->name, active_account->isInUse()); + accountMenuButton->setText(profileLabel); + } } if (accounts->count() <= 0) @@ -726,11 +745,7 @@ void MainWindow::repopulateAccountsMenu() MojangAccountPtr account = accounts->at(i); for (auto profile : account->profiles()) { - auto profileLabel = profile.name; - if(account->isInUse()) - { - profileLabel += tr(" (in use)"); - } + auto profileLabel = profileInUseFilter(profile.name, account->isInUse()); QAction *action = new QAction(profileLabel, this); action->setData(account->username()); action->setCheckable(true); @@ -798,8 +813,9 @@ void MainWindow::activeAccountChanged() const AccountProfile *profile = account->currentProfile(); if (profile != nullptr) { + auto profileLabel = profileInUseFilter(profile->name, account->isInUse()); accountMenuButton->setIcon(SkinUtils::getFaceFromCache(profile->id)); - accountMenuButton->setText(profile->name); + accountMenuButton->setText(profileLabel); return; } } diff --git a/application/MainWindow.h b/application/MainWindow.h index 506f7ee3..3ee03a7f 100644 --- a/application/MainWindow.h +++ b/application/MainWindow.h @@ -176,16 +176,16 @@ private: std::unique_ptr ui; // these are managed by Qt's memory management model! - GroupView *view; - InstanceProxyModel *proxymodel; - LabeledToolButton *renameButton; - QToolButton *changeIconButton; - QToolButton *newsLabel; - QLabel *m_statusLeft; - ServerStatus *m_statusRight; - QMenu *accountMenu; - QToolButton *accountMenuButton; - QAction *manageAccountsAction; + GroupView *view = nullptr; + InstanceProxyModel *proxymodel = nullptr; + LabeledToolButton *renameButton = nullptr; + QToolButton *changeIconButton = nullptr; + QToolButton *newsLabel = nullptr; + QLabel *m_statusLeft = nullptr; + ServerStatus *m_statusRight = nullptr; + QMenu *accountMenu = nullptr; + QToolButton *accountMenuButton = nullptr; + QAction *manageAccountsAction = nullptr; unique_qobject_ptr skin_download_job; unique_qobject_ptr m_newsChecker; @@ -195,5 +195,5 @@ private: QString m_currentInstIcon; // managed by the application object - Task *m_versionLoadTask; + Task *m_versionLoadTask = nullptr; };