diff options
| author | Sky <git@bunnies.cc> | 2013-10-21 18:24:29 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-21 18:24:29 +0100 |
| commit | aaf6fe894406ab8aa814de83692504493060e303 (patch) | |
| tree | a7ac3a60534322f70cbdc34111228885e0606691 /gui/consolewindow.h | |
| parent | 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 (diff) | |
| parent | 11813a0621dd7b500c2d7966a2671c0ab93be692 (diff) | |
| download | MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar.gz MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar.lz MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar.xz MultiMC-aaf6fe894406ab8aa814de83692504493060e303.zip | |
Merge branch 'develop'
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; }; |