X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.h;h=e2bc3386e3753acb6634f19234f835a355f05525;hp=1a187c8e778740d3f33d2be3b2550fae4ebbcb04;hb=ee8b9f55860e340c1600188fddcfd557c7489f66;hpb=55362eeaa19678bd8ba36ecce134d98cc0d7eccd

diff --git a/src/qtui/legacysystemtray.h b/src/qtui/legacysystemtray.h
index 1a187c8e..e2bc3386 100644
--- a/src/qtui/legacysystemtray.h
+++ b/src/qtui/legacysystemtray.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 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,74 +15,54 @@
  *   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 LEGACYSYSTEMTRAY_H_
-#define LEGACYSYSTEMTRAY_H_
+#pragma once
 
 #ifndef QT_NO_SYSTEMTRAYICON
 
-#ifdef HAVE_KDE
+#include <QString>
+
+#ifdef HAVE_KDE4
 #  include <KSystemTrayIcon>
 #else
 #  include <QSystemTrayIcon>
 #endif
 
-#include <QTimer>
-
 #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 bool isVisible() const;
-  virtual inline bool isSystemTrayAvailable() const;
-  virtual Icon stateIcon() const; // overriden to care about blinkState
+    bool isSystemTrayAvailable() const override;
 
 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);
-
-protected slots:
-
-protected:
-  virtual void setMode(Mode mode);
+    void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0) override;
+    void closeMessage(uint notificationId) override;
 
 private slots:
-  void on_blinkTimeout();
-  void on_activated(QSystemTrayIcon::ActivationReason);
-  void on_messageClicked();
+    void onModeChanged(Mode mode);
+    void onVisibilityChanged(bool isVisible);
+
+    void onActivated(QSystemTrayIcon::ActivationReason);
+    void onMessageClicked();
 
-  void syncLegacyIcon();
+    void updateIcon();
+    void updateToolTip();
 
 private:
-  QTimer _blinkTimer;
-  bool _blinkState;
-  uint _lastMessageId;
+    uint _lastMessageId {0};
 
-#ifdef HAVE_KDE
-  KSystemTrayIcon *_trayIcon;
+#ifdef HAVE_KDE4
+    KSystemTrayIcon *_trayIcon;
 #else
-  QSystemTrayIcon *_trayIcon;
+    QSystemTrayIcon *_trayIcon;
 #endif
-
 };
 
-// inlines
-
-bool LegacySystemTray::isSystemTrayAvailable() const {
-  return mode() == Legacy ? QSystemTrayIcon::isSystemTrayAvailable()
-                          : SystemTray::isSystemTrayAvailable();
-}
-
 #endif /* QT_NO_SYSTEMTRAYICON */
-
-#endif /* LEGACYSYSTEMTRAY_H_ */