ihateninjas/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher synced 2026-04-23 09:05:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Mark accounts with errors in dropdown (#5181)

Browse source
This commit is contained in:
DioEgizio 2026-03-15 12:02:40 +00:00 committed by GitHub
parent 14da23b06f fac0ad7493
commit 14ca5f15f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
launcher/minecraft/auth/MinecraftAccount.cpp
View file

@ -191,6 +191,14 @@ void MinecraftAccount::authFailed(QString reason)
emit activityChanged(false);
}
QString MinecraftAccount::displayName() const
{
if (const QList validStates{ AccountState::Unchecked, AccountState::Working, AccountState::Offline, AccountState::Online }; !validStates.contains(accountState())) {
return QString("⚠ %1").arg(profileName());
}
return profileName();
}
bool MinecraftAccount::isActive() const
{
return !m_currentTask.isNull();

2
launcher/minecraft/auth/MinecraftAccount.h
View file

@ -110,6 +110,8 @@ class MinecraftAccount : public QObject, public Usable {
QString profileName() const { return data.profileName(); }
QString displayName() const;
bool isActive() const;
AccountType accountType() const noexcept { return data.type; }

8
launcher/ui/MainWindow.cpp
View file

@ -458,7 +458,7 @@ void MainWindow::retranslateUi()
MinecraftAccountPtr defaultAccount = APPLICATION->accounts()->defaultAccount();
if (defaultAccount) {
auto profileLabel = profileInUseFilter(defaultAccount->profileName(), defaultAccount->isInUse());
auto profileLabel = profileInUseFilter(defaultAccount->displayName(), defaultAccount->isInUse());
ui->actionAccountsButton->setText(profileLabel);
}
@ -658,7 +658,7 @@ void MainWindow::repopulateAccountsMenu()
if (defaultAccount) {
// this can be called before accountMenuButton exists
if (ui->actionAccountsButton) {
auto profileLabel = profileInUseFilter(defaultAccount->profileName(), defaultAccount->isInUse());
auto profileLabel = profileInUseFilter(defaultAccount->displayName(), defaultAccount->isInUse());
ui->actionAccountsButton->setText(profileLabel);
}
}
@ -672,7 +672,7 @@ void MainWindow::repopulateAccountsMenu()
// TODO: Nicer way to iterate?
for (int i = 0; i < accounts->count(); i++) {
MinecraftAccountPtr account = accounts->at(i);
auto profileLabel = profileInUseFilter(account->profileName(), account->isInUse());
auto profileLabel = profileInUseFilter(account->displayName(), account->isInUse());
QAction* action = new QAction(profileLabel, this);
action->setData(i);
action->setCheckable(true);
@ -752,7 +752,7 @@ void MainWindow::defaultAccountChanged()
// FIXME: this needs adjustment for MSA
if (account && account->profileName() != "") {
auto profileLabel = profileInUseFilter(account->profileName(), account->isInUse());
auto profileLabel = profileInUseFilter(account->displayName(), account->isInUse());
ui->actionAccountsButton->setText(profileLabel);
auto face = account->getFace();
if (face.isNull()) {