/***************************************************************************
- * 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 <KNotification>
-#include <KNotifyConfigWidget>
+#include "knotificationbackend.h"
+
#include <QTextDocument>
#include <QVBoxLayout>
-#include "knotificationbackend.h"
+#include <KNotifications/KNotification>
+#include <KNotifyConfig/KNotifyConfigWidget>
#include "client.h"
#include "icon.h"
-#include "iconloader.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
+#include "util.h"
KNotificationBackend::KNotificationBackend(QObject *parent)
: AbstractNotificationBackend(parent)
{
- connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
- SLOT(notificationActivated(SystemTray::ActivationReason)));
+ connect(QtUi::mainWindow()->systemTray(), &SystemTray::activated,
+ this, selectOverload<SystemTray::ActivationReason>(&KNotificationBackend::notificationActivated));
updateToolTip();
}
type = "PrivMsgFocused"; break;
}
- QString message = QString("<b><%1></b> %2").arg(n.sender, Qt::escape(n.message));
- KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
+ QString message = QString("<b><%1></b> %2").arg(n.sender, n.message.toHtmlEscaped());
+ KNotification *notification = KNotification::event(type, message, icon::get("dialog-information").pixmap(48), QtUi::mainWindow(),
KNotification::RaiseWidgetOnActivation
|KNotification::CloseWhenWidgetActivated
|KNotification::CloseOnTimeout);
- connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
+ connect(notification, selectOverload<uint>(&KNotification::activated), this, selectOverload<>(&KNotificationBackend::notificationActivated));
notification->setActions(QStringList("View"));
notification->setProperty("notificationId", n.notificationId);
_notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
updateToolTip();
- QtUi::mainWindow()->systemTray()->setAlert(true);
}
{
removeNotificationById(notificationId);
//if(!_notifications.count()) // FIXME make configurable
- QtUi::mainWindow()->systemTray()->setAlert(false);
}
QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(_widget);
- connect(_widget, SIGNAL(changed(bool)), SLOT(widgetChanged(bool)));
+ connect(_widget, &KNotifyConfigWidget::changed, this, &ConfigWidget::widgetChanged);
}