uisupport: Provide helpers for dealing with widget changes

[quassel.git] / src / qtui / snorenotificationbackend.cpp

diff --git a/src/qtui/snorenotificationbackend.cpp b/src/qtui/snorenotificationbackend.cpp
index ef1f47d..bdabcf1 100644 (file)
--- a/src/qtui/snorenotificationbackend.cpp
+++ b/src/qtui/snorenotificationbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2016 by Hannah von Reth                            *
+ *   Copyright (C) 2011-2018 by Hannah von Reth                            *
  *   vonreth@kde.org                                                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,25 +20,25 @@
 
 #include "snorenotificationbackend.h"
 
+#include <iostream>
+
 #include <QtGui>
 #include <QtGlobal>
 #include <QMetaObject>
 
+#include <libsnore/snore.h>
+#include <libsnore/notification/notification.h>
+
 #include "client.h"
+#include "icon.h"
 #include "networkmodel.h"
 #include "systraynotificationbackend.h"
 #include "qtui.h"
 
-#include <iostream>
-
-
-#include <libsnore/snore.h>
-#include <libsnore/notification/notification.h>
-
 
 SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent)
-    : AbstractNotificationBackend(parent),
-      m_icon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")))
+    : AbstractNotificationBackend(parent)
+    , m_icon(icon::get("quassel"))
 {
 
     Snore::SnoreCore::instance().loadPlugins(
@@ -50,7 +50,7 @@ SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent)
     m_application.hints().setValue("windows-app-id","QuasselProject.QuasselIRC");
     m_application.hints().setValue("pushover-token", "arNtsi983QSZUqU3KAZrFLKHGFPkdL");
 
-    connect(&Snore::SnoreCore::instance(), SIGNAL(actionInvoked(Snore::Notification)), this, SLOT(actionInvoked(Snore::Notification)));
+    connect(&Snore::SnoreCore::instance(), &Snore::SnoreCore::actionInvoked, this, &SnoreNotificationBackend::actionInvoked);
 
 
     m_alert = Snore::Alert(tr("Private Message"), m_icon);
@@ -124,9 +124,13 @@ void SnoreNotificationBackend::setTraybackend(const QVariant &b)
     }
 #endif
     if (b.toBool()) {
-        Snore::SnoreCore::instance().registerApplication(m_application);
+        if (!Snore::SnoreCore::instance().aplications().contains(m_application.name())) {
+            Snore::SnoreCore::instance().registerApplication(m_application);
+        }
     } else {
-        Snore::SnoreCore::instance().deregisterApplication(m_application);
+        if (Snore::SnoreCore::instance().aplications().contains(m_application.name())) {
+            Snore::SnoreCore::instance().deregisterApplication(m_application);
+        }
     }
 }
 
@@ -136,7 +140,7 @@ SnoreNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent)
     :SettingsPage("Internal", "SnoreNotification", parent)
 {
     ui.setupUi(this);
-    connect(ui.useSnoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(useSnnoreChanged(bool)));
+    connect(ui.useSnoreCheckBox, &QCheckBox::toggled, this, &ConfigWidget::useSnoreChanged);
 }
 
 bool SnoreNotificationBackend::ConfigWidget::hasDefaults() const
@@ -146,7 +150,7 @@ bool SnoreNotificationBackend::ConfigWidget::hasDefaults() const
 
 void SnoreNotificationBackend::ConfigWidget::defaults()
 {
-    useSnnoreChanged(false);
+    useSnoreChanged(false);
     ui.widget->reset();
 }
 
@@ -168,7 +172,7 @@ void SnoreNotificationBackend::ConfigWidget::save()
     load();
 }
 
-void SnoreNotificationBackend::ConfigWidget::useSnnoreChanged(bool b)
+void SnoreNotificationBackend::ConfigWidget::useSnoreChanged(bool b)
 {
     ui.useSnoreCheckBox->setChecked(b);
     ui.widget->setEnabled(b);