/***************************************************************************
- * Copyright (C) 2005-2010 by the Quassel Project *
+ * Copyright (C) 2005-2018 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 <QVBoxLayout>
-
-#include "systraynotificationbackend.h"
+#include <QHBoxLayout>
#include "client.h"
#include "clientsettings.h"
#include "systemtray.h"
SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
- : AbstractNotificationBackend(parent),
- _blockActivation(false)
+ : AbstractNotificationBackend(parent)
{
- NotificationSettings notificationSettings;
- notificationSettings.initAndNotify("Systray/ShowBubble", this, SLOT(showBubbleChanged(QVariant)), true);
- notificationSettings.initAndNotify("Systray/Animate", this, SLOT(animateChanged(QVariant)), true);
+ NotificationSettings notificationSettings;
+ 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);
+ QApplication::instance()->installEventFilter(this);
- updateToolTip();
+ updateToolTip();
}
-void SystrayNotificationBackend::notify(const Notification &n) {
- if(n.type != Highlight && n.type != PrivMsg)
- return;
- _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::notify(const Notification &n)
+{
+ if (n.type != Highlight && n.type != PrivMsg)
+ return;
- if(_animate)
- QtUi::mainWindow()->systemTray()->setAlert(true);
+ _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);
+ }
- updateToolTip();
+ updateToolTip();
}
-void SystrayNotificationBackend::close(uint notificationId) {
- QList<Notification>::iterator i = _notifications.begin();
- while(i != _notifications.end()) {
- if(i->notificationId == notificationId)
- i = _notifications.erase(i);
- else
- ++i;
- }
- QtUi::mainWindow()->systemTray()->closeMessage(notificationId);
+void SystrayNotificationBackend::close(uint notificationId)
+{
+ QList<Notification>::iterator i = _notifications.begin();
+ while (i != _notifications.end()) {
+ if (i->notificationId == notificationId)
+ i = _notifications.erase(i);
+ else
+ ++i;
+ }
- if(!_notifications.count())
- QtUi::mainWindow()->systemTray()->setAlert(false);
+ QtUi::mainWindow()->systemTray()->closeMessage(notificationId);
- updateToolTip();
+ updateToolTip();
}
-void SystrayNotificationBackend::notificationActivated(uint notificationId) {
- if(!_blockActivation) {
- if(QtUi::mainWindow()->systemTray()->isAlerted()) {
- _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);
- } else
- GraphicalUi::toggleMainWidget();
- }
-}
-void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
- if(reason == SystemTray::Trigger) {
- notificationActivated(0);
- }
+void SystrayNotificationBackend::onNotificationActivated(uint notificationId)
+{
+ if (!_blockActivation) {
+ 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;
+ }
+ }
+}
+
+
+void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationReason reason)
+{
+ if (reason == SystemTray::Trigger) {
+ 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) {
- if(event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonRelease) {
- _blockActivation = false;
- }
- return AbstractNotificationBackend::eventFilter(obj, 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) {
- _showBubble = v.toBool();
-}
-void SystrayNotificationBackend::animateChanged(const QVariant &v) {
- _animate = v.toBool();
+void SystrayNotificationBackend::showBubbleChanged(const QVariant &v)
+{
+ _showBubble = v.toBool();
}
-void SystrayNotificationBackend::updateToolTip() {
- QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
- _notifications.count()? tr("%n pending highlights", "", _notifications.count()) : QString());
+
+void SystrayNotificationBackend::updateToolTip()
+{
+ QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
+ _notifications.count() ? tr("%n pending highlight(s)", "", _notifications.count()) : QString());
}
-SettingsPage *SystrayNotificationBackend::createConfigWidget() const {
- return new 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();
}
projects / quassel.git / blobdiff