X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=53548bfedcce659ae9bbc46789bd6b83d3695981;hb=55362eeaa19678bd8ba36ecce134d98cc0d7eccd;hp=5f15fa552090d3b6786d43f789f6c2ab0b96a94e;hpb=e4491717487ddbff71b9b5a59d7b4cba3eb67629;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 5f15fa55..53548bfe 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -27,12 +27,6 @@
 #  include <QMainWindow>
 #endif
 
-#ifdef Q_WS_WIN
-#  include <windows.h>
-#endif
-
-#include <QSystemTrayIcon>
-
 #include "qtui.h"
 #include "titlesetter.h"
 #include "uisettings.h"
@@ -50,6 +44,8 @@ class InputWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
 class SystemTray;
+class ChatMonitorView;
+class TopicWidget;
 
 class QMenu;
 class QLabel;
@@ -75,9 +71,8 @@ class MainWin
     void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
-    BufferWidget *bufferWidget() const { return _bufferWidget; }
-
-    inline SystemTray *systemTray() const;
+    inline BufferWidget *bufferWidget() const { return _bufferWidget; }
+    inline SystemTray *systemTray() const { return _systemTray; }
 
     bool event(QEvent *event);
 
@@ -90,24 +85,17 @@ class MainWin
   public slots:
     void showStatusBarMessage(const QString &message);
 
-    void toggleMinimizedToTray();
-
-    //! 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);
 
   protected slots:
     void connectedToCore();
     void setConnectedState();
-    void updateLagIndicator(int lag = -1);
     void disconnectedFromCore();
     void setDisconnectedState();
 
@@ -120,6 +108,7 @@ class MainWin
     void showAboutDlg();
     void showChannelList(NetworkId netId = NetworkId());
     void showCoreConnectionDlg();
+    void showCoreConfigWizard(const QVariantList &);
     void showCoreInfoDlg();
     void showAwayLog();
     void showSettingsDlg();
@@ -128,7 +117,7 @@ class MainWin
 #ifdef HAVE_KDE
     void showShortcutsDlg();
 #endif
-    void startInternalCore();
+    void handleCoreConnectionError(const QString &errorMsg);
     void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage);
     void handleNoSslInClient(bool *accepted);
     void handleNoSslInCore(bool *accepted);
@@ -168,10 +157,9 @@ class MainWin
     KHelpMenu *_kHelpMenu;
 #endif
 
-    QLabel *coreLagLabel;
-    QLabel *sslLabel;
     MsgProcessorStatusWidget *_msgProcessorStatusWidget;
     CoreConnectionStatusWidget *_coreConnectionStatusWidget;
+    SystemTray *_systemTray;
 
     TitleSetter _titleSetter;
 
@@ -191,14 +179,12 @@ class MainWin
     void updateIcon();
     void enableMenus();
 
-    void hideToTray();
-
-    SystemTray *_systemTray;
-
     QList<BufferViewDock *> _bufferViews;
     BufferWidget *_bufferWidget;
     NickListWidget *_nickListWidget;
     InputWidget *_inputWidget;
+    ChatMonitorView *_chatMonitorView;
+    TopicWidget *_topicWidget;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
     QMenu *_toolbarMenu;
@@ -211,17 +197,9 @@ 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;
 
     friend class QtUi;
 };
 
-SystemTray *MainWin::systemTray() const {
-  return _systemTray;
-}
-
 #endif