X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=080e78f5c43000148318a20228903c98c42267ff;hp=0abcf56ce4f04f1e2206185ac177c800b61335a3;hb=94be5fb31afd8f3befa8cb2cf1b3c2e5ef3cdba5;hpb=cd3dc8132fa88bd81e8aa2c9947d3540e1f56f37

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 0abcf56c..080e78f5 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -29,32 +29,33 @@
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-
-class ServerListDlg;
-class ChannelListDlg;
-class CoreConnectDlg;
 class Buffer;
 class BufferViewConfig;
-class SettingsDlg;
+class MsgProcessorStatusWidget;
 class QtUi;
 class Message;
 class NickListWidget;
-class DebugConsole;
 
+#ifdef HAVE_DBUS
+#  include "desktopnotifications.h"
+#endif
 
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
   Q_OBJECT
 
   public:
-    MainWin(QtUi *gui, QWidget *parent = 0);
+    MainWin(QWidget *parent = 0);
     virtual ~MainWin();
 
     void init();
     void addBufferView(BufferViewConfig *config = 0);
 
     void displayTrayIconMessage(const QString &title, const QString &message);
+
+#ifdef HAVE_DBUS
     void sendDesktopNotification(const QString &title, const QString &message);
+#endif
 
     virtual bool event(QEvent *event);
 
@@ -77,7 +78,7 @@ class MainWin : public QMainWindow {
   private slots:
     void addBufferView(int bufferViewConfigId);
     void removeBufferView(int bufferViewConfigId);
-    void receiveMessage(const Message &msg);
+    void messagesInserted(const QModelIndex &parent, int start, int end);
     void showChannelList(NetworkId netId = NetworkId());
     void showCoreInfoDlg();
     void showSettingsDlg();
@@ -85,23 +86,26 @@ class MainWin : public QMainWindow {
     void on_actionManageViews_triggered();
     void on_actionLockDockPositions_toggled(bool lock);
     void showAboutDlg();
-    void showDebugConsole();
+    void on_actionDebugNetworkModel_triggered(bool);
 
     void showCoreConnectionDlg(bool autoConnect = false);
-    void coreConnectionDlgFinished(int result);
 
     void clientNetworkCreated(NetworkId);
     void clientNetworkRemoved(NetworkId);
     void clientNetworkUpdated();
     void connectOrDisconnectFromNet();
 
-    void changeTopic(const QString &topic);
     void makeTrayIconBlink();
     void saveStatusBarStatus(bool enabled);
 
     void loadLayout();
     void saveLayout();
 
+#ifdef HAVE_DBUS
+    void desktopNotificationClosed(uint id, uint reason);
+    void desktopNotificationInvoked(uint id, const QString & action);
+#endif
+
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
@@ -109,11 +113,11 @@ class MainWin : public QMainWindow {
 
   private:
     Ui::MainWin ui;
-    QtUi *gui;
 
     QMenu *systrayMenu;
     QLabel *coreLagLabel;
     QLabel *sslLabel;
+    MsgProcessorStatusWidget *msgProcessorStatusWidget;
 
     TitleSetter _titleSetter;
 
@@ -126,8 +130,6 @@ class MainWin : public QMainWindow {
     void setupStatusBar();
     void setupSystray();
 
-    void setupSettingsDlg();
-
     void toggleVisibility();
 
     void enableMenus();
@@ -139,17 +141,17 @@ class MainWin : public QMainWindow {
     bool trayIconActive;
     QTimer *timer;
 
-    CoreConnectDlg *coreConnectDlg;
-    ChannelListDlg *channelListDlg;
-    SettingsDlg *settingsDlg;
-    DebugConsole *debugConsole;
-
     BufferId currentBuffer;
     QString currentProfile;
 
     QList<QDockWidget *> _netViews;
     NickListWidget *nickListWidget;
 
+#ifdef HAVE_DBUS
+    org::freedesktop::Notifications *desktopNotifications;
+    quint32 notificationId;
+#endif
+
     friend class QtUi;
 };