#include <QtGlobal>
#include "client.h"
-#include "iconloader.h"
#include "networkmodel.h"
#include "systraynotificationbackend.h"
#include "qtui.h"
SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent)
- :AbstractNotificationBackend(parent),
+ : AbstractNotificationBackend(parent),
m_systrayBackend(NULL)
{
NotificationSettings notificationSettings;
QString backend = notificationSettings.value("Snore/Backend", "Default").toString();
- m_timeout = notificationSettings.value("Snore/Timeout",10).toInt();
+ m_timeout = notificationSettings.value("Snore/Timeout", 10).toInt();
notificationSettings.notify("Snore/Backend", this, SLOT(backendChanged(const QVariant &)));
- notificationSettings.notify("Snore/Backend", this, SLOT(timeoutChanged(const QVariant &)));
+ notificationSettings.notify("Snore/Timeout", this, SLOT(timeoutChanged(const QVariant &)));
//TODO: try to get an instance of the tray icon to be able to show popups
m_snore = new Snore::SnoreCore();
- m_snore->hints().setValue("WINDOWS_APP_ID","QuasselProject.QuasselIRC");
- m_snore->loadPlugins(Snore::PluginContainer::BACKEND);
- Snore::Application *a = new Snore::Application("Quassel",Snore::Icon(DesktopIcon("quassel").toImage()));
+ m_snore->loadPlugins(Snore::SnorePlugin::BACKEND);
+ m_icon = Snore::Icon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")).pixmap(48).toImage());
+ m_application = Snore::Application("Quassel", m_icon);
+ m_application.hints().setValue("WINDOWS_APP_ID","QuasselProject.QuasselIRC");
- connect(m_snore,SIGNAL(actionInvoked(Snore::Notification)),this,SLOT(actionInvoked(Snore::Notification)));
+ connect(m_snore, SIGNAL(actionInvoked(Snore::Notification)), this, SLOT(actionInvoked(Snore::Notification)));
- m_icon = Snore::Icon(DesktopIcon("dialog-information").toImage());
- a->addAlert(new Snore::Alert(tr("Private Message"),tr("Private Message")));
+ m_alert = Snore::Alert(tr("Private Message"), m_icon);
+ m_application.addAlert(m_alert);
- m_snore->addApplication(a);
- m_snore->applicationIsInitialized (a);
+ m_snore->registerApplication(m_application);
backendChanged(QVariant::fromValue(backend));
SnoreNotificationBackend::~SnoreNotificationBackend()
{
- m_snore->removeApplication("Quassel");
+ m_snore->deregisterApplication(m_application);
m_snore->deleteLater();
}
void SnoreNotificationBackend::backendChanged(const QVariant &v)
{
QString backend = v.toString();
- if(backend == "Default")
- {
- if(m_snore->setPrimaryNotificationBackend())//try to find the default backend for the platform
- {
- return;
- }
- }
- else if(backend != "SystemTray")
- {
- if(setSnoreBackend(backend))
- {
+ if (backend != "Default") {
+ if (setSnoreBackend(backend)) {
return;
}
}
void SnoreNotificationBackend::notify(const Notification &n)
{
- if(m_systrayBackend != NULL)
+ if (m_systrayBackend != NULL) {
return;
+ }
QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId);
QString message = QString("<%1> %2").arg(n.sender, n.message);
- Snore::Notification noti("Quassel",tr("Private Message"),title,message,m_icon,m_timeout);
- noti.hints().setValue("QUASSEL_ID",n.notificationId);
- m_notificationIds.insert(n.notificationId,noti.id());
+ Snore::Notification noti(m_application, m_alert, title, message, m_icon, m_timeout);
+ noti.hints().setValue("QUASSEL_ID", n.notificationId);
+ m_notificationIds.insert(n.notificationId, noti.id());
m_snore->broadcastNotification(noti);
}
void SnoreNotificationBackend::close(uint notificationId)
{
- if(m_systrayBackend != NULL)
+ if (m_systrayBackend != NULL) {
return;
+ }
Snore::Notification n = m_snore->getActiveNotificationByID(m_notificationIds.take(notificationId));
- m_snore->requestCloseNotification(n,Snore::NotificationEnums::CloseReasons::CLOSED);
+ m_snore->requestCloseNotification(n, Snore::Notification::CLOSED);
}
void SnoreNotificationBackend::actionInvoked(Snore::Notification n)
void SnoreNotificationBackend::setTraybackend()
{
- if(m_systrayBackend == NULL){
+ if (m_systrayBackend == NULL) {
m_systrayBackend = new SystrayNotificationBackend(this);
QtUi::registerNotificationBackend(m_systrayBackend);
}
bool SnoreNotificationBackend::setSnoreBackend(const QString &backend)
{
- if(m_systrayBackend != NULL){
+ if (m_systrayBackend != NULL) {
QtUi::unregisterNotificationBackend(m_systrayBackend);
delete m_systrayBackend;
m_systrayBackend = NULL;
/***************************************************************************/
-SnoreNotificationBackend::ConfigWidget::ConfigWidget(Snore::SnoreCore *snore,QWidget *parent)
+SnoreNotificationBackend::ConfigWidget::ConfigWidget(Snore::SnoreCore *snore, QWidget *parent)
:SettingsPage("Internal", "SnoreNotification", parent),
m_snore(snore)
{
ui.setupUi(this);
- ui.backends->insertItem(0,"Default");
- ui.backends->insertItems(1,m_snore->notificationBackends());
+ QStringList backends = m_snore->notificationBackends();
+ backends.append("Default");
+ qSort(backends);
+ ui.backends->insertItems(0, backends);
connect(ui.backends, SIGNAL(currentIndexChanged(QString)), SLOT(backendChanged(QString)));
- connect(ui.timeout,SIGNAL(valueChanged(int)),this,SLOT(timeoutChanged(int)));
+ connect(ui.timeout, SIGNAL(valueChanged(int)), this, SLOT(timeoutChanged(int)));
}
void SnoreNotificationBackend::ConfigWidget::backendChanged(const QString &b)
void SnoreNotificationBackend::ConfigWidget::load()
{
NotificationSettings s;
- QString backend = m_snore->primaryNotificationBackend();
- if(backend.isEmpty()){
- backend = "SystemTray";
- }
- int timeout = s.value("Snore/Timeout",10).toInt();
+ QString backend = s.value("Snore/Backend", "Default").toString();
+ int timeout = s.value("Snore/Timeout", 10).toInt();
ui.backends->setCurrentIndex(ui.backends->findText(backend));
ui.timeout->setValue(timeout);
setChangedState(false);
{
NotificationSettings s;
s.setValue("Snore/Backend", ui.backends->currentText());
- s.setValue("Snore/Timeout",ui.timeout->value());
+ s.setValue("Snore/Timeout", ui.timeout->value());
load();
}