From 8341da231020952f545ebb373d926963d196819e Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 29 Dec 2016 00:35:46 +0100
Subject: [PATCH] refs #846, support message as HTML

---
 src/blackmisc/statusmessage.cpp     | 5 ++++-
 src/blackmisc/statusmessage.h       | 3 ++-
 src/blackmisc/statusmessagelist.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index a9f54aa9f..8d8628dd0 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -420,6 +420,8 @@ namespace BlackMisc
             return CVariant::from(this->getHumanReadablePattern());
         case IndexCategoryHumanReadableOrTechnicalAsString:
             return CVariant::from(this->getHumanOrTechnicalCategoriesAsString());
+        case IndexMessageAsHtml:
+            return CVariant::from(this->toHtml());
         default:
             return CValueObject::propertyByIndex(index);
         }
@@ -455,6 +457,7 @@ namespace BlackMisc
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         switch (i)
         {
+        case IndexMessageAsHtml:
         case IndexMessage:
             return this->getMessage().compare(compareValue.getMessage());
         case IndexSeverity:
@@ -494,7 +497,7 @@ namespace BlackMisc
             break;
         }
         html.append(this->getMessage());
-        if (this->getSeverity() == SeverityInfo) return html;
+        if (this->getSeverity() == SeverityInfo) { return html; }
         html.append("</font>");
         return html;
     }
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 90a797eda..460cc87e5 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -150,7 +150,8 @@ namespace BlackMisc
             IndexCategoryHumanReadableOrTechnicalAsString,
             IndexSeverity,
             IndexSeverityAsString,
-            IndexMessage
+            IndexMessage,
+            IndexMessageAsHtml
         };
 
         //! Construct a message with some specific category.
diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp
index fcf5fa519..6ada60cc7 100644
--- a/src/blackmisc/statusmessagelist.cpp
+++ b/src/blackmisc/statusmessagelist.cpp
@@ -183,7 +183,7 @@ namespace BlackMisc
 
             for (const CPropertyIndex &index : usedIndexes)
             {
-                rowHtml += "<td>" + statusMessage.propertyByIndex(index).toQString(true) + "</td>";
+                rowHtml += "<td>" + statusMessage.propertyByIndex(index).toQString(true).toHtmlEscaped() + "</td>";
             }
 
             rowHtml = "<tr class=\"%1\">" + rowHtml + "</tr>";