diff --git a/graphics.qrc b/graphics.qrc
index fe8892fe..68d3beed 100644
--- a/graphics.qrc
+++ b/graphics.qrc
@@ -1,50 +1,51 @@
-
- resources/icons/toolbar/about.png
- resources/icons/toolbar/ReportBug.png
- resources/icons/toolbar/centralmods.png
- resources/icons/toolbar/checkupdate.png
- resources/icons/toolbar/help.png
- resources/icons/toolbar/new.png
- resources/icons/toolbar/InstCopy.png
- resources/icons/toolbar/NewsIcon.png
- resources/icons/toolbar/refresh.png
- resources/icons/toolbar/settings.png
- resources/icons/toolbar/viewfolder.png
- resources/icons/toolbar/Cat.png
-
-
- resources/icons/instances/brick.png
- resources/icons/instances/chicken128.png
- resources/icons/instances/creeper128.png
- resources/icons/instances/derp.png
- resources/icons/instances/diamond.png
- resources/icons/instances/dirt.png
- resources/icons/instances/enderman.png
- resources/icons/instances/enderpearl128.png
- resources/icons/instances/ftb_glow128.png
- resources/icons/instances/ftb_logo128.png
- resources/icons/instances/gear128.png
- resources/icons/instances/gold.png
- resources/icons/instances/grass.png
- resources/icons/instances/herobrine128.png
- resources/icons/instances/infinity128.png
- resources/icons/instances/iron.png
- resources/icons/instances/magitech128.png
- resources/icons/instances/meat128.png
- resources/icons/instances/netherstar128.png
- resources/icons/instances/planks.png
- resources/icons/instances/skeleton128.png
- resources/icons/instances/squarecreeper128.png
- resources/icons/instances/steve128.png
- resources/icons/instances/stone.png
- resources/icons/instances/tnt.png
-
-
- resources/icons/multimc.svg
- resources/XdgIcon.theme
-
-
- resources/catbgrnd2.png
-
+
+ resources/icons/toolbar/about.png
+ resources/icons/toolbar/ReportBug.png
+ resources/icons/toolbar/centralmods.png
+ resources/icons/toolbar/checkupdate.png
+ resources/icons/toolbar/help.png
+ resources/icons/toolbar/new.png
+ resources/icons/toolbar/InstCopy.png
+ resources/icons/toolbar/NewsIcon.png
+ resources/icons/toolbar/refresh.png
+ resources/icons/toolbar/settings.png
+ resources/icons/toolbar/viewfolder.png
+ resources/icons/toolbar/Cat.png
+ resources/icons/toolbar/NoAccount.png
+
+
+ resources/icons/instances/brick.png
+ resources/icons/instances/chicken128.png
+ resources/icons/instances/creeper128.png
+ resources/icons/instances/derp.png
+ resources/icons/instances/diamond.png
+ resources/icons/instances/dirt.png
+ resources/icons/instances/enderman.png
+ resources/icons/instances/enderpearl128.png
+ resources/icons/instances/ftb_glow128.png
+ resources/icons/instances/ftb_logo128.png
+ resources/icons/instances/gear128.png
+ resources/icons/instances/gold.png
+ resources/icons/instances/grass.png
+ resources/icons/instances/herobrine128.png
+ resources/icons/instances/infinity128.png
+ resources/icons/instances/iron.png
+ resources/icons/instances/magitech128.png
+ resources/icons/instances/meat128.png
+ resources/icons/instances/netherstar128.png
+ resources/icons/instances/planks.png
+ resources/icons/instances/skeleton128.png
+ resources/icons/instances/squarecreeper128.png
+ resources/icons/instances/steve128.png
+ resources/icons/instances/stone.png
+ resources/icons/instances/tnt.png
+
+
+ resources/icons/multimc.svg
+ resources/XdgIcon.theme
+
+
+ resources/catbgrnd2.png
+
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index f8904267..cb5584c7 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -168,13 +168,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
statusBar()->addPermanentWidget(m_statusRight, 0);
// Add "manage accounts" button, right align
-
QWidget* spacer = new QWidget();
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
ui->mainToolBar->addWidget(spacer);
accountMenu = new QMenu(this);
- manageAccountsAction = new QAction(tr("Manage accounts"), this);
+ manageAccountsAction = new QAction(tr("Manage Accounts"), this);
manageAccountsAction->setCheckable(false);
connect(manageAccountsAction, SIGNAL(triggered(bool)), this, SLOT(on_actionManageAccounts_triggered()));
@@ -186,12 +185,18 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
accountMenuButton->setPopupMode(QToolButton::InstantPopup);
accountMenuButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
accountMenuButton->setLayoutDirection(Qt::RightToLeft);
+ accountMenuButton->setIcon(QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
QWidgetAction *accountMenuButtonAction = new QWidgetAction(this);
accountMenuButtonAction->setDefaultWidget(accountMenuButton);
ui->mainToolBar->addAction(accountMenuButtonAction);
+ // Update the menu when the active account changes.
+ // Shouldn't have to use lambdas here like this, but if I don't, the compiler throws a fit. Template hell sucks...
+ connect(MMC->accounts().get(), &MojangAccountList::activeAccountChanged, [this] { activeAccountChanged(); });
+ connect(MMC->accounts().get(), &MojangAccountList::listChanged, [this] { repopulateAccountsMenu(); });
+
std::shared_ptr accounts = MMC->accounts();
// TODO: Nicer way to iterate?
@@ -258,12 +263,12 @@ void MainWindow::repopulateAccountsMenu()
MojangAccountPtr active_account = accounts->activeAccount();
QString active_username = "";
- if(active_account != nullptr)
+ if (active_account != nullptr)
{
active_username = accounts->activeAccount()->username();
}
- if(accounts->count() <= 0)
+ if (accounts->count() <= 0)
{
QAction *action = new QAction(tr("No accounts added!"), this);
action->setEnabled(false);
@@ -274,7 +279,7 @@ void MainWindow::repopulateAccountsMenu()
else
{
// TODO: Nicer way to iterate?
- for(int i = 0; i < accounts->count(); i++)
+ for (int i = 0; i < accounts->count(); i++)
{
MojangAccountPtr account = accounts->at(i);
@@ -283,7 +288,7 @@ void MainWindow::repopulateAccountsMenu()
section->setEnabled(false);
accountMenu->addAction(section);
- for(AccountProfile profile : account->profiles())
+ for (AccountProfile profile : account->profiles())
{
QAction *action = new QAction(profile.name(), this);
action->setData(account->username());
@@ -302,8 +307,9 @@ void MainWindow::repopulateAccountsMenu()
}
}
- QAction *action = new QAction(tr("No default"), this);
+ QAction *action = new QAction(tr("No Default Account"), this);
action->setCheckable(true);
+ action->setIcon(QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
action->setData("");
if(active_username.isEmpty())
{
@@ -324,12 +330,12 @@ 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) return;
+ // Will need to change when profiles are properly implemented
+ if (sAction->data().type() != QVariant::Type::String) return;
QVariant data = sAction->data();
QString id = "";
- if(!data.isNull())
+ if (!data.isNull())
{
id = data.toString();
}
@@ -345,17 +351,18 @@ void MainWindow::activeAccountChanged()
MojangAccountPtr account = MMC->accounts()->activeAccount();
- if(account != nullptr && account->username() != "")
+ if (account != nullptr && account->username() != "")
{
const AccountProfile *profile = account->currentProfile();
- if(profile != nullptr)
+ if (profile != nullptr)
{
accountMenuButton->setIcon(SkinUtils::getFaceFromCache(profile->name()));
return;
}
}
- accountMenuButton->setIcon(QIcon());
+ // Set the icon to the "no account" icon.
+ accountMenuButton->setIcon(QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
}
bool MainWindow::eventFilter(QObject *obj, QEvent *ev)
diff --git a/logic/lists/MojangAccountList.cpp b/logic/lists/MojangAccountList.cpp
index c6dce836..ec1937ad 100644
--- a/logic/lists/MojangAccountList.cpp
+++ b/logic/lists/MojangAccountList.cpp
@@ -106,7 +106,7 @@ void MojangAccountList::setActiveAccount(const QString& username)
}
}
endResetModel();
- onListChanged();
+ onActiveChanged();
}
@@ -116,8 +116,15 @@ void MojangAccountList::onListChanged()
// TODO: Alert the user if this fails.
saveList();
- // TODO: stop this getting called from setActiveAccount
- //emit listChanged();
+ emit listChanged();
+}
+
+void MojangAccountList::onActiveChanged()
+{
+ if (m_autosave)
+ saveList();
+
+ emit activeAccountChanged();
}
diff --git a/logic/lists/MojangAccountList.h b/logic/lists/MojangAccountList.h
index cfe96c11..908f5a7a 100644
--- a/logic/lists/MojangAccountList.h
+++ b/logic/lists/MojangAccountList.h
@@ -133,6 +133,11 @@ signals:
*/
void listChanged();
+ /*!
+ * Signal emitted to indicate that the active account has changed.
+ */
+ void activeAccountChanged();
+
protected:
/*!
* Called whenever the list changes.
@@ -140,6 +145,12 @@ protected:
*/
void onListChanged();
+ /*!
+ * Called whenever the active account changes.
+ * Emits the activeAccountChanged() signal and autosaves the list if enabled.
+ */
+ void onActiveChanged();
+
QList m_accounts;
/*!
diff --git a/resources/icons/toolbar/NoAccount.png b/resources/icons/toolbar/NoAccount.png
new file mode 100644
index 00000000..466e4c07
Binary files /dev/null and b/resources/icons/toolbar/NoAccount.png differ