/***************************************************************************
- * Copyright (C) 2005-2012 by the Quassel Project *
+ * Copyright (C) 2005-2022 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "systraynotificationbackend.h"
+
#include <QApplication>
#include <QCheckBox>
#include <QGroupBox>
#include <QHBoxLayout>
-#include "systraynotificationbackend.h"
-
#include "client.h"
#include "clientsettings.h"
#include "icon.h"
-#include "iconloader.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
#include "systemtray.h"
-SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
- : AbstractNotificationBackend(parent),
- _blockActivation(false)
+SystrayNotificationBackend::SystrayNotificationBackend(QObject* parent)
+ : AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
- notificationSettings.initAndNotify("Systray/ShowBubble", this, SLOT(showBubbleChanged(QVariant)), true);
- notificationSettings.initAndNotify("Systray/Animate", this, SLOT(animateChanged(QVariant)), true);
+ notificationSettings.initAndNotify("Systray/ShowBubble", this, &SystrayNotificationBackend::showBubbleChanged, true);
- connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked(uint)), SLOT(notificationActivated(uint)));
- connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
- SLOT(notificationActivated(SystemTray::ActivationReason)));
+ connect(QtUi::mainWindow()->systemTray(),
+ &SystemTray::messageClicked,
+ this,
+ selectOverload<uint>(&SystrayNotificationBackend::onNotificationActivated));
+ connect(QtUi::mainWindow()->systemTray(),
+ &SystemTray::activated,
+ this,
+ selectOverload<SystemTray::ActivationReason>(&SystrayNotificationBackend::onNotificationActivated));
QApplication::instance()->installEventFilter(this);
updateToolTip();
}
-
-void SystrayNotificationBackend::notify(const Notification &n)
+void SystrayNotificationBackend::notify(const Notification& n)
{
if (n.type != Highlight && n.type != PrivMsg)
return;
QtUi::mainWindow()->systemTray()->showMessage(title, message, SystemTray::Information, 10000, n.notificationId);
}
- if (_animate)
- QtUi::mainWindow()->systemTray()->setAlert(true);
-
updateToolTip();
}
-
void SystrayNotificationBackend::close(uint notificationId)
{
QList<Notification>::iterator i = _notifications.begin();
QtUi::mainWindow()->systemTray()->closeMessage(notificationId);
- //if(!_notifications.count()) //FIXME make configurable
- QtUi::mainWindow()->systemTray()->setAlert(false);
-
updateToolTip();
}
-
-void SystrayNotificationBackend::notificationActivated(uint notificationId)
+void SystrayNotificationBackend::onNotificationActivated(uint notificationId)
{
if (!_blockActivation) {
- if (_notifications.count()) {
- if (QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy)
- _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
- if (!notificationId)
- notificationId = _notifications.count() ? _notifications.last().notificationId : 0;
- emit activated(notificationId);
+ QList<Notification>::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;
}
- else
- GraphicalUi::toggleMainWidget();
}
}
-
-void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason)
+void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationReason reason)
{
if (reason == SystemTray::Trigger) {
- notificationActivated(0);
+ if (_notifications.count()) {
+ onNotificationActivated(_notifications.last().notificationId);
+ }
+ else {
+ GraphicalUi::toggleMainWidget();
+ }
}
}
-
// moving the mouse or releasing the button means that we're not dealing with a double activation
-bool SystrayNotificationBackend::eventFilter(QObject *obj, QEvent *event)
+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::showBubbleChanged(const QVariant &v)
+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());
+ _notifications.count() ? tr("%n pending highlight(s)", "", _notifications.count())
+ : QString());
}
-
-SettingsPage *SystrayNotificationBackend::createConfigWidget() const
+SettingsPage* SystrayNotificationBackend::createConfigWidget() const
{
return new ConfigWidget();
}
-
/***************************************************************************/
-SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "SystrayNotification", parent)
+SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget* parent)
+ : SettingsPage("Internal", "SystrayNotification", parent)
{
_showBubbleBox = new QCheckBox(tr("Show a message in a popup"));
- _showBubbleBox->setIcon(SmallIcon("dialog-information"));
- connect(_showBubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged()));
- QHBoxLayout *layout = new QHBoxLayout(this);
+ _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());
setChangedState(changed);
}
-
bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const
{
return true;
}
-
void SystrayNotificationBackend::ConfigWidget::defaults()
{
_showBubbleBox->setChecked(false);
widgetChanged();
}
-
void SystrayNotificationBackend::ConfigWidget::load()
{
NotificationSettings s;
setChangedState(false);
}
-
void SystrayNotificationBackend::ConfigWidget::save()
{
NotificationSettings s;
projects / quassel.git / blobdiff