X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=9807550c2d7daff5b1c776b3c617742241ccab5a;hp=5f15fa552090d3b6786d43f789f6c2ab0b96a94e;hb=3efffa2c3f687b21c8040e9a7ee3830e8f539abf;hpb=e4491717487ddbff71b9b5a59d7b4cba3eb67629

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 5f15fa55..9807550c 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -31,8 +31,6 @@
 #  include <windows.h>
 #endif
 
-#include <QSystemTrayIcon>
-
 #include "qtui.h"
 #include "titlesetter.h"
 #include "uisettings.h"
@@ -50,6 +48,7 @@ class InputWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
 class SystemTray;
+class ChatMonitorView;
 
 class QMenu;
 class QLabel;
@@ -75,9 +74,11 @@ class MainWin
     void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
-    BufferWidget *bufferWidget() const { return _bufferWidget; }
+    inline BufferWidget *bufferWidget() const { return _bufferWidget; }
 
-    inline SystemTray *systemTray() const;
+#ifndef QT_NO_SYSTEMTRAYICON
+    inline SystemTray *systemTray() const { return _systemTray; }
+#endif
 
     bool event(QEvent *event);
 
@@ -90,7 +91,9 @@ 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();
@@ -107,7 +110,6 @@ class MainWin
   protected slots:
     void connectedToCore();
     void setConnectedState();
-    void updateLagIndicator(int lag = -1);
     void disconnectedFromCore();
     void setDisconnectedState();
 
@@ -120,6 +122,7 @@ class MainWin
     void showAboutDlg();
     void showChannelList(NetworkId netId = NetworkId());
     void showCoreConnectionDlg();
+    void showCoreConfigWizard(const QVariantList &);
     void showCoreInfoDlg();
     void showAwayLog();
     void showSettingsDlg();
@@ -128,7 +131,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,8 +171,6 @@ class MainWin
     KHelpMenu *_kHelpMenu;
 #endif
 
-    QLabel *coreLagLabel;
-    QLabel *sslLabel;
     MsgProcessorStatusWidget *_msgProcessorStatusWidget;
     CoreConnectionStatusWidget *_coreConnectionStatusWidget;
 
@@ -191,14 +192,16 @@ 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;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
     QMenu *_toolbarMenu;
@@ -220,8 +223,4 @@ class MainWin
     friend class QtUi;
 };
 
-SystemTray *MainWin::systemTray() const {
-  return _systemTray;
-}
-
 #endif