X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=fa7b245780d9b97f39af86772b86aca7d396f3bc;hp=1c8b572554d38916cb1f6bd01e2fedf7ee1bb4a9;hb=138bb708911ef06fa37859fa51bca5f47125ccdd;hpb=5c78a50fa720e5f82fcaa03c0176feab71d74c8e diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index 1c8b5725..fa7b2457 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -1,22 +1,22 @@ /*************************************************************************** -* Copyright (C) 2005-08 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. * + ***************************************************************************/ #include "systraynotificationbackend.h" @@ -28,8 +28,12 @@ #include "mainwin.h" #include "networkmodel.h" #include "qtui.h" +#include "systemtray.h" -SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) : AbstractNotificationBackend(parent) { +SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) + : AbstractNotificationBackend(parent), + _blockActivation(false) +{ NotificationSettings notificationSettings; _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool(); _animate = notificationSettings.value("Systray/Animate", true).toBool(); @@ -37,85 +41,93 @@ SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) : Abstra notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &))); notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &))); - _configWidget = new ConfigWidget(); - _iconActive = false; - connect(&_animationTimer, SIGNAL(timeout()), SLOT(blink())); -} + connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated())); + connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)), + SLOT(notificationActivated(SystemTray::ActivationReason))); -SystrayNotificationBackend::~SystrayNotificationBackend() { - delete _configWidget; + QApplication::instance()->installEventFilter(this); } void SystrayNotificationBackend::notify(const Notification ¬ification) { - /* fancy stuff to be implemented later: show notifications in order - _notifications.append(notification); - if(_showBubble && _notifications.count() == 1) { - showBubble(); - } - */ - _notifications.clear(); + if(notification.type != Highlight && notification.type != PrivMsg) + return; + _notifications.append(notification); - if(_showBubble) { + if(_showBubble) showBubble(); - } - if(_animate && _notifications.count() == 1) { - startAnimation(); - } + + if(_animate) + QtUi::mainWindow()->systemTray()->setAlert(true); } void SystrayNotificationBackend::close(uint notificationId) { - Q_UNUSED(notificationId); - /* fancy stuff to be implemented later - int idx = _notifications.indexOf(notificationId); + QList::iterator i = _notifications.begin(); + while(i != _notifications.end()) { + if(i->notificationId == notificationId) + i = _notifications.erase(i); + else + ++i; + } - if(_notifications.isEmpty()) { - */ - _notifications.clear(); closeBubble(); - stopAnimation(); + + if(!_notifications.count()) + QtUi::mainWindow()->systemTray()->setAlert(false); } void SystrayNotificationBackend::showBubble() { // fancy stuff later: show messages in order // for now, we just show the last message - if(_notifications.isEmpty()) return; - Notification n = _notifications.takeLast(); + if(_notifications.isEmpty()) + return; + Notification n = _notifications.last(); QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId); QString message = QString("<%1> %2").arg(n.sender, n.message); - QtUi::mainWindow()->systemTrayIcon()->showMessage(title, message); + QtUi::mainWindow()->systemTray()->showMessage(title, message); } void SystrayNotificationBackend::closeBubble() { - // there really seems to be no decent way to close the bubble... - QtUi::mainWindow()->systemTrayIcon()->showMessage("", "", QSystemTrayIcon::NoIcon, 1); -} - -void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) { - _showBubble = v.toBool(); + // there really seems to be no sane way to close the bubble... :( +#ifdef Q_WS_X11 + QtUi::mainWindow()->systemTray()->showMessage("", "", SystemTray::NoIcon, 1); +#endif +} + +void SystrayNotificationBackend::notificationActivated() { + if(!_blockActivation) { + if(QtUi::mainWindow()->systemTray()->isAlerted()) { + _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal + uint id = _notifications.count()? _notifications.last().notificationId : 0; + emit activated(id); + } else + GraphicalUi::toggleMainWidget(); + } } -void SystrayNotificationBackend::startAnimation() { - if(!_animationTimer.isActive()) - _animationTimer.start(500); +void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) { + if(reason == SystemTray::Trigger) { + notificationActivated(); + } } -void SystrayNotificationBackend::stopAnimation() { - _animationTimer.stop(); - QtUi::mainWindow()->systemTrayIcon()->setIcon(Icon("quassel")); - _iconActive = false; +// moving the mouse or releasing the button means that we're not dealing with a double activation +bool SystrayNotificationBackend::eventFilter(QObject *obj, QEvent *event) { + if(event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonRelease) { + _blockActivation = false; + } + return AbstractNotificationBackend::eventFilter(obj, event); } -void SystrayNotificationBackend::blink() { - QtUi::mainWindow()->systemTrayIcon()->setIcon(_iconActive ? Icon("quassel") : Icon("quassel_newmessage")); - _iconActive = !_iconActive; +void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) { + _showBubble = v.toBool(); } void SystrayNotificationBackend::animateChanged(const QVariant &v) { _animate = v.toBool(); } -SettingsPage *SystrayNotificationBackend::configWidget() const { - return _configWidget; +SettingsPage *SystrayNotificationBackend::createConfigWidget() const { + return new ConfigWidget(); } /***************************************************************************/