X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.h;h=f25d597190906bcba8a982da5aaf223b9ef5f02c;hp=d610c48ea05c67036d133106af7aeb11da71463a;hb=f04db2cb802b1296ca739c823495930c71d3b4ab;hpb=d452877910888c25d40590b5fff57eb8197ca9b0

diff --git a/src/qtui/systemtray.h b/src/qtui/systemtray.h
index d610c48e..f25d5971 100644
--- a/src/qtui/systemtray.h
+++ b/src/qtui/systemtray.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
+ *   This file is free software; you can redistribute it and/or modify     *
+ *   it under the terms of the GNU Library General Public License (LGPL)   *
+ *   as published by the Free Software Foundation; either version 2 of the *
+ *   License, or (at your option) any later version.                       *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,7 +15,7 @@
  *   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 SYSTEMTRAY_H_
@@ -23,126 +23,118 @@
 
 #include "icon.h"
 
-#ifdef Q_WS_WIN
-#  include <windows.h>
-#endif
-
+class Action;
 class QMenu;
 
-class SystemTray : public QObject {
-  Q_OBJECT
-  Q_ENUMS(State Mode MessageIcon ActivationReason)
-
-public:
-  enum State {
-    Passive,
-    Active,
-    NeedsAttention
-  };
-
-  enum Mode {
-    Invalid,
-    Legacy,
-    StatusNotifier
-  };
-
-  // same as in QSystemTrayIcon
-  enum MessageIcon {
-    NoIcon,
-    Information,
-    Warning,
-    Critical
-  };
-
-  // same as in QSystemTrayIcon
-  enum ActivationReason {
-    Unknown,
-    Context,
-    DoubleClick,
-    Trigger,
-    MiddleClick
-  };
-
-  explicit SystemTray(QWidget *parent);
-  virtual ~SystemTray();
-  virtual void init() {}
-
-  inline State state() const;
-  inline bool isAlerted() const;
-  virtual inline bool isSystemTrayAvailable() const;
-
-  void setAlert(bool alerted);
-  inline void setInhibitActivation();
-  inline virtual bool isVisible() const { return false; }
-  inline bool isActivationInhibited() const;
-
-  QWidget *associatedWidget() const;
+class SystemTray : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(State Mode MessageIcon ActivationReason)
+
+public :
+        enum State {
+        Passive,
+        Active,
+        NeedsAttention
+    };
+
+    enum Mode {
+        Invalid,
+        Legacy,
+        StatusNotifier
+    };
+
+    // same as in QSystemTrayIcon
+    enum MessageIcon {
+        NoIcon,
+        Information,
+        Warning,
+        Critical
+    };
+
+    // same as in QSystemTrayIcon
+    enum ActivationReason {
+        Unknown,
+        Context,
+        DoubleClick,
+        Trigger,
+        MiddleClick
+    };
+
+    explicit SystemTray(QWidget *parent);
+    virtual ~SystemTray();
+    virtual void init();
+
+    inline Mode mode() const;
+    inline State state() const;
+    inline bool isAlerted() const;
+    virtual inline bool isSystemTrayAvailable() const;
+
+    void setAlert(bool alerted);
+    virtual inline bool isVisible() const { return false; }
+
+    QWidget *associatedWidget() const;
 
 public slots:
-  virtual void setState(State);
-  virtual void setVisible(bool visible = true);
-  virtual void setToolTip(const QString &title, const QString &subtitle);
-  virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int millisecondsTimeoutHint = 10000);
-  void toggleMainWidget();
-  void hideMainWidget();
+    virtual void setState(State);
+    virtual void setVisible(bool visible = true);
+    virtual void setToolTip(const QString &title, const QString &subtitle);
+    virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0);
+    virtual void closeMessage(uint notificationId) { Q_UNUSED(notificationId) }
 
 signals:
-  void activated(SystemTray::ActivationReason);
-  void iconChanged(const Icon &);
-  void toolTipChanged(const QString &title, const QString &subtitle);
-  void messageClicked();
+    void activated(SystemTray::ActivationReason);
+    void iconChanged(const Icon &);
+    void animationEnabledChanged(bool);
+    void toolTipChanged(const QString &title, const QString &subtitle);
+    void messageClicked(uint notificationId);
+    void messageClosed(uint notificationId);
 
 protected slots:
-  virtual void activate(SystemTray::ActivationReason = Trigger);
-
-  void minimizeRestore(bool restore);
+    virtual void activate(SystemTray::ActivationReason = Trigger);
 
 protected:
-  virtual void setMode(Mode mode);
-  inline Mode mode() const;
+    virtual void setMode(Mode mode);
+    inline bool shouldBeVisible() const;
 
-  virtual Icon stateIcon() const;
-  Icon stateIcon(State state) const;
-  inline QString toolTipTitle() const;
-  inline QString toolTipSubTitle() const;
-  inline QMenu *trayMenu() const;
-  void setTrayMenu(QMenu *);
+    virtual Icon stateIcon() const;
+    Icon stateIcon(State state) const;
+    inline QString toolTipTitle() const;
+    inline QString toolTipSubTitle() const;
+    inline QMenu *trayMenu() const;
 
-  virtual bool eventFilter(QObject *obj, QEvent *event);
+    inline bool animationEnabled() const;
 
 private slots:
+    void minimizeRestore();
+    void trayMenuAboutToShow();
+    void enableAnimationChanged(const QVariant &);
 
 private:
-  bool checkVisibility(bool performToggle = true);
-
-  Mode _mode;
-  State _state;
-
-  bool _inhibitActivation;
+    Mode _mode;
+    State _state;
+    bool _shouldBeVisible;
 
-  QString _toolTipTitle, _toolTipSubTitle;
-  Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
-
-  QMenu *_trayMenu;
-  QWidget *_associatedWidget;
-
-#ifdef Q_WS_WIN
-    DWORD _dwTickCount;
-#endif
+    QString _toolTipTitle, _toolTipSubTitle;
+    Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
+    bool _animationEnabled;
 
+    QMenu *_trayMenu;
+    QWidget *_associatedWidget;
+    Action *_minimizeRestoreAction;
 };
 
+
 // inlines
 
 bool SystemTray::isSystemTrayAvailable() const { return false; }
 bool SystemTray::isAlerted() const { return state() == NeedsAttention; }
-void SystemTray::setInhibitActivation() { _inhibitActivation = true; }
-bool SystemTray::isActivationInhibited() const { return _inhibitActivation; }
 SystemTray::Mode SystemTray::mode() const { return _mode; }
 SystemTray::State SystemTray::state() const { return _state; }
+bool SystemTray::shouldBeVisible() const { return _shouldBeVisible; }
 QMenu *SystemTray::trayMenu() const { return _trayMenu; }
 QString SystemTray::toolTipTitle() const { return _toolTipTitle; }
 QString SystemTray::toolTipSubTitle() const { return _toolTipSubTitle; }
-
+bool SystemTray::animationEnabled() const { return _animationEnabled; }
 
 #endif