X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=dd565fc8c5601057968e36de94418845c5699878;hp=4e024daf9eddeb81ea0da2e1313c9c495c870a77;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index 4e024daf..dd565fc8 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -33,24 +33,27 @@ #include "qtui.h" #include "systemtray.h" -SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) +SystrayNotificationBackend::SystrayNotificationBackend(QObject* parent) : AbstractNotificationBackend(parent) { NotificationSettings notificationSettings; notificationSettings.initAndNotify("Systray/ShowBubble", this, &SystrayNotificationBackend::showBubbleChanged, true); - connect(QtUi::mainWindow()->systemTray(), &SystemTray::messageClicked, - this, selectOverload(&SystrayNotificationBackend::onNotificationActivated)); - connect(QtUi::mainWindow()->systemTray(), &SystemTray::activated, - this, selectOverload(&SystrayNotificationBackend::onNotificationActivated)); + connect(QtUi::mainWindow()->systemTray(), + &SystemTray::messageClicked, + this, + selectOverload(&SystrayNotificationBackend::onNotificationActivated)); + connect(QtUi::mainWindow()->systemTray(), + &SystemTray::activated, + this, + selectOverload(&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; @@ -65,7 +68,6 @@ void SystrayNotificationBackend::notify(const Notification &n) updateToolTip(); } - void SystrayNotificationBackend::close(uint notificationId) { QList::iterator i = _notifications.begin(); @@ -81,7 +83,6 @@ void SystrayNotificationBackend::close(uint notificationId) updateToolTip(); } - void SystrayNotificationBackend::onNotificationActivated(uint notificationId) { if (!_blockActivation) { @@ -93,12 +94,11 @@ void SystrayNotificationBackend::onNotificationActivated(uint notificationId) emit activated(notificationId); break; } - ++i; + ++i; } } } - void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationReason reason) { if (reason == SystemTray::Trigger) { @@ -111,9 +111,8 @@ void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationR } } - // 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; @@ -121,38 +120,35 @@ bool SystrayNotificationBackend::eventFilter(QObject *obj, QEvent *event) return AbstractNotificationBackend::eventFilter(obj, event); } - -void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) +void SystrayNotificationBackend::showBubbleChanged(const QVariant& v) { _showBubble = 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(icon::get("dialog-information")); connect(_showBubbleBox, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged); - auto *layout = new QHBoxLayout(this); + auto* layout = new QHBoxLayout(this); layout->addWidget(_showBubbleBox); } - void SystrayNotificationBackend::ConfigWidget::widgetChanged() { bool changed = (_showBubble != _showBubbleBox->isChecked()); @@ -160,20 +156,17 @@ void SystrayNotificationBackend::ConfigWidget::widgetChanged() setChangedState(changed); } - bool SystrayNotificationBackend::ConfigWidget::hasDefaults() const { return true; } - void SystrayNotificationBackend::ConfigWidget::defaults() { _showBubbleBox->setChecked(false); widgetChanged(); } - void SystrayNotificationBackend::ConfigWidget::load() { NotificationSettings s; @@ -182,7 +175,6 @@ void SystrayNotificationBackend::ConfigWidget::load() setChangedState(false); } - void SystrayNotificationBackend::ConfigWidget::save() { NotificationSettings s;