diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-11-28 21:28:32 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-11-28 21:28:32 +0100 |
commit | 61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52 (patch) | |
tree | f57e44d507ba26cd699bf26bfc0eced26ac5e380 /gui/MainWindow.h | |
parent | fec8c054c3967d9ed4bbf288b9c4993b8aaeac1d (diff) | |
parent | 191e850cf14666302c3338d69073d1f417925a45 (diff) | |
download | MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar.gz MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar.lz MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.tar.xz MultiMC-61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52.zip |
Merge https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'gui/MainWindow.h')
-rw-r--r-- | gui/MainWindow.h | 8 |
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; }; |