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

diff --git a/src/qtui/systraynotificationbackend.h b/src/qtui/systraynotificationbackend.h
index 7fdf4e8e..be428ff2 100644
--- a/src/qtui/systraynotificationbackend.h
+++ b/src/qtui/systraynotificationbackend.h
@@ -1,81 +1,75 @@
 /***************************************************************************
-*   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.             *
-***************************************************************************/
-
-#ifndef SYSTRAYNOTIFICATIONBACKEND_H_
-#define SYSTRAYNOTIFICATIONBACKEND_H_
-
-#ifndef QT_NO_SYSTEMTRAYICON
-
-#include <QSystemTrayIcon>
+ *   Copyright (C) 2005-2020 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.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#pragma once
 
 #include "abstractnotificationbackend.h"
-
 #include "settingspage.h"
+#include "systemtray.h"
 
 class QCheckBox;
 
-class SystrayNotificationBackend : public AbstractNotificationBackend {
-  Q_OBJECT
+class SystrayNotificationBackend : public AbstractNotificationBackend
+{
+    Q_OBJECT
 
 public:
-  SystrayNotificationBackend(QObject *parent = 0);
+    SystrayNotificationBackend(QObject* parent = nullptr);
 
-  void notify(const Notification &);
-  void close(uint notificationId);
-  virtual SettingsPage *createConfigWidget() const;
+    void notify(const Notification&) override;
+    void close(uint notificationId) override;
+    SettingsPage* createConfigWidget() const override;
+
+protected:
+    bool eventFilter(QObject* obj, QEvent* event) override;
 
 private slots:
-  void showBubble();
-  void closeBubble();
-  void notificationActivated();
-  void notificationActivated(QSystemTrayIcon::ActivationReason);
+    void onNotificationActivated(uint notificationId);
+    void onNotificationActivated(SystemTray::ActivationReason);
 
-  void animateChanged(const QVariant &);
-  void showBubbleChanged(const QVariant &);
+    void showBubbleChanged(const QVariant&);
+    void updateToolTip();
 
 private:
-  class ConfigWidget;
+    class ConfigWidget;
 
-  bool _showBubble;
-  bool _animate;
-  QList<Notification> _notifications;
+    bool _showBubble;
+    QList<Notification> _notifications;
+    bool _blockActivation{false};
 };
 
-class SystrayNotificationBackend::ConfigWidget : public SettingsPage {
-  Q_OBJECT
+class SystrayNotificationBackend::ConfigWidget : public SettingsPage
+{
+    Q_OBJECT
 
 public:
-  ConfigWidget(QWidget *parent = 0);
-  void save();
-  void load();
-  bool hasDefaults() const;
-  void defaults();
+    ConfigWidget(QWidget* parent = nullptr);
+    void save() override;
+    void load() override;
+    bool hasDefaults() const override;
+    void defaults() override;
 
 private slots:
-  void widgetChanged();
+    void widgetChanged();
 
 private:
-  QCheckBox *_showBubbleBox, *_animateBox;
-  bool _showBubble, _animate;
+    QCheckBox* _showBubbleBox;
+    bool _showBubble;
 };
-
-#endif /* QT_NO_SYSTEMTRAYICON */
-
-#endif