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 @@ 0 0 407 - 129 + 158 @@ -35,6 +35,13 @@ 4 + + + + true + + + @@ -42,13 +49,6 @@ - - - - Timestamp: - - - @@ -62,6 +62,13 @@ + + + + Timestamp: + + + @@ -69,26 +76,6 @@ - - - - true - - - - - - - - 200 - 16777215 - - - - true - - - @@ -96,16 +83,6 @@ - - - - - - - :/diagona/icons/diagona/icons/question.png - - - @@ -119,6 +96,29 @@ + + + + + 200 + 16777215 + + + + true + + + + + + + + + + :/diagona/icons/diagona/icons/question.png + + + 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