X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftaskbarnotificationbackend.cpp;h=c86c93334f3c2467a1f462a06ec054095e64cbae;hp=15e2c88940bfdbe59afa62ca4c7d6282b80f9c48;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp index 15e2c889..c86c9333 100644 --- a/src/qtui/taskbarnotificationbackend.cpp +++ b/src/qtui/taskbarnotificationbackend.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 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 * @@ -15,18 +15,18 @@ * 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 "taskbarnotificationbackend.h" + #include #include #include #include -#include "taskbarnotificationbackend.h" - #include "clientsettings.h" -#include "iconloader.h" +#include "icon.h" #include "mainwin.h" #include "qtui.h" @@ -78,26 +78,26 @@ SettingsPage *TaskbarNotificationBackend::createConfigWidget() const 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(&QSpinBox::valueChanged), this, &ConfigWidget::widgetChanged); }