X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritem.h;h=5a103b61992d4418e19d8ebce47e5f73128dcb79;hp=fc774cfd277d334699dd7a75e659ec3b6e8cb35f;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=fdfd62334f728bd05470c5191194d55027fec86e

diff --git a/src/qtui/statusnotifieritem.h b/src/qtui/statusnotifieritem.h
index fc774cfd..5a103b61 100644
--- a/src/qtui/statusnotifieritem.h
+++ b/src/qtui/statusnotifieritem.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This contains code from KStatusNotifierItem, part of the KDE libs     *
@@ -18,14 +18,18 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef STATUSNOTIFIERITEM_H_
-#define STATUSNOTIFIERITEM_H_
+#pragma once
 
 #ifdef HAVE_DBUS
 
+#include <QDBusError>
+#include <QHash>
+#include <QString>
+#include <QTemporaryDir>
+
 #include "notificationsclient.h"
 #include "systemtray.h"
 #include "statusnotifierwatcher.h"
@@ -37,64 +41,66 @@
 #  include "legacysystemtray.h"
 #endif
 
+class QDBusServiceWatcher;
+
 class StatusNotifierItemDBus;
 
-class StatusNotifierItem : public StatusNotifierItemParent {
-  Q_OBJECT
+class StatusNotifierItem : public StatusNotifierItemParent
+{
+    Q_OBJECT
 
 public:
-  explicit StatusNotifierItem(QWidget *parent);
-  virtual ~StatusNotifierItem();
+    explicit StatusNotifierItem(QWidget *parent);
 
-  virtual bool isSystemTrayAvailable() const;
-  virtual bool isVisible() const;
+    bool isSystemTrayAvailable() const override;
 
 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);
+    void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0) override;
+    void closeMessage(uint notificationId) override;
 
 protected:
-  virtual void init();
-  virtual void setMode(Mode mode);
-
-  QString title() const;
-  QString iconName() const;
-  QString attentionIconName() const;
-  QString toolTipIconName() const;
-  QString iconThemePath() const;
-  QString menuObjectPath() const;
+    QString title() const;
+    QString iconName() const;
+    QString attentionIconName() const;
+    QString toolTipIconName() const;
+    QString iconThemePath() const;
+    QString menuObjectPath() const;
 
-  virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private slots:
-  void activated(const QPoint &pos);
-  void serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner);
-  void checkForRegisteredHosts();
+    void activated(const QPoint &pos);
+    void serviceChange(const QString &name, const QString &oldOwner, const QString &newOwner);
+    void checkForRegisteredHosts();
+    void onDBusError(const QDBusError &error);
+
+    void notificationClosed(uint id, uint reason);
+    void notificationInvoked(uint id, const QString &action);
+
+    void refreshIcons();
 
-  void notificationClosed(uint id, uint reason);
-  void notificationInvoked(uint id, const QString &action);
+    void onModeChanged(Mode mode);
+    void onStateChanged(State state);
+    void onVisibilityChanged(bool isVisible);
 
 private:
-  void registerToDaemon();
+    void registerToWatcher();
 
-  static const int _protocolVersion;
-  static const QString _statusNotifierWatcherServiceName;
-  StatusNotifierItemDBus *_statusNotifierItemDBus;
+    QDBusServiceWatcher *_serviceWatcher{nullptr};
+    StatusNotifierItemDBus *_statusNotifierItemDBus{nullptr};
+    org::kde::StatusNotifierWatcher *_statusNotifierWatcher{nullptr};
+    org::freedesktop::Notifications *_notificationsClient{nullptr};
+    bool _notificationsClientSupportsMarkup{false};
+    bool _notificationsClientSupportsActions{false};
+    quint32 _lastNotificationsDBusId{0};
+    QHash<uint, uint> _notificationsIdMap; ///< Maps our own notification ID to the D-Bus one
 
-  org::kde::StatusNotifierWatcher *_statusNotifierWatcher;
-  org::freedesktop::Notifications *_notificationsClient;
-  bool _notificationsClientSupportsMarkup;
-  bool _notificationsClientSupportsActions;
-  quint32 _lastNotificationsDBusId;
-  QHash<uint, uint> _notificationsIdMap; ///< Maps our own notification ID to the D-Bus one
+    QString _iconThemePath;
+    QString _menuObjectPath;
 
-  QString _iconThemePath;
-  QString _menuObjectPath;
+    QTemporaryDir _iconThemeDir;
 
-  friend class StatusNotifierItemDBus;
+    friend class StatusNotifierItemDBus;
 };
 
 #endif /* HAVE_DBUS */
-#endif /* STATUSNOTIFIERITEM_H_ */