X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Ftaskbarnotificationbackend.cpp;h=a782b3160c63181fab83e7702cb9cb23bce9e17a;hb=ec747d2e6065e645e2cd768abc84923ef6a19705;hp=8b8b6c87253824c050dcdd4ede27dc40710f9ad2;hpb=fcacaaf16551524c7ebb6114254d005274cc3d63;p=quassel.git diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp index 8b8b6c87..a782b316 100644 --- a/src/qtui/taskbarnotificationbackend.cpp +++ b/src/qtui/taskbarnotificationbackend.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -30,55 +30,50 @@ #include "mainwin.h" #include "qtui.h" -TaskbarNotificationBackend::TaskbarNotificationBackend(QObject *parent) +TaskbarNotificationBackend::TaskbarNotificationBackend(QObject* parent) : AbstractNotificationBackend(parent) { NotificationSettings notificationSettings; _enabled = notificationSettings.value("Taskbar/Enabled", true).toBool(); _timeout = notificationSettings.value("Taskbar/Timeout", 0).toInt(); - notificationSettings.notify("Taskbar/Enabled", this, SLOT(enabledChanged(const QVariant &))); - notificationSettings.notify("Taskbar/Timeout", this, SLOT(timeoutChanged(const QVariant &))); + notificationSettings.notify("Taskbar/Enabled", this, &TaskbarNotificationBackend::enabledChanged); + notificationSettings.notify("Taskbar/Timeout", this, &TaskbarNotificationBackend::timeoutChanged); } - -void TaskbarNotificationBackend::notify(const Notification ¬ification) +void TaskbarNotificationBackend::notify(const Notification& notification) { if (_enabled && (notification.type == Highlight || notification.type == PrivMsg)) { QApplication::alert(QtUi::mainWindow(), _timeout); } } - void TaskbarNotificationBackend::close(uint notificationId) { Q_UNUSED(notificationId); } - -void TaskbarNotificationBackend::enabledChanged(const QVariant &v) +void TaskbarNotificationBackend::enabledChanged(const QVariant& v) { _enabled = v.toBool(); } - -void TaskbarNotificationBackend::timeoutChanged(const QVariant &v) +void TaskbarNotificationBackend::timeoutChanged(const QVariant& v) { _timeout = v.toInt(); } - -SettingsPage *TaskbarNotificationBackend::createConfigWidget() const +SettingsPage* TaskbarNotificationBackend::createConfigWidget() const { return new ConfigWidget(); } - /***************************************************************************/ -TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "TaskbarNotification", parent) +TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget* parent) + : SettingsPage("Internal", "TaskbarNotification", parent) { - auto *layout = new QHBoxLayout(this); + auto* layout = new QHBoxLayout(this); #ifdef Q_OS_MAC layout->addWidget(enabledBox = new QCheckBox(tr("Activate dock entry, timeout:"), this)); #else @@ -97,23 +92,21 @@ TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : Settin connect(enabledBox, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged); connect(enabledBox, &QAbstractButton::toggled, timeoutBox, &QWidget::setEnabled); - connect(timeoutBox, SIGNAL(valueChanged(int)), SLOT(widgetChanged())); + connect(timeoutBox, selectOverload(&QSpinBox::valueChanged), this, &ConfigWidget::widgetChanged); } - void TaskbarNotificationBackend::ConfigWidget::widgetChanged() { - bool changed = (enabled != enabledBox->isChecked() || timeout/1000 != timeoutBox->value()); - if (changed != hasChanged()) setChangedState(changed); + bool changed = (enabled != enabledBox->isChecked() || timeout / 1000 != timeoutBox->value()); + if (changed != hasChanged()) + setChangedState(changed); } - bool TaskbarNotificationBackend::ConfigWidget::hasDefaults() const { return true; } - void TaskbarNotificationBackend::ConfigWidget::defaults() { enabledBox->setChecked(true); @@ -121,7 +114,6 @@ void TaskbarNotificationBackend::ConfigWidget::defaults() widgetChanged(); } - void TaskbarNotificationBackend::ConfigWidget::load() { NotificationSettings s; @@ -129,12 +121,11 @@ void TaskbarNotificationBackend::ConfigWidget::load() timeout = s.value("Taskbar/Timeout", 0).toInt(); enabledBox->setChecked(enabled); - timeoutBox->setValue(timeout/1000); + timeoutBox->setValue(timeout / 1000); setChangedState(false); } - void TaskbarNotificationBackend::ConfigWidget::save() { NotificationSettings s;