Revert "Work around MOC ignoring -D options by having dummy stubs"

[quassel.git] / src / qtui / mainwin.h

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 453062f..b2ea75a 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -29,7 +29,6 @@
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-
 class ServerListDlg;
 class ChannelListDlg;
 class CoreConnectDlg;
@@ -41,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 {
@@ -55,6 +57,10 @@ class MainWin : public QMainWindow {
 
     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();
@@ -77,10 +84,11 @@ class MainWin : public QMainWindow {
     void removeBufferView(int bufferViewConfigId);
     void receiveMessage(const Message &msg);
     void showChannelList(NetworkId netId = NetworkId());
+    void showCoreInfoDlg();
     void showSettingsDlg();
-    void showNetworkDlg();
-    void showManageViewsDlg();
-    void lockVerticalDocks(bool lock);
+    void on_actionEditNetworks_triggered();
+    void on_actionManageViews_triggered();
+    void on_actionLockDockPositions_toggled(bool lock);
     void showAboutDlg();
     void showDebugConsole();
 
@@ -98,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();
@@ -109,6 +122,7 @@ class MainWin : public QMainWindow {
     QtUi *gui;
 
     QMenu *systrayMenu;
+    QLabel *coreLagLabel;
     QLabel *sslLabel;
 
     TitleSetter _titleSetter;
@@ -149,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;
 };