X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsnorenotificationbackend.cpp;h=69ce0e0a16d186a75387b61536813116f44340b3;hp=af23dced3071c1e7ca30f10d863945f97c5e0b8e;hb=65b246cb05413172a0f5b1bb8face5f866f80239;hpb=a43f68a84621d11b61f0e712890a5feb76939553 diff --git a/src/qtui/snorenotificationbackend.cpp b/src/qtui/snorenotificationbackend.cpp index af23dced..69ce0e0a 100644 --- a/src/qtui/snorenotificationbackend.cpp +++ b/src/qtui/snorenotificationbackend.cpp @@ -22,10 +22,9 @@ #include #include -#include +#include #include "client.h" -#include "iconloader.h" #include "networkmodel.h" #include "systraynotificationbackend.h" #include "qtui.h" @@ -33,137 +32,145 @@ #include -#include -#include +#include +#include SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent) - :AbstractNotificationBackend(parent), - m_systrayBackend(NULL) + : AbstractNotificationBackend(parent), + m_icon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png"))) { - NotificationSettings notificationSettings; - QString backend = notificationSettings.value("Snore/Backend", "SystemTray").toString(); - 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 &))); - - //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())); - connect(m_snore,SIGNAL(actionInvoked(Snore::Notification)),this,SLOT(actionInvoked(Snore::Notification))); + Snore::SnoreCore::instance().loadPlugins( +#ifndef HAVE_KDE + Snore::SnorePlugin::Backend | +#endif + Snore::SnorePlugin::SecondaryBackend | Snore::SnorePlugin::Settings); + m_application = Snore::Application("Quassel", m_icon); + m_application.hints().setValue("windows-app-id","QuasselProject.QuasselIRC"); + m_application.hints().setValue("pushover-token", "arNtsi983QSZUqU3KAZrFLKHGFPkdL"); - m_icon = Snore::Icon(DesktopIcon("dialog-information").toImage()); + connect(&Snore::SnoreCore::instance(), SIGNAL(actionInvoked(Snore::Notification)), this, SLOT(actionInvoked(Snore::Notification))); - a->addAlert(new Snore::Alert(tr("Private Message"),tr("Private Message"))); - - m_snore->addApplication(a); - m_snore->applicationIsInitialized (a); - - m_snore->setPrimaryNotificationBackend(backend); -} -SnoreNotificationBackend::~SnoreNotificationBackend(){ - m_snore->removeApplication("Quassel"); - m_snore->deleteLater(); -} + m_alert = Snore::Alert(tr("Private Message"), m_icon); + m_application.addAlert(m_alert); + Snore::SnoreCore::instance().setDefaultApplication(m_application); -void SnoreNotificationBackend::backendChanged(const QVariant &v){ - QString backend = v.toString(); - if(backend == "SystemTray"){ - if(m_systrayBackend == NULL){ - m_systrayBackend = new SystrayNotificationBackend(this); - QtUi::registerNotificationBackend(m_systrayBackend); - } - }else{ - if(m_systrayBackend != NULL){ - QtUi::unregisterNotificationBackend(m_systrayBackend); - delete m_systrayBackend; - m_systrayBackend = NULL; - } - m_snore->setPrimaryNotificationBackend(backend); - } + NotificationSettings notificationSettings; + bool enabled = notificationSettings.value("Snore/Enabled", false).toBool(); + setTraybackend(enabled); + notificationSettings.notify("Snore/Enabled", this, SLOT(setTraybackend(const QVariant &))); } -void SnoreNotificationBackend::timeoutChanged(const QVariant &v){ - m_timeout = v.toInt(); +SnoreNotificationBackend::~SnoreNotificationBackend() +{ + Snore::SnoreCore::instance().deregisterApplication(m_application); } -void SnoreNotificationBackend::notify(const Notification &n){ - if(m_systrayBackend != NULL) +void SnoreNotificationBackend::notify(const Notification &n) +{ +#ifndef HAVE_KDE + if (m_systrayBackend != nullptr) { return; - QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId); + } +#endif + QString title = QString("%1 - %2").arg(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()); - m_snore->broadcastNotification(noti); + Snore::Notification noti(m_application, m_alert, title, message, m_icon); + noti.hints().setValue("QUASSEL_ID", n.notificationId); + m_notificationIds.insert(n.notificationId, noti.id()); + Snore::SnoreCore::instance().broadcastNotification(noti); } -void SnoreNotificationBackend::close(uint notificationId){ - if(m_systrayBackend != NULL) +void SnoreNotificationBackend::close(uint notificationId) +{ +#ifndef HAVE_KDE + if (m_systrayBackend != nullptr) { return; - Snore::Notification n = m_snore->getActiveNotificationByID(m_notificationIds.take(notificationId)); - m_snore->requestCloseNotification(n,Snore::NotificationEnums::CloseReasons::CLOSED); + } +#endif + Snore::Notification n = Snore::SnoreCore::instance().getActiveNotificationByID(m_notificationIds.take(notificationId)); + Snore::SnoreCore::instance().requestCloseNotification(n, Snore::Notification::Closed); } -void SnoreNotificationBackend::actionInvoked(Snore::Notification n){ +void SnoreNotificationBackend::actionInvoked(Snore::Notification n) +{ emit activated(n.hints().value("QUASSEL_ID").toUInt()); } -SettingsPage *SnoreNotificationBackend::createConfigWidget()const{ - return new ConfigWidget(m_snore); +SettingsPage *SnoreNotificationBackend::createConfigWidget()const +{ + return new ConfigWidget(); } -/***************************************************************************/ - -SnoreNotificationBackend::ConfigWidget::ConfigWidget(Snore::SnoreCore *snore,QWidget *parent) - :SettingsPage("Internal", "SnoreNotification", parent), - m_snore(snore) +void SnoreNotificationBackend::setTraybackend(const QVariant &b) { - ui.setupUi(this); - ui.backends->insertItems(0,m_snore->notificationBackends()); - - connect(ui.backends, SIGNAL(currentIndexChanged(QString)), SLOT(backendChanged(QString))); - connect(ui.timeout,SIGNAL(valueChanged(int)),this,SLOT(timeoutChanged(int))); -} - -void SnoreNotificationBackend::ConfigWidget::backendChanged(const QString &b){ - ui.backends->setCurrentIndex(ui.backends->findText(b)); - setChangedState(true); +#ifndef HAVE_KDE + if (!b.toBool()) { + if (m_systrayBackend == nullptr) { + m_systrayBackend = new SystrayNotificationBackend(this); + QtUi::registerNotificationBackend(m_systrayBackend); + } + } else { + if (m_systrayBackend != nullptr) { + QtUi::unregisterNotificationBackend(m_systrayBackend); + m_systrayBackend->deleteLater(); + m_systrayBackend = nullptr; + } + } +#endif + if (b.toBool()) { + Snore::SnoreCore::instance().registerApplication(m_application); + } else { + Snore::SnoreCore::instance().deregisterApplication(m_application); + } } -void SnoreNotificationBackend::ConfigWidget::timeoutChanged(int i){ - ui.timeout->setValue(i); - setChangedState(true); +/***************************************************************************/ +SnoreNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) + :SettingsPage("Internal", "SnoreNotification", parent) +{ + ui.setupUi(this); + connect(ui.useSnoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(useSnnoreChanged(bool))); } -bool SnoreNotificationBackend::ConfigWidget::hasDefaults() const { +bool SnoreNotificationBackend::ConfigWidget::hasDefaults() const +{ return true; } -void SnoreNotificationBackend::ConfigWidget::defaults() { - backendChanged("SystemTray"); - timeoutChanged(10); +void SnoreNotificationBackend::ConfigWidget::defaults() +{ + useSnnoreChanged(false); + ui.widget->reset(); } -void SnoreNotificationBackend::ConfigWidget::load() { +void SnoreNotificationBackend::ConfigWidget::load() +{ NotificationSettings s; - QString backend = s.value("Snore/Backend", "SystemTray").toString(); - int timeout = s.value("Snore/Timeout",10).toInt(); - ui.backends->setCurrentIndex(ui.backends->findText(backend)); - ui.timeout->setValue(timeout); + bool enabled = s.value("Snore/Enabled", false).toBool(); + ui.useSnoreCheckBox->setChecked(enabled); + ui.widget->setEnabled(enabled); setChangedState(false); + QMetaObject::invokeMethod(this, "changed", Qt::QueuedConnection);//hack to make apply and accept button work for snore settings widget } -void SnoreNotificationBackend::ConfigWidget::save() { +void SnoreNotificationBackend::ConfigWidget::save() +{ NotificationSettings s; - s.setValue("Snore/Backend", ui.backends->currentText()); - s.setValue("Snore/Timeout",ui.timeout->value()); + s.setValue("Snore/Enabled", ui.useSnoreCheckBox->isChecked()); + ui.widget->accept(); load(); } + +void SnoreNotificationBackend::ConfigWidget::useSnnoreChanged(bool b) +{ + ui.useSnoreCheckBox->setChecked(b); + ui.widget->setEnabled(b); + setChangedState(true); +} + +