diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-02-06 07:09:32 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-02-06 07:09:32 +0100 |
commit | 18b087e99280d2c8d5a6115a178f9e6f03606656 (patch) | |
tree | fbf58928dabbae4540de3d7725f9ac70274fa586 /gui/mainwindow.h | |
parent | 4e9006769e3554524096d45f8a1ce16ccfa78bfc (diff) | |
parent | e475f5d51251ae57da0480bbadc9cb32a8bc72b2 (diff) | |
download | MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.gz MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.lz MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.xz MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.zip |
Merge https://github.com/Forkk/MultiMC5
Conflicts:
gui/mainwindow.ui
Diffstat (limited to 'gui/mainwindow.h')
-rw-r--r-- | gui/mainwindow.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 77245531..28ca341a 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -18,7 +18,8 @@ #include <QMainWindow> -#include "../data/instancemodel.h" +#include "data/instancemodel.h" +#include "data/loginresponse.h" namespace Ui { @@ -33,6 +34,8 @@ public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); + void closeEvent(QCloseEvent *event); + private slots: void on_actionAbout_triggered(); @@ -52,6 +55,18 @@ private slots: void on_actionNews_triggered(); + void on_mainToolBar_visibilityChanged(bool); + + void on_instanceView_customContextMenuRequested(const QPoint &pos); + + void on_actionLaunchInstance_triggered(); + + + void doLogin(const QString& errorMsg = ""); + + + void onLoginComplete(LoginResponse response); + private: Ui::MainWindow *ui; |