diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-08 16:21:49 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-08 16:21:49 +0200 |
| commit | 499ee1e36569fca73bdb809183242b03da69f3ef (patch) | |
| tree | 8d29f00958da54ade7e560b98e43fae89dfff0d4 /gui/consolewindow.h | |
| parent | 7e1cf22ce61e8a5450e5dc74993e471c20b2742f (diff) | |
| parent | dab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9 (diff) | |
| download | PrismLauncher-499ee1e36569fca73bdb809183242b03da69f3ef.tar.gz PrismLauncher-499ee1e36569fca73bdb809183242b03da69f3ef.tar.bz2 PrismLauncher-499ee1e36569fca73bdb809183242b03da69f3ef.zip | |
Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop
Conflicts:
AppSettings.cpp
MultiMC.pro
main.cpp
Diffstat (limited to 'gui/consolewindow.h')
| -rw-r--r-- | gui/consolewindow.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gui/consolewindow.h b/gui/consolewindow.h index 60bec69f..6a6c9e50 100644 --- a/gui/consolewindow.h +++ b/gui/consolewindow.h @@ -13,7 +13,7 @@ class ConsoleWindow : public QDialog Q_OBJECT public: - explicit ConsoleWindow(QWidget *parent = 0); + explicit ConsoleWindow(MinecraftProcess *proc, QWidget *parent = 0); ~ConsoleWindow(); /** @@ -48,12 +48,15 @@ public slots: private slots: void on_closeButton_clicked(); + void on_btnKillMinecraft_clicked(); + void onEnded(); protected: void closeEvent(QCloseEvent *); private: Ui::ConsoleWindow *ui; + MinecraftProcess *proc; bool m_mayclose; }; |