X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.h;h=8bc3b467d7f00868c543203e3073815773ca6f7a;hp=c6cb91bfa3b6ea460dd12a4447bbeed1fa4598d3;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=5ba28fb36a747bd9a2c05a58f0533d1e38c2a0de

diff --git a/src/qtui/legacysystemtray.h b/src/qtui/legacysystemtray.h
index c6cb91bf..8bc3b467 100644
--- a/src/qtui/legacysystemtray.h
+++ b/src/qtui/legacysystemtray.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,53 +33,58 @@
 
 #include "systemtray.h"
 
-class LegacySystemTray : public SystemTray {
-  Q_OBJECT
+class LegacySystemTray : public SystemTray
+{
+    Q_OBJECT
 
 public:
-  explicit LegacySystemTray(QWidget *parent);
-  virtual ~LegacySystemTray() {}
-  virtual void init();
+    explicit LegacySystemTray(QWidget *parent);
+    virtual ~LegacySystemTray() {}
+    virtual void init();
 
-  virtual bool isVisible() const;
-  virtual inline bool isSystemTrayAvailable() const;
-  virtual Icon stateIcon() const; // overriden to care about blinkState
+    virtual bool isVisible() const;
+    virtual inline bool isSystemTrayAvailable() const;
+    virtual Icon stateIcon() const; // overriden to care about blinkState
 
 public slots:
-  virtual void setState(State state);
-  virtual void setVisible(bool visible = true);
-  virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0);
-  virtual void closeMessage(uint notificationId);
+    virtual void setState(State state);
+    virtual void setVisible(bool visible = true);
+    virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0);
+    virtual void closeMessage(uint notificationId);
 
 protected slots:
 
 protected:
-  virtual void setMode(Mode mode);
+    virtual void setMode(Mode mode);
 
 private slots:
-  void on_blinkTimeout();
-  void on_activated(QSystemTrayIcon::ActivationReason);
-  void on_messageClicked();
+    void on_blinkTimeout();
+    void on_activated(QSystemTrayIcon::ActivationReason);
+    void on_messageClicked();
 
-  void syncLegacyIcon();
+    void syncLegacyIcon();
 
 private:
-  QTimer _blinkTimer;
-  bool _blinkState;
-  bool _isVisible;
-  uint _lastMessageId;
+    QTimer _blinkTimer;
+    bool _blinkState;
+    uint _lastMessageId;
 
 #ifdef HAVE_KDE
-  KSystemTrayIcon *_trayIcon;
+    KSystemTrayIcon *_trayIcon;
 #else
-  QSystemTrayIcon *_trayIcon;
+    QSystemTrayIcon *_trayIcon;
 #endif
-
 };
 
+
 // inlines
 
-bool LegacySystemTray::isSystemTrayAvailable() const { return QSystemTrayIcon::isSystemTrayAvailable(); }
+bool LegacySystemTray::isSystemTrayAvailable() const
+{
+    return mode() == Legacy ? QSystemTrayIcon::isSystemTrayAvailable()
+           : SystemTray::isSystemTrayAvailable();
+}
+
 
 #endif /* QT_NO_SYSTEMTRAYICON */