projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix markerline placement on relayout
[quassel.git]
/
src
/
qtui
/
statusnotifieritem.h
diff --git
a/src/qtui/statusnotifieritem.h
b/src/qtui/statusnotifieritem.h
index
2efbefd
..
1ca4e4a
100644
(file)
--- a/
src/qtui/statusnotifieritem.h
+++ b/
src/qtui/statusnotifieritem.h
@@
-26,6
+26,7
@@
#ifdef HAVE_DBUS
#ifdef HAVE_DBUS
+#include "notificationsclient.h"
#include "systemtray.h"
#include "statusnotifierwatcher.h"
#include "systemtray.h"
#include "statusnotifierwatcher.h"
@@
-45,8
+46,14
@@
public:
explicit StatusNotifierItem(QWidget *parent);
virtual ~StatusNotifierItem();
explicit StatusNotifierItem(QWidget *parent);
virtual ~StatusNotifierItem();
+ virtual bool isSystemTrayAvailable() const;
+ virtual bool isVisible() const;
+
public slots:
virtual void setState(State state);
public slots:
virtual void setState(State state);
+ virtual void setVisible(bool visible);
+ virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0);
+ virtual void closeMessage(uint notificationId);
protected:
virtual void init();
protected:
virtual void init();
@@
-63,6
+70,9
@@
private slots:
void activated(const QPoint &pos);
void serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner);
void activated(const QPoint &pos);
void serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner);
+ void notificationClosed(uint id, uint reason);
+ void notificationInvoked(uint id, const QString &action);
+
private:
void registerToDaemon();
private:
void registerToDaemon();
@@
-70,7
+80,10
@@
private:
StatusNotifierItemDBus *_statusNotifierItemDBus;
org::kde::StatusNotifierWatcher *_statusNotifierWatcher;
StatusNotifierItemDBus *_statusNotifierItemDBus;
org::kde::StatusNotifierWatcher *_statusNotifierWatcher;
- //org::freedesktop::Notifications *_notificationsClient;
+ org::freedesktop::Notifications *_notificationsClient;
+ bool _notificationsClientSupportsMarkup;
+ quint32 _lastNotificationsDBusId;
+ QHash<uint, uint> _notificationsIdMap; ///< Maps our own notification ID to the D-Bus one
friend class StatusNotifierItemDBus;
};
friend class StatusNotifierItemDBus;
};