X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=4e024daf9eddeb81ea0da2e1313c9c495c870a77;hp=35dd2dd70c0c16fee481f756293c65da472ec21a;hb=2c8434f74c68194d56f2084f637419123e61d18b;hpb=fadb064c526843a7f6f6e4532372eee009fa3c3b diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index 35dd2dd7..4e024daf 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -1,26 +1,29 @@ /*************************************************************************** -* 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-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 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. * + ***************************************************************************/ #include "systraynotificationbackend.h" -#include +#include +#include +#include +#include #include "client.h" #include "clientsettings.h" @@ -28,143 +31,161 @@ #include "mainwin.h" #include "networkmodel.h" #include "qtui.h" +#include "systemtray.h" -SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) : AbstractNotificationBackend(parent) { - NotificationSettings notificationSettings; - _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool(); - _animate = notificationSettings.value("Systray/Animate", true).toBool(); +SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) + : AbstractNotificationBackend(parent) +{ + NotificationSettings notificationSettings; + notificationSettings.initAndNotify("Systray/ShowBubble", this, &SystrayNotificationBackend::showBubbleChanged, true); - notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &))); - notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &))); + connect(QtUi::mainWindow()->systemTray(), &SystemTray::messageClicked, + this, selectOverload(&SystrayNotificationBackend::onNotificationActivated)); + connect(QtUi::mainWindow()->systemTray(), &SystemTray::activated, + this, selectOverload(&SystrayNotificationBackend::onNotificationActivated)); - _configWidget = new ConfigWidget(); - _iconActive = false; - connect(&_animationTimer, SIGNAL(timeout()), SLOT(blink())); -} + QApplication::instance()->installEventFilter(this); -SystrayNotificationBackend::~SystrayNotificationBackend() { - delete _configWidget; + updateToolTip(); } -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(); - _notifications.append(notification); - if(_showBubble) { - showBubble(); - } - if(_animate) { - startAnimation(); - } -} -void SystrayNotificationBackend::close(uint notificationId) { - Q_UNUSED(notificationId); - /* fancy stuff to be implemented later - int idx = _notifications.indexOf(notificationId); +void SystrayNotificationBackend::notify(const Notification &n) +{ + if (n.type != Highlight && n.type != PrivMsg) + return; - if(_notifications.isEmpty()) { - */ - _notifications.clear(); - closeBubble(); - stopAnimation(); -} + _notifications.append(n); + if (_showBubble) { + QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId); + QString message = QString("<%1> %2").arg(n.sender, n.message); + QtUi::mainWindow()->systemTray()->showMessage(title, message, SystemTray::Information, 10000, n.notificationId); + } -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(); - 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); + updateToolTip(); } -void SystrayNotificationBackend::closeBubble() { - // there really seems to be no decent way to close the bubble... - // in addition, windows ignores the timeout -_- -#ifndef Q_WS_WIN - QtUi::mainWindow()->systemTrayIcon()->showMessage("", "", QSystemTrayIcon::NoIcon, 1); -#endif + +void SystrayNotificationBackend::close(uint notificationId) +{ + QList::iterator i = _notifications.begin(); + while (i != _notifications.end()) { + if (i->notificationId == notificationId) + i = _notifications.erase(i); + else + ++i; + } + + QtUi::mainWindow()->systemTray()->closeMessage(notificationId); + + updateToolTip(); } -void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) { - _showBubble = v.toBool(); + +void SystrayNotificationBackend::onNotificationActivated(uint notificationId) +{ + if (!_blockActivation) { + QList::iterator i = _notifications.begin(); + while (i != _notifications.end()) { + if (i->notificationId == notificationId) { + if (QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy) + _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal + emit activated(notificationId); + break; + } + ++i; + } + } } -void SystrayNotificationBackend::startAnimation() { - if(!_animationTimer.isActive()) - _animationTimer.start(500); + +void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationReason reason) +{ + if (reason == SystemTray::Trigger) { + if (_notifications.count()) { + onNotificationActivated(_notifications.last().notificationId); + } + else { + GraphicalUi::toggleMainWidget(); + } + } } -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(); + +void SystrayNotificationBackend::updateToolTip() +{ + QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC", + _notifications.count() ? tr("%n pending highlight(s)", "", _notifications.count()) : QString()); } -SettingsPage *SystrayNotificationBackend::configWidget() const { - return _configWidget; + +SettingsPage *SystrayNotificationBackend::createConfigWidget() const +{ + return new ConfigWidget(); } -/***************************************************************************/ -SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "SystrayNotification", parent) { - QGroupBox *groupBox = new QGroupBox(tr("System Tray Icon"), this); - _animateBox = new QCheckBox(tr("Animate")); - connect(_animateBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged())); - _showBubbleBox = new QCheckBox(tr("Show bubble")); - connect(_showBubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged())); - QVBoxLayout *layout = new QVBoxLayout(groupBox); - layout->addWidget(_animateBox); - layout->addWidget(_showBubbleBox); - layout->addStretch(1); - QVBoxLayout *globalLayout = new QVBoxLayout(this); - globalLayout->addWidget(groupBox); +/***************************************************************************/ +SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "SystrayNotification", parent) +{ + _showBubbleBox = new QCheckBox(tr("Show a message in a popup")); + _showBubbleBox->setIcon(icon::get("dialog-information")); + connect(_showBubbleBox, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged); + auto *layout = new QHBoxLayout(this); + layout->addWidget(_showBubbleBox); } -void SystrayNotificationBackend::ConfigWidget::widgetChanged() { - bool changed = (_showBubble != _showBubbleBox->isChecked() || _animate != _animateBox->isChecked()); - if(changed != hasChanged()) setChangedState(changed); + +void SystrayNotificationBackend::ConfigWidget::widgetChanged() +{ + bool changed = (_showBubble != _showBubbleBox->isChecked()); + if (changed != hasChanged()) + setChangedState(changed); } -bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const { - return true; + +bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const +{ + return true; } -void SystrayNotificationBackend::ConfigWidget::defaults() { - _animateBox->setChecked(true); - _showBubbleBox->setChecked(false); - widgetChanged(); + +void SystrayNotificationBackend::ConfigWidget::defaults() +{ + _showBubbleBox->setChecked(false); + widgetChanged(); } -void SystrayNotificationBackend::ConfigWidget::load() { - NotificationSettings s; - _animate = s.value("Systray/Animate", true).toBool(); - _showBubble = s.value("Systray/ShowBubble", false).toBool(); - _animateBox->setChecked(_animate); - _showBubbleBox->setChecked(_showBubble); - setChangedState(false); + +void SystrayNotificationBackend::ConfigWidget::load() +{ + NotificationSettings s; + _showBubble = s.value("Systray/ShowBubble", false).toBool(); + _showBubbleBox->setChecked(_showBubble); + setChangedState(false); } -void SystrayNotificationBackend::ConfigWidget::save() { - NotificationSettings s; - s.setValue("Systray/Animate", _animateBox->isChecked()); - s.setValue("Systray/ShowBubble", _showBubbleBox->isChecked()); - load(); + +void SystrayNotificationBackend::ConfigWidget::save() +{ + NotificationSettings s; + s.setValue("Systray/ShowBubble", _showBubbleBox->isChecked()); + load(); }