X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.h;h=1a187c8e778740d3f33d2be3b2550fae4ebbcb04;hp=07c1b1d992e0ad3847bd23ecd4fcc82ec72039a4;hb=2ed35d8a6322e49ab604472a7af59592cf36ae12;hpb=42d2c195b272f42fdcad7f44b9db4ae4f708bdf6 diff --git a/src/qtui/legacysystemtray.h b/src/qtui/legacysystemtray.h index 07c1b1d9..1a187c8e 100644 --- a/src/qtui/legacysystemtray.h +++ b/src/qtui/legacysystemtray.h @@ -48,7 +48,8 @@ public: 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 millisecondsTimeoutHint = 10000); + 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: @@ -58,13 +59,14 @@ protected: private slots: void on_blinkTimeout(); void on_activated(QSystemTrayIcon::ActivationReason); + void on_messageClicked(); void syncLegacyIcon(); private: QTimer _blinkTimer; bool _blinkState; - bool _isVisible; + uint _lastMessageId; #ifdef HAVE_KDE KSystemTrayIcon *_trayIcon; @@ -76,7 +78,10 @@ private: // inlines -bool LegacySystemTray::isSystemTrayAvailable() const { return QSystemTrayIcon::isSystemTrayAvailable(); } +bool LegacySystemTray::isSystemTrayAvailable() const { + return mode() == Legacy ? QSystemTrayIcon::isSystemTrayAvailable() + : SystemTray::isSystemTrayAvailable(); +} #endif /* QT_NO_SYSTEMTRAYICON */