aboutsummaryrefslogtreecommitdiff
path: root/gui/MainWindow.h
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-28 14:50:12 -0600
committerAndrew <forkk@forkk.net>2013-11-28 14:50:12 -0600
commita914e8bd2465302067dad949747d0557b3fcd0ae (patch)
treef57e44d507ba26cd699bf26bfc0eced26ac5e380 /gui/MainWindow.h
parentfec8c054c3967d9ed4bbf288b9c4993b8aaeac1d (diff)
parent191e850cf14666302c3338d69073d1f417925a45 (diff)
downloadPrismLauncher-a914e8bd2465302067dad949747d0557b3fcd0ae.tar.gz
PrismLauncher-a914e8bd2465302067dad949747d0557b3fcd0ae.tar.bz2
PrismLauncher-a914e8bd2465302067dad949747d0557b3fcd0ae.zip
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into feature_yggdrasil
Diffstat (limited to 'gui/MainWindow.h')
-rw-r--r--gui/MainWindow.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 4e20d7cb..4191e590 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -148,6 +148,10 @@ slots:
void activeAccountChanged();
+ void changeActiveAccount();
+
+ void repopulateAccountsMenu();
+
protected:
bool eventFilter(QObject *obj, QEvent *ev);
void setCatBackground(bool enabled);
@@ -170,5 +174,7 @@ private:
QLabel *m_statusLeft;
QLabel *m_statusRight;
- QToolButton *actionManageAccounts;
+ QMenu *accountMenu;
+ QToolButton *accountMenuButton;
+ QAction *manageAccountsAction;
};