From e0b751cc93387596cc147e0af8c435ce118649f1 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Fri, 26 Jun 2015 15:37:22 +0200
Subject: [PATCH] make sure that test notifications uses the correct markup
 value

---
 src/daemon/trayicon.cpp         | 34 +--------------------------------
 src/daemon/trayicon.h           |  3 ---
 src/libsnore/settingsdialog.cpp |  8 +-------
 src/libsnore/snore.cpp          | 16 ++++++++++++++--
 src/libsnore/snore.h            |  5 +++++
 5 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/src/daemon/trayicon.cpp b/src/daemon/trayicon.cpp
index f102347..7988559 100644
--- a/src/daemon/trayicon.cpp
+++ b/src/daemon/trayicon.cpp
@@ -96,39 +96,7 @@ QSystemTrayIcon *TrayIcon::trayIcon()
 
 void TrayIcon::slotTestNotification()
 {
-    Application app = SnoreCorePrivate::instance()->defaultApplication();
-    Notification noti(app, app.defaultAlert(), "Hello World",
-                      "<i>This is Snore</i><br>"
-                      "<a href=\"https://github.com/TheOneRing/Snorenotify\">Project Website</a><br>"
-                      "1<br>"
-                      "2<br>"
-                      "3<br>"
-                      "4<br>"
-                      "5<br>", app.icon());
-    noti.addAction(Action(1, "Test Action"));
-    SnoreCore::instance().broadcastNotification(noti);
-
-    QTimer *timer = new QTimer(this);
-    m_notifications[timer] = noti;
-    timer->setSingleShot(true);
-    timer->setInterval(noti.timeout() / 2 * 1000);
-    connect(timer, SIGNAL(timeout()), this, SLOT(sloutUpdateTestNotification()));
-    timer->start();
-
-    //    SnoreCore::instance().deregisterApplication(app);
-}
-
-void TrayIcon::sloutUpdateTestNotification()
-{
-    QTimer *timer = qobject_cast<QTimer *>(sender());
-    Notification noti = m_notifications.take(timer);
-    Notification update(noti, "Hello World",
-                        "<b>This is Snore</b><br>"
-                        "<u>This icon is quite a long line of text, isnt it I think it is what do you think? btw the icon should be in color</u><br>"
-                        "<a href=\"https://github.com/TheOneRing/Snorenotify\">Project Website</a>",
-                        Icon("http://winkde.org/~pvonreth/other/kde-logo.png"));
-    SnoreCore::instance().broadcastNotification(update);
-    timer->deleteLater();
+    SnoreCore::instance().displayExapleNotification();
 }
 
 void TrayIcon::slotSettings()
diff --git a/src/daemon/trayicon.h b/src/daemon/trayicon.h
index 2116300..f3d6a7c 100644
--- a/src/daemon/trayicon.h
+++ b/src/daemon/trayicon.h
@@ -42,11 +42,8 @@ private:
     QActionGroup *m_backendActions;
     Snore::SettingsDialog *m_settings;
 
-    QHash<QTimer *, Snore::Notification> m_notifications;
-
 public slots:
     void slotTestNotification();
-    void sloutUpdateTestNotification();
     void slotSettings();
 };
 
diff --git a/src/libsnore/settingsdialog.cpp b/src/libsnore/settingsdialog.cpp
index 1898139..72f5689 100644
--- a/src/libsnore/settingsdialog.cpp
+++ b/src/libsnore/settingsdialog.cpp
@@ -74,13 +74,7 @@ void SettingsDialog::initTabs()
 
 void Snore::SettingsDialog::on_pushButton_clicked()
 {
-    Application app = SnoreCorePrivate::instance()->defaultApplication();
-    Notification noti(app, app.defaultAlert(), tr("Hello World"),
-                      QString("<i>%1</i><br>"
-                              "<a href=\"https://github.com/Snorenotify/Snorenotify\">%2</a><br>").arg(tr("This is Snore"), tr("Project Website")),
-                      app.icon());
-    noti.addAction(Action(1, tr("Test Action")));
-    SnoreCore::instance().broadcastNotification(noti);
+    SnoreCore::instance().displayExapleNotification();
 }
 
 void SettingsDialog::load()
diff --git a/src/libsnore/snore.cpp b/src/libsnore/snore.cpp
index df2cf39..80a4320 100644
--- a/src/libsnore/snore.cpp
+++ b/src/libsnore/snore.cpp
@@ -27,8 +27,6 @@
 
 #include "version.h"
 
-#include <memory>
-
 #include <QSettings>
 #include <QThread>
 
@@ -232,3 +230,17 @@ Notification SnoreCore::getActiveNotificationByID(uint id) const
     Q_D(const SnoreCore);
     return d->m_activeNotifications.value(id);
 }
+
+
+void SnoreCore::displayExapleNotification()
+{
+    Application app = SnoreCorePrivate::instance()->defaultApplication();
+    QString text = QString("<i>%1</i><br>"
+                          "<a href=\"https://github.com/Snorenotify/Snorenotify\">%2</a><br>").arg(tr("This is Snore"), tr("Project Website"));
+    if(!app.constHints().value("use-markup").toBool()) {
+        text = Utils::normaliseMarkup(text, Utils::NO_MARKUP);
+    }
+    Notification noti(app, app.defaultAlert(), tr("Hello World"), text, app.icon());
+    noti.addAction(Action(1, tr("Test Action")));
+    broadcastNotification(noti);
+}
diff --git a/src/libsnore/snore.h b/src/libsnore/snore.h
index 5d043e1..f7635d5 100644
--- a/src/libsnore/snore.h
+++ b/src/libsnore/snore.h
@@ -77,6 +77,11 @@ public:
      */
     void broadcastNotification(Notification notification);
 
+    /**
+     * Displays a example notification.
+     */
+    void displayExapleNotification();
+
     /**
      * Register an application.
      * Each application should only be registered once.