X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.h;h=319942bfee86525e545cafb8ec33409a51da56b7;hp=7fdf4e8e2da15bc0e115a15d474ecdc7faadb24c;hb=62c360e674f17146c6c52e874e854e24bab643b3;hpb=d76bb125c8dd275095409edd3426700a98d89f3a

diff --git a/src/qtui/systraynotificationbackend.h b/src/qtui/systraynotificationbackend.h
index 7fdf4e8e..319942bf 100644
--- a/src/qtui/systraynotificationbackend.h
+++ b/src/qtui/systraynotificationbackend.h
@@ -1,33 +1,29 @@
 /***************************************************************************
-*   Copyright (C) 2005-09 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 program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   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.             *
-***************************************************************************/
+ *   Copyright (C) 2005-2010 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 program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   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.             *
+ ***************************************************************************/
 
 #ifndef SYSTRAYNOTIFICATIONBACKEND_H_
 #define SYSTRAYNOTIFICATIONBACKEND_H_
 
-#ifndef QT_NO_SYSTEMTRAYICON
-
-#include <QSystemTrayIcon>
-
 #include "abstractnotificationbackend.h"
-
 #include "settingspage.h"
+#include "systemtray.h"
 
 class QCheckBox;
 
@@ -41,14 +37,16 @@ public:
   void close(uint notificationId);
   virtual SettingsPage *createConfigWidget() const;
 
+protected:
+  virtual bool eventFilter(QObject *obj, QEvent *event);
+
 private slots:
-  void showBubble();
-  void closeBubble();
-  void notificationActivated();
-  void notificationActivated(QSystemTrayIcon::ActivationReason);
+  void notificationActivated(uint notificationId);
+  void notificationActivated(SystemTray::ActivationReason);
 
   void animateChanged(const QVariant &);
   void showBubbleChanged(const QVariant &);
+  void updateToolTip();
 
 private:
   class ConfigWidget;
@@ -56,6 +54,7 @@ private:
   bool _showBubble;
   bool _animate;
   QList<Notification> _notifications;
+  bool _blockActivation;
 };
 
 class SystrayNotificationBackend::ConfigWidget : public SettingsPage {
@@ -72,10 +71,8 @@ private slots:
   void widgetChanged();
 
 private:
-  QCheckBox *_showBubbleBox, *_animateBox;
-  bool _showBubble, _animate;
+  QCheckBox *_showBubbleBox;
+  bool _showBubble;
 };
 
-#endif /* QT_NO_SYSTEMTRAYICON */
-
 #endif