/***************************************************************************
- * Copyright (C) 2005-2014 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 *
* 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"
_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);
}
TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "TaskbarNotification", parent)
{
- QHBoxLayout *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
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);
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);
}