From 6802880e525a46f0dbd52de3a7ea24e02a77ac0e Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 15 Jan 2016 02:14:36 +0100
Subject: [PATCH] refs #568, improved display for status message categories

---
 src/blackgui/statusmessageform.cpp | 12 ++++-
 src/blackgui/statusmessageform.ui  | 76 +++++++++++++++---------------
 src/blackmisc/statusmessage.cpp    |  3 +-
 3 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/blackgui/statusmessageform.cpp b/src/blackgui/statusmessageform.cpp
index 9deecfedd..981358e23 100644
--- a/src/blackgui/statusmessageform.cpp
+++ b/src/blackgui/statusmessageform.cpp
@@ -35,7 +35,17 @@ namespace BlackGui
     {
         ui->te_Message->setPlainText(message.getMessage());
         ui->lbl_SeverityIcon->setPixmap(message.toPixmap());
-        ui->le_Categories->setText(message.getHumanReadablePattern());
+        const QString hrc(message.getHumanReadablePattern());
+        if (hrc.isEmpty())
+        {
+            ui->le_Categories->setText(message.getCategories().toQString());
+            ui->le_Categories->setToolTip("");
+        }
+        else
+        {
+            ui->le_Categories->setText(hrc);
+            ui->le_Categories->setToolTip(message.getCategories().toQString());
+        }
         ui->le_Severity->setText(message.getSeverityAsString());
         ui->le_Timestamp->setText(message.getFormattedUtcTimestampYmdhms());
     }
diff --git a/src/blackgui/statusmessageform.ui b/src/blackgui/statusmessageform.ui
index 0d0c560a1..8e3835c04 100644
--- a/src/blackgui/statusmessageform.ui
+++ b/src/blackgui/statusmessageform.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>407</width>
-    <height>129</height>
+    <height>158</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,6 +35,13 @@
    <property name="spacing">
     <number>4</number>
    </property>
+   <item row="2" column="3" colspan="6">
+    <widget class="QLineEdit" name="le_Categories">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="1" colspan="2">
     <widget class="QLabel" name="lbl_Categories">
      <property name="text">
@@ -42,13 +49,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="6">
-    <widget class="QLabel" name="lbl_Timestamp">
-     <property name="text">
-      <string>Timestamp:</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="7">
     <widget class="QLineEdit" name="le_Timestamp">
      <property name="maximumSize">
@@ -62,6 +62,13 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="6">
+    <widget class="QLabel" name="lbl_Timestamp">
+     <property name="text">
+      <string>Timestamp:</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1">
     <widget class="QLabel" name="lbl_Severity">
      <property name="text">
@@ -69,26 +76,6 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="3" colspan="6">
-    <widget class="QLineEdit" name="le_Categories">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QLineEdit" name="le_Severity">
-     <property name="maximumSize">
-      <size>
-       <width>200</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="1" colspan="8">
     <widget class="QPlainTextEdit" name="te_Message">
      <property name="readOnly">
@@ -96,16 +83,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4">
-    <widget class="QLabel" name="lbl_SeverityIcon">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="../blackmisc/blackmisc.qrc">:/diagona/icons/diagona/icons/question.png</pixmap>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="8">
     <spacer name="hs_Top2">
      <property name="orientation">
@@ -119,6 +96,29 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="3">
+    <widget class="QLineEdit" name="le_Severity">
+     <property name="maximumSize">
+      <size>
+       <width>200</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QLabel" name="lbl_SeverityIcon">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../blackmisc/blackmisc.qrc">:/diagona/icons/diagona/icons/question.png</pixmap>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="5">
     <spacer name="hs_Top1">
      <property name="orientation">
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 8ec956a55..20bb01d35 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -116,8 +116,7 @@ namespace BlackMisc
     QString CStatusMessage::getHumanReadablePattern() const
     {
         QStringList patternNames(getHumanReadablePatterns());
-        return patternNames.isEmpty() ?
-               "None" : patternNames.join(", ");
+        return patternNames.isEmpty() ? "" : patternNames.join(", ");
     }
 
     QStringList CStatusMessage::getHumanReadablePatterns() const