From fe840613cbc6b77266e2e755a623e7d9e2246c23 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 7 Feb 2019 02:55:04 +0100
Subject: [PATCH] Ref T529, added "IndexSeverityAsIcon", use logic sort order

---
 src/blackgui/models/statusmessagelistmodel.cpp | 4 ++--
 src/blackmisc/statusmessage.cpp                | 9 ++++++++-
 src/blackmisc/statusmessage.h                  | 6 +++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/blackgui/models/statusmessagelistmodel.cpp b/src/blackgui/models/statusmessagelistmodel.cpp
index 451499be7..e696153de 100644
--- a/src/blackgui/models/statusmessagelistmodel.cpp
+++ b/src/blackgui/models/statusmessagelistmodel.cpp
@@ -86,7 +86,7 @@ namespace BlackGui
             case Detailed:
                 {
                     m_columns.addColumn(CColumn("time", CStatusMessage::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHmsz())));
-                    CColumn col = CColumn("severity", CStatusMessage::IndexIcon);
+                    CColumn col = CColumn("severity", CStatusMessage::IndexSeverityAsIcon);
                     col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
                     m_columns.addColumn(col);
                     m_columns.addColumn(CColumn::standardString("message", CStatusMessage::IndexMessage));
@@ -99,7 +99,7 @@ namespace BlackGui
             case Simplified:
                 {
                     m_columns.addColumn(CColumn("time", CStatusMessage::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHmsz())));
-                    CColumn col = CColumn("severity", CStatusMessage::IndexIcon);
+                    CColumn col = CColumn("severity", CStatusMessage::IndexSeverityAsIcon);
                     col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
                     m_columns.addColumn(col);
                     m_columns.addColumn(CColumn::standardString("message", CStatusMessage::IndexMessage));
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 37ba9fc95..0952dec0b 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -413,6 +413,11 @@ namespace BlackMisc
         return severityToString(m_severity);
     }
 
+    const CIcon &CStatusMessage::getSeverityAsIcon() const
+    {
+        return convertToIcon(m_severity);
+    }
+
     const QStringList &CStatusMessage::allSeverityStrings()
     {
         static const QStringList all { severityToString(SeverityDebug), severityToString(SeverityInfo), severityToString(SeverityWarning), severityToString(SeverityError) };
@@ -430,6 +435,7 @@ namespace BlackMisc
         case IndexMessage: return CVariant::from(this->getMessage());
         case IndexSeverity: return CVariant::from(m_severity);
         case IndexSeverityAsString: return CVariant::from(this->getSeverityAsString());
+        case IndexSeverityAsIcon: return CVariant::from(this->getSeverityAsIcon());
         case IndexCategoriesAsString: return CVariant::from(m_categories.toQString());
         case IndexCategoriesHumanReadableAsString: return CVariant::from(this->getHumanReadablePattern());
         case IndexCategoryHumanReadableOrTechnicalAsString: return CVariant::from(this->getHumanOrTechnicalCategoriesAsString());
@@ -467,8 +473,9 @@ namespace BlackMisc
         case IndexMessageAsHtml:
         case IndexMessage:
             return this->getMessage().compare(compareValue.getMessage());
+        case IndexSeverityAsString:
+        case IndexSeverityAsIcon:
         case IndexSeverity: return Compare::compare(this->getSeverity(), compareValue.getSeverity());
-        case IndexSeverityAsString: return this->getSeverityAsString().compare(compareValue.getSeverityAsString());
         case IndexCategoriesAsString: return this->getCategoriesAsString().compare(compareValue.getCategoriesAsString());
         case IndexCategoriesHumanReadableAsString: return this->getHumanReadablePattern().compare(compareValue.getHumanReadablePattern());
         case IndexCategoryHumanReadableOrTechnicalAsString: return this->getHumanOrTechnicalCategoriesAsString().compare(compareValue.getHumanOrTechnicalCategoriesAsString());
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 3d57f3b9f..7033747d0 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -315,6 +315,7 @@ namespace BlackMisc
             IndexCategoryHumanReadableOrTechnicalAsString,
             IndexSeverity,
             IndexSeverityAsString,
+            IndexSeverityAsIcon,
             IndexMessage,
             IndexMessageNoLineBreaks,
             IndexMessageAsHtml
@@ -464,11 +465,14 @@ namespace BlackMisc
         void setCategories(const CLogCategoryList &categories) { this->m_categories = categories; }
 
         //! Representing icon
-        CIcon toIcon() const { return convertToIcon(*this); }
+        const CIcon &toIcon() const { return convertToIcon(*this); }
 
         //! Severity as string
         const QString &getSeverityAsString() const;
 
+        //! Severity as icon
+        const CIcon &getSeverityAsIcon() const;
+
         //! Severity as string
         static const QString &severityToString(StatusSeverity severity);