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 0190345..b2ea75a 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -24,11 +24,13 @@
 #include "ui_mainwin.h"
 
 #include "qtui.h"
+#include "titlesetter.h"
 
 #include <QSystemTrayIcon>
 #include <QTimer>
 
 class ServerListDlg;
+class ChannelListDlg;
 class CoreConnectDlg;
 class Buffer;
 class BufferViewConfig;
@@ -38,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 {
@@ -50,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:
@@ -64,17 +72,23 @@ class MainWin : public QMainWindow {
 
   protected slots:
     void connectedToCore();
+    void setConnectedState();
+    void updateLagIndicator(int lag);
     void securedConnection();
     void disconnectedFromCore();
+    void setDisconnectedState();
     void systrayActivated( QSystemTrayIcon::ActivationReason );
 
   private slots:
     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();
 
@@ -91,7 +105,13 @@ class MainWin : public QMainWindow {
     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();
@@ -102,8 +122,11 @@ class MainWin : public QMainWindow {
     QtUi *gui;
 
     QMenu *systrayMenu;
+    QLabel *coreLagLabel;
     QLabel *sslLabel;
 
+    TitleSetter _titleSetter;
+
     void setupMenus();
     void setupViews();
     void setupNickWidget();
@@ -127,6 +150,7 @@ class MainWin : public QMainWindow {
     QTimer *timer;
 
     CoreConnectDlg *coreConnectDlg;
+    ChannelListDlg *channelListDlg;
     SettingsDlg *settingsDlg;
     DebugConsole *debugConsole;
 
@@ -139,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;
 };