External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-23 20:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Sebastian-byte
2021-11-11 15:26:27 -05:00
parent 353669dc8a 25fbeb265a
commit ff5e98ff7d
17 changed files with 965 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
launcher/MainWindow.cpp
View File

@@ -1029,7 +1029,6 @@ void MainWindow::repopulateAccountsMenu()
QString active_profileId = "";
if (active_account != nullptr)
{
active_profileId = active_account->profileId();
// this can be called before accountMenuButton exists
if (accountMenuButton)
{
@@ -1052,14 +1051,20 @@ void MainWindow::repopulateAccountsMenu()
MinecraftAccountPtr account = accounts->at(i);
auto profileLabel = getProfileDisplay(account);
QAction *action = new QAction(profileLabel, this);
action->setData(account->profileId());
action->setData(i);
action->setCheckable(true);
if (active_profileId == account->profileId())
if (active_account == account)
{
action->setChecked(true);
}
action->setIcon(account->getFace());
auto face = account->getFace();
if(!face.isNull()) {
action->setIcon(face);
}
else {
action->setIcon(LAUNCHER->getThemedIcon("noaccount"));
}
accountMenu->addAction(action);
connect(action, SIGNAL(triggered(bool)), SLOT(changeActiveAccount()));
}
@@ -1070,8 +1075,8 @@ void MainWindow::repopulateAccountsMenu()
QAction *action = new QAction(tr("No Default Account"), this);
action->setCheckable(true);
action->setIcon(LAUNCHER->getThemedIcon("noaccount"));
action->setData("");
if (active_profileId.isEmpty()) {
action->setData(-1);
if (active_account == nullptr) {
action->setChecked(true);
}
@@ -1097,20 +1102,19 @@ void MainWindow::updatesAllowedChanged(bool allowed)
void MainWindow::changeActiveAccount()
{
QAction *sAction = (QAction *)sender();
// Profile's associated Mojang username
// Will need to change when profiles are properly implemented
if (sAction->data().type() != QVariant::Type::String)
if (sAction->data().type() != QVariant::Type::Int)
return;
QVariant data = sAction->data();
QString id = "";
if (!data.isNull())
{
id = data.toString();
bool valid = false;
int index = data.toInt(&valid);
if(!valid) {
index = -1;
}
LAUNCHER->accounts()->setActiveAccount(id);
std::shared_ptr<AccountList> accounts = LAUNCHER->accounts();
accounts->setActiveAccount(index == -1 ? nullptr : accounts->at(index));
activeAccountChanged();
}
@@ -1125,7 +1129,13 @@ void MainWindow::activeAccountChanged()
{
auto profileLabel = getProfileDisplay(account);
accountMenuButton->setText(profileLabel);
accountMenuButton->setIcon(account->getFace());
auto face = account->getFace();
if(face.isNull()) {
accountMenuButton->setIcon(LAUNCHER->getThemedIcon("noaccount"));
}
else {
accountMenuButton->setIcon(face);
}
return;
}