X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fknotificationbackend.cpp;h=5282bd777785434f902d6dc70d8f50bc7e0ee0e0;hp=24974e0f6fd61d557e1009b6611590c003f5ad05;hb=HEAD;hpb=231d30c66b4f52d239deb608f77a0ceb8034fbe9 diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp index 24974e0f..903446ac 100644 --- a/src/qtui/knotificationbackend.cpp +++ b/src/qtui/knotificationbackend.cpp @@ -1,136 +1,175 @@ /*************************************************************************** -* Copyright (C) 2005-09 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-2022 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 +#include "knotificationbackend.h" -#include -#include #include +#include -#include "knotificationbackend.h" +#include +#include +#include #include "client.h" #include "icon.h" -#include "iconloader.h" +#include "mainwin.h" #include "networkmodel.h" #include "qtui.h" -#include "systemtray.h" +#include "util.h" -KNotificationBackend::KNotificationBackend(QObject *parent) -: AbstractNotificationBackend(parent) +KNotificationBackend::KNotificationBackend(QObject* parent) + : AbstractNotificationBackend(parent) { - connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), - SLOT(notificationActivated(QSystemTrayIcon::ActivationReason))); + connect(QtUi::mainWindow()->systemTray(), + &SystemTray::activated, + this, + selectOverload(&KNotificationBackend::notificationActivated)); + + updateToolTip(); } -void KNotificationBackend::notify(const Notification &n) { - QString type; - switch(n.type) { +void KNotificationBackend::notify(const Notification& n) +{ + QString type; + switch (n.type) { case Highlight: - type = "Highlight"; break; + type = "Highlight"; + break; case HighlightFocused: - type = "HighlightFocused"; break; + type = "HighlightFocused"; + break; case PrivMsg: - type = "PrivMsg"; break; + type = "PrivMsg"; + break; case PrivMsgFocused: - type = "PrivMsgFocused"; break; - } - - QString message = QString("<%1> %2").arg(n.sender, Qt::escape(n.message)); - KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(), - KNotification::RaiseWidgetOnActivation - |KNotification::CloseWhenWidgetActivated - |KNotification::CloseOnTimeout); - connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated())); - notification->setActions(QStringList("View")); - notification->setProperty("notificationId", n.notificationId); - - _notifications.append(qMakePair(n.notificationId, QPointer(notification))); - - QtUi::mainWindow()->systemTray()->setAlert(true); + type = "PrivMsgFocused"; + break; + } + + QString message = QString("<%1> %2").arg(n.sender, n.message.toHtmlEscaped()); + KNotification* notification = KNotification::event(type, + message, + QStringLiteral("dialog-information"), + QtUi::mainWindow(), + KNotification::RaiseWidgetOnActivation | KNotification::CloseWhenWidgetActivated + | KNotification::CloseOnTimeout); + connect(notification, + selectOverload(&KNotification::activated), + this, + selectOverload<>(&KNotificationBackend::notificationActivated)); +#if KNOTIFICATIONS_VERSION >= QT_VERSION_CHECK(5,31,0) + notification->setDefaultAction(tr("View")); +#else + notification->setActions(QStringList{tr("View")}); +#endif + notification->setProperty("notificationId", n.notificationId); + + _notifications.append(qMakePair(n.notificationId, QPointer(notification))); + + updateToolTip(); } -void KNotificationBackend::removeNotificationById(uint notificationId) { - QList > >::iterator i = _notifications.begin(); - while(i != _notifications.end()) { - if(i->first == notificationId) { - if(i->second) - i->second->close(); - i = _notifications.erase(i); - } else - ++i; - } +void KNotificationBackend::removeNotificationById(uint notificationId) +{ + QList>>::iterator i = _notifications.begin(); + while (i != _notifications.end()) { + if (i->first == notificationId) { + if (i->second) + i->second->close(); + i = _notifications.erase(i); + } + else + ++i; + } + updateToolTip(); } -void KNotificationBackend::close(uint notificationId) { - removeNotificationById(notificationId); - if(!_notifications.count()) - QtUi::mainWindow()->systemTray()->setAlert(false); +void KNotificationBackend::close(uint notificationId) +{ + removeNotificationById(notificationId); + // if(!_notifications.count()) // FIXME make configurable } -void KNotificationBackend::notificationActivated() { - uint id = 0; - KNotification *n = qobject_cast(sender()); - if(n) - id = n->property("notificationId").toUInt(); +void KNotificationBackend::notificationActivated() +{ + uint id = 0; + KNotification* n = qobject_cast(sender()); + if (n) + id = n->property("notificationId").toUInt(); - notificationActivated(id); + notificationActivated(id); } -void KNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) { - if(reason == QSystemTrayIcon::Trigger && _notifications.count()) { - notificationActivated(_notifications.first().first); // oldest one - } +void KNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) +{ + if (reason == SystemTray::Trigger) { + if (_notifications.count()) + notificationActivated(_notifications.first().first); // oldest one + else + GraphicalUi::toggleMainWidget(); + } } -void KNotificationBackend::notificationActivated(uint notificationId) { - QtUi::mainWindow()->systemTray()->setInhibitActivation(); - emit activated(notificationId); +void KNotificationBackend::notificationActivated(uint notificationId) +{ + emit activated(notificationId); +} +void KNotificationBackend::updateToolTip() +{ + QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC", + _notifications.count() ? tr("%n pending highlight(s)", "", _notifications.count()) + : QString()); } -SettingsPage *KNotificationBackend::createConfigWidget() const { - return new ConfigWidget(); +SettingsPage* KNotificationBackend::createConfigWidget() const +{ + return new ConfigWidget(); } /***************************************************************************/ -KNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "KNotification", parent) { - _widget = new KNotifyConfigWidget(this); - _widget->setApplication("quassel"); +KNotificationBackend::ConfigWidget::ConfigWidget(QWidget* parent) + : SettingsPage("Internal", "KNotification", parent) +{ + _widget = new KNotifyConfigWidget(this); + _widget->setApplication("quassel"); - QVBoxLayout *layout = new QVBoxLayout(this); - layout->addWidget(_widget); + QVBoxLayout* layout = new QVBoxLayout(this); + layout->addWidget(_widget); - connect(_widget, SIGNAL(changed(bool)), SLOT(widgetChanged(bool))); + connect(_widget, &KNotifyConfigWidget::changed, this, &ConfigWidget::widgetChanged); } -void KNotificationBackend::ConfigWidget::widgetChanged(bool changed) { - setChangedState(changed); +void KNotificationBackend::ConfigWidget::widgetChanged(bool changed) +{ + setChangedState(changed); } -void KNotificationBackend::ConfigWidget::load() { - setChangedState(false); +void KNotificationBackend::ConfigWidget::load() +{ + setChangedState(false); } -void KNotificationBackend::ConfigWidget::save() { - _widget->save(); - load(); +void KNotificationBackend::ConfigWidget::save() +{ + _widget->save(); + load(); }