From c3c54d132f7c4a010abf4c9f6152c6800f774d97 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Fri, 6 May 2016 15:30:17 -0400
Subject: [PATCH] Reformatting message window text.

---
 src/uas/UASMessageHandler.cc |  8 ++++----
 src/ui/MainWindowInner.qml   | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/uas/UASMessageHandler.cc b/src/uas/UASMessageHandler.cc
index d6cb7b08c..4d6088f0f 100644
--- a/src/uas/UASMessageHandler.cc
+++ b/src/uas/UASMessageHandler.cc
@@ -145,17 +145,17 @@ void UASMessageHandler::handleTextMessage(int, int compId, int severity, QString
     case MAV_SEVERITY_ALERT:
     case MAV_SEVERITY_CRITICAL:
     case MAV_SEVERITY_ERROR:
-        style = QString("color: #f95e5e; font-weight:bold");
+        style = QString("<#E>");
         _errorCount++;
         _errorCountTotal++;
         break;
     case MAV_SEVERITY_NOTICE:
     case MAV_SEVERITY_WARNING:
-        style = QString("color: #f9b55e; font-weight:bold");
+        style = QString("<#I>");
         _warningCount++;
         break;
     default:
-        style = QString("color: #ffffff; font-weight:bold");
+        style = QString("<#N>");
         _normalCount++;
         break;
     }
@@ -200,7 +200,7 @@ void UASMessageHandler::handleTextMessage(int, int compId, int severity, QString
     if (_multiComp) {
         compString = QString(" COMP:%1").arg(compId);
     }
-    message->_setFormatedText(QString("<p><font style=\"%1\">[%2%3]%4 %5</font></p>").arg(style).arg(dateString).arg(compString).arg(severityText).arg(text));
+    message->_setFormatedText(QString("<font style=\"%1\">[%2%3]%4 %5</font><br/>").arg(style).arg(dateString).arg(compString).arg(severityText).arg(text));
 
     if (message->severityIsError()) {
         _latestError = severityText + " " + text;
diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml
index 7a8523b2f..73bcde8a4 100644
--- a/src/ui/MainWindowInner.qml
+++ b/src/ui/MainWindowInner.qml
@@ -229,9 +229,16 @@ Item {
         }
     }
 
+    function formatMessage(message) {
+        message = message.replace(new RegExp("<#E>", "g"), "color: #f95e5e; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;");
+        message = message.replace(new RegExp("<#I>", "g"), "color: #f9b55e; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;");
+        message = message.replace(new RegExp("<#N>", "g"), "color: #ffffff; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;");
+        return message;
+    }
+
     onFormatedMessageChanged: {
         if(messageArea.visible) {
-            messageText.append(formatedMessage)
+            messageText.append(formatMessage(formatedMessage))
             //-- Hack to scroll down
             messageFlick.flick(0,-500)
         }
@@ -242,7 +249,7 @@ Item {
             currentPopUp.close()
         }
         if(QGroundControl.multiVehicleManager.activeVehicleAvailable) {
-            messageText.text = activeVehicle.formatedMessages
+            messageText.text = formatMessage(activeVehicle.formatedMessages)
             //-- Hack to scroll to last message
             for (var i = 0; i < activeVehicle.messageCount; i++)
                 messageFlick.flick(0,-5000)
@@ -372,13 +379,11 @@ Item {
                 readOnly:       true
                 textFormat:     TextEdit.RichText
                 color:          "white"
-                font.family:    ScreenTools.normalFontFamily
-                font.pointSize: ScreenTools.defaultFontPointSize
             }
         }
         //-- Dismiss System Message
         Image {
-            anchors.margins:    ScreenTools.defaultFontPixelHeight
+            //anchors.margins:    ScreenTools.defaultFontPixelHeight
             anchors.top:        parent.top
             anchors.right:      parent.right
             width:              ScreenTools.defaultFontPixelHeight * 1.5
-- 
2.22.0