X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=8cffe8bd2678b1453d9a1bddffd4b3126249b5bc;hp=231ffc0a079432725abb263956719ab20e61ed91;hb=31253a98ef87edb8f87ff53270529ed4f7659612;hpb=257ca0d5f944a8f63d002e1dcaaa3902258d85e0 diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 231ffc0a..8cffe8bd 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -29,18 +29,21 @@ #include #include - class ServerListDlg; class ChannelListDlg; class CoreConnectDlg; class Buffer; class BufferViewConfig; +class MsgProcessorStatusWidget; class SettingsDlg; 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 { @@ -55,6 +58,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: @@ -76,7 +83,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,6 +92,7 @@ class MainWin : public QMainWindow { void on_actionLockDockPositions_toggled(bool lock); void showAboutDlg(); void showDebugConsole(); + void on_actionDebugNetworkModel_triggered(bool); void showCoreConnectionDlg(bool autoConnect = false); void coreConnectionDlgFinished(int result); @@ -100,7 +108,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(); @@ -113,6 +126,7 @@ class MainWin : public QMainWindow { QMenu *systrayMenu; QLabel *coreLagLabel; QLabel *sslLabel; + MsgProcessorStatusWidget *msgProcessorStatusWidget; TitleSetter _titleSetter; @@ -149,6 +163,11 @@ class MainWin : public QMainWindow { QList _netViews; NickListWidget *nickListWidget; +#ifdef HAVE_DBUS + org::freedesktop::Notifications *desktopNotifications; + quint32 notificationId; +#endif + friend class QtUi; };