X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=02b7ff58e0bbc9133984b50a940791499b624509;hp=4f3f750dbad39dd18ffb18740d896f150059fd9d;hb=b1d9c3ea56467245c910ac1de1252c2a91c234f0;hpb=d76bb125c8dd275095409edd3426700a98d89f3a

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 4f3f750d..02b7ff58 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -27,10 +27,6 @@
 #  include <QMainWindow>
 #endif
 
-#ifdef Q_WS_WIN
-#  include <windows.h>
-#endif
-
 #include "qtui.h"
 #include "titlesetter.h"
 #include "uisettings.h"
@@ -48,6 +44,8 @@ class InputWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
 class SystemTray;
+class ChatMonitorView;
+class TopicWidget;
 
 class QMenu;
 class QLabel;
@@ -74,10 +72,7 @@ class MainWin
     BufferView *allBuffersView() const;
 
     inline BufferWidget *bufferWidget() const { return _bufferWidget; }
-
-#ifndef QT_NO_SYSTEMTRAYICON
     inline SystemTray *systemTray() const { return _systemTray; }
-#endif
 
     bool event(QEvent *event);
 
@@ -90,19 +85,11 @@ class MainWin
   public slots:
     void showStatusBarMessage(const QString &message);
 
-#ifndef QT_NO_SYSTEMTRAYICON
-    void toggleMinimizedToTray();
-#endif
-
-    //! Bring window to front and focus it
-    void forceActivated();
-
     //! Quit application
     void quit();
 
   protected:
     void closeEvent(QCloseEvent *event);
-    void changeEvent(QEvent *event);
     void moveEvent(QMoveEvent *event);
     void resizeEvent(QResizeEvent *event);
 
@@ -127,9 +114,8 @@ class MainWin
     void showSettingsDlg();
     void showNotificationsDlg();
     void showIgnoreList(QString newRule = QString());
-#ifdef HAVE_KDE
     void showShortcutsDlg();
-#endif
+
     void handleCoreConnectionError(const QString &errorMsg);
     void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage);
     void handleNoSslInClient(bool *accepted);
@@ -148,6 +134,9 @@ class MainWin
     void on_actionDebugHotList_triggered();
     void on_actionDebugLog_triggered();
 
+    void bindJumpKey();
+    void onJumpKey();
+
     void clientNetworkCreated(NetworkId);
     void clientNetworkRemoved(NetworkId);
     void clientNetworkUpdated();
@@ -172,6 +161,7 @@ class MainWin
 
     MsgProcessorStatusWidget *_msgProcessorStatusWidget;
     CoreConnectionStatusWidget *_coreConnectionStatusWidget;
+    SystemTray *_systemTray;
 
     TitleSetter _titleSetter;
 
@@ -191,15 +181,12 @@ class MainWin
     void updateIcon();
     void enableMenus();
 
-#ifndef QT_NO_SYSTEMTRAYICON
-    void hideToTray();
-    SystemTray *_systemTray;
-#endif
-
     QList<BufferViewDock *> _bufferViews;
     BufferWidget *_bufferWidget;
     NickListWidget *_nickListWidget;
     InputWidget *_inputWidget;
+    ChatMonitorView *_chatMonitorView;
+    TopicWidget *_topicWidget;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
     QMenu *_toolbarMenu;
@@ -212,11 +199,8 @@ class MainWin
     QSize _normalSize; //!< Size of the non-maximized window
     QPoint _normalPos; //!< Position of the non-maximized window
 
-#ifdef Q_WS_WIN
-    DWORD dwTickCount;
-#endif
-
     BufferHotListFilter *_bufferHotList;
+    QHash<int, BufferId> _jumpKeyMap;
 
     friend class QtUi;
 };