X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftaskbarnotificationbackend.cpp;h=ef9736fd9c46d0ae817a8559bfa7fee9ccbb238e;hp=9d07bfac7fa8e4987d9763a64c393ca7e0bb9867;hb=54ebc1bf00f4f9a8376629925329f0e72be04662;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49 diff --git a/src/qtui/taskbarnotificationbackend.cpp b/src/qtui/taskbarnotificationbackend.cpp index 9d07bfac..ef9736fd 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-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,15 +18,15 @@ * 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" @@ -79,16 +79,16 @@ SettingsPage *TaskbarNotificationBackend::createConfigWidget() const TaskbarNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "TaskbarNotification", parent) { QHBoxLayout *layout = new QHBoxLayout(this); -#ifdef Q_WS_MAC +#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"));