X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=86c8de0199c5a107b4b39cd467d8344a062b55aa;hp=76bf35ebc06de3ba55bf5a1b43bbc8fdb7c8aeb0;hb=11f042e025f1e8e304c3de2cb7d3b55de39d9ed6;hpb=71ef3ec0c4c4d02431aa560ed83b379c416798c5

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 76bf35eb..86c8de01 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -27,11 +27,15 @@
 #  include <QMainWindow>
 #endif
 
+#ifdef Q_WS_WIN
+#  include <windows.h>
+#endif
+
 #include <QSystemTrayIcon>
 
 #include "qtui.h"
-#include "sessionsettings.h"
 #include "titlesetter.h"
+#include "uisettings.h"
 
 class ActionCollection;
 class BufferView;
@@ -70,7 +74,7 @@ class MainWin
 
     inline SystemTray *systemTray() const;
 
-    virtual bool event(QEvent *event);
+    bool event(QEvent *event);
 
     static void flagRemoteCoreOnly(QObject *object) { object->setProperty("REMOTE_CORE_ONLY", true); }
     static bool isRemoteCoreOnly(QObject *object) { return object->property("REMOTE_CORE_ONLY").toBool(); }
@@ -80,9 +84,14 @@ class MainWin
     void saveStateToSessionSettings(SessionSettings &s);
     void showStatusBarMessage(const QString &message);
 
+    void toggleMinimizedToTray();
+
+    //! Bring window to front and focus it
+    void forceActivated();
+
   protected:
     void closeEvent(QCloseEvent *event);
-    virtual void changeEvent(QEvent *event);
+    void changeEvent(QEvent *event);
 
   protected slots:
     void connectedToCore();
@@ -90,7 +99,6 @@ class MainWin
     void updateLagIndicator(int lag = -1);
     void disconnectedFromCore();
     void setDisconnectedState();
-    void systrayActivated(QSystemTrayIcon::ActivationReason);
 
   private slots:
     void addBufferView(int bufferViewConfigId);
@@ -156,10 +164,10 @@ class MainWin
     void setupToolBars();
 
     void updateIcon();
-    void hideToTray();
-    void toggleMinimizedToTray();
     void enableMenus();
 
+    void hideToTray();
+
     SystemTray *_systemTray;
 
     QList<BufferViewDock *> _bufferViews;
@@ -173,6 +181,10 @@ class MainWin
 
     QWidget *_awayLog;
     friend class QtUi;
+
+#ifdef Q_WS_WIN
+    DWORD dwTickCount;
+#endif
 };
 
 SystemTray *MainWin::systemTray() const {