diff options
| author | Forkk <forkk@forkk.net> | 2014-01-08 21:45:13 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-08 21:45:13 -0600 |
| commit | 06b5fa5dccdfc54496cd79e6eba6d025bc6e1204 (patch) | |
| tree | 83d2f49d9e694bdd8f8d2cdd3879e696f435ba10 /gui/ConsoleWindow.h | |
| parent | 51817962aa64bc5c084e33fb29a21261d19bc8f3 (diff) | |
| parent | b767d4b134148ddb3f956253a2f7f2cad831e782 (diff) | |
| download | MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.gz MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.lz MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.xz MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.zip | |
Merge branch 'release-0.1'0.1
Release MultiMC version 0.1.
Diffstat (limited to 'gui/ConsoleWindow.h')
| -rw-r--r-- | gui/ConsoleWindow.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/ConsoleWindow.h b/gui/ConsoleWindow.h index 731c616c..9291320e 100644 --- a/gui/ConsoleWindow.h +++ b/gui/ConsoleWindow.h @@ -16,6 +16,7 @@ #pragma once #include <QMainWindow> +#include <QSystemTrayIcon> #include "logic/MinecraftProcess.h" namespace Ui @@ -77,7 +78,8 @@ slots: // failures) void on_btnPaste_clicked(); - + void iconActivated(QSystemTrayIcon::ActivationReason); + void toggleConsole(); protected: void closeEvent(QCloseEvent *); @@ -87,4 +89,6 @@ private: bool m_mayclose = true; int m_last_scroll_value = 0; bool m_scroll_active = true; + QSystemTrayIcon *m_trayIcon = nullptr; + int m_saved_offset = 0; }; |