X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=b2ea75a4b9581c8778884db348d3737aed8632aa;hp=96e0c7154d61a2d033c33a9d75c049d56735501f;hb=c00b7e45809b6f3d6d02abbc1285728fe01af374;hpb=08c978e60cf143eeda3eff9fd81cda434b92578b

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 96e0c715..b2ea75a4 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -29,8 +29,8 @@
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-
 class ServerListDlg;
+class ChannelListDlg;
 class CoreConnectDlg;
 class Buffer;
 class BufferViewConfig;
@@ -40,6 +40,9 @@ 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 {
@@ -52,9 +55,12 @@ class MainWin : public QMainWindow {
     void init();
     void addBufferView(BufferViewConfig *config = 0);
 
-    AbstractUiMsg *layoutMsg(const Message &);
     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);
 
   public slots:
@@ -67,6 +73,7 @@ class MainWin : public QMainWindow {
   protected slots:
     void connectedToCore();
     void setConnectedState();
+    void updateLagIndicator(int lag);
     void securedConnection();
     void disconnectedFromCore();
     void setDisconnectedState();
@@ -76,9 +83,12 @@ class MainWin : public QMainWindow {
     void addBufferView(int bufferViewConfigId);
     void removeBufferView(int bufferViewConfigId);
     void receiveMessage(const Message &msg);
+    void showChannelList(NetworkId netId = NetworkId());
+    void showCoreInfoDlg();
     void showSettingsDlg();
-    void showNetworkDlg();
-    void showManageViewsDlg();
+    void on_actionEditNetworks_triggered();
+    void on_actionManageViews_triggered();
+    void on_actionLockDockPositions_toggled(bool lock);
     void showAboutDlg();
     void showDebugConsole();
 
@@ -96,7 +106,12 @@ class MainWin : public QMainWindow {
 
     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();
@@ -107,6 +122,7 @@ class MainWin : public QMainWindow {
     QtUi *gui;
 
     QMenu *systrayMenu;
+    QLabel *coreLagLabel;
     QLabel *sslLabel;
 
     TitleSetter _titleSetter;
@@ -134,6 +150,7 @@ class MainWin : public QMainWindow {
     QTimer *timer;
 
     CoreConnectDlg *coreConnectDlg;
+    ChannelListDlg *channelListDlg;
     SettingsDlg *settingsDlg;
     DebugConsole *debugConsole;
 
@@ -146,6 +163,11 @@ class MainWin : public QMainWindow {
     QAction *actionEditNetworks;
     QList<QAction *> networkActions;
 
+#ifdef HAVE_DBUS
+    org::freedesktop::Notifications *desktopNotifications;
+    quint32 notificationId;
+#endif
+
     friend class QtUi;
 };