X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftaskbarnotificationbackend.cpp;h=a782b3160c63181fab83e7702cb9cb23bce9e17a;hp=9d07bfac7fa8e4987d9763a64c393ca7e0bb9867;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49

diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp
index 9d07bfac..a782b316 100644
--- a/src/qtui/taskbarnotificationbackend.cpp
+++ b/src/qtui/taskbarnotificationbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -18,102 +18,95 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "taskbarnotificationbackend.h"
+
 #include <QApplication>
 #include <QCheckBox>
 #include <QHBoxLayout>
 #include <QSpinBox>
 
-#include "taskbarnotificationbackend.h"
-
 #include "clientsettings.h"
-#include "iconloader.h"
+#include "icon.h"
 #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 &notification)
+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)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
-#ifdef Q_WS_MAC
+    auto* layout = new QHBoxLayout(this);
+#ifdef Q_OS_MAC
     layout->addWidget(enabledBox = new QCheckBox(tr("Activate dock entry, timeout:"), this));
 #else
     layout->addWidget(enabledBox = new QCheckBox(tr("Mark taskbar entry, timeout:"), this));
 #endif
-    enabledBox->setIcon(SmallIcon("flag-blue"));
+    enabledBox->setIcon(icon::get("flag-blue"));
     enabledBox->setEnabled(true);
 
     timeoutBox = new QSpinBox(this);
-    timeoutBox->setMinimum(1);
+    timeoutBox->setMinimum(0);
     timeoutBox->setMaximum(99);
     timeoutBox->setSpecialValueText(tr("Unlimited"));
     timeoutBox->setSuffix(tr(" seconds"));
     layout->addWidget(timeoutBox);
     layout->addStretch(20);
 
-    connect(enabledBox, SIGNAL(toggled(bool)), SLOT(widgetChanged()));
-    connect(enabledBox, SIGNAL(toggled(bool)), timeoutBox, SLOT(setEnabled(bool)));
-    connect(timeoutBox, SIGNAL(valueChanged(int)), SLOT(widgetChanged()));
+    connect(enabledBox, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged);
+    connect(enabledBox, &QAbstractButton::toggled, timeoutBox, &QWidget::setEnabled);
+    connect(timeoutBox, selectOverload<int>(&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;