From: Manuel Nickschas Date: Tue, 13 Apr 2010 20:01:52 +0000 (+0200) Subject: Stop blinking of tray icon on first click X-Git-Tag: 0.7-beta1~108 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0009480271c2420f8afb3ceaf97c57e58af16cad Stop blinking of tray icon on first click Users have requested that the icon stop blinking after the first highlight has been activated, even if there are more highlights pending. If this change causes an uproar in the community, I think we'll make it an option... --- diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp index f189f9e1..6cc25a6a 100644 --- a/src/qtui/knotificationbackend.cpp +++ b/src/qtui/knotificationbackend.cpp @@ -84,7 +84,7 @@ void KNotificationBackend::removeNotificationById(uint notificationId) { void KNotificationBackend::close(uint notificationId) { removeNotificationById(notificationId); - if(!_notifications.count()) + //if(!_notifications.count()) // FIXME make configurable QtUi::mainWindow()->systemTray()->setAlert(false); } diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index b6d1ff5f..dade7081 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -79,7 +79,7 @@ void SystrayNotificationBackend::close(uint notificationId) { QtUi::mainWindow()->systemTray()->closeMessage(notificationId); - if(!_notifications.count()) + //if(!_notifications.count()) //FIXME make configurable QtUi::mainWindow()->systemTray()->setAlert(false); updateToolTip(); @@ -87,7 +87,7 @@ void SystrayNotificationBackend::close(uint notificationId) { void SystrayNotificationBackend::notificationActivated(uint notificationId) { if(!_blockActivation) { - if(QtUi::mainWindow()->systemTray()->isAlerted()) { + if(_notifications.count()) { _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal if(!notificationId) notificationId = _notifications.count()? _notifications.last().notificationId : 0;