Vehicle Messages indicator is now part of Main Status Indicator

Also main flight status text ("Flying") is no longer displayed in a marquee control, just regular text now
mavlink · Mar 4, 2025 · ac9de96 · ac9de96
1 parent 716e9cc
commit ac9de96
Show file tree

Hide file tree

Showing 16 changed files with 231 additions and 322 deletions.
diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc
@@ -5,7 +5,6 @@
 		<file alias="VehicleGPSIndicator.qml">../src/UI/toolbar/VehicleGPSIndicator.qml</file>
 		<file alias="JoystickIndicator.qml">../src/UI/toolbar/JoystickIndicator.qml</file>
 		<file alias="LinkIndicator.qml">../src/UI/toolbar/LinkIndicator.qml</file>
-		<file alias="MessageIndicator.qml">../src/UI/toolbar/MessageIndicator.qml</file>
 		<file alias="ModeIndicator.qml">../src/UI/toolbar/ModeIndicator.qml</file>
 		<file alias="MultiVehicleSelector.qml">../src/UI/toolbar/MultiVehicleSelector.qml</file>
 		<file alias="RCRSSIIndicator.qml">../src/UI/toolbar/RCRSSIIndicator.qml</file>

diff --git a/qgcresources.qrc b/qgcresources.qrc
@@ -48,6 +48,7 @@
         <file alias="takeoff.svg">resources/takeoff.svg</file>
         <file alias="terrain.svg">resources/terrain.svg</file>
         <file alias="TrashDelete.svg">resources/TrashDelete.svg</file>
+        <file alias="VehicleMessages.png">resources/VehicleMessages.png</file>
         <file alias="waves.svg">resources/waves.svg</file>
         <file alias="wind-guru.svg">resources/wind-guru.svg</file>
         <file alias="wind-rose.svg">resources/wind-rose.svg</file>

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
@@ -5,7 +5,6 @@
         <file alias="VehicleGPSIndicator.qml">src/UI/toolbar/VehicleGPSIndicator.qml</file>
         <file alias="JoystickIndicator.qml">src/UI/toolbar/JoystickIndicator.qml</file>
         <file alias="LinkIndicator.qml">src/UI/toolbar/LinkIndicator.qml</file>
-        <file alias="MessageIndicator.qml">src/UI/toolbar/MessageIndicator.qml</file>
         <file alias="ModeIndicator.qml">src/UI/toolbar/ModeIndicator.qml</file>
         <file alias="MultiVehicleSelector.qml">src/UI/toolbar/MultiVehicleSelector.qml</file>
         <file alias="RCRSSIIndicator.qml">src/UI/toolbar/RCRSSIIndicator.qml</file>
@@ -205,6 +204,7 @@
         <file alias="QGroundControl/Controls/TransectStyleComplexItemTabBar.qml">src/PlanView/TransectStyleComplexItemTabBar.qml</file>
         <file alias="QGroundControl/Controls/TransectStyleComplexItemTerrainFollow.qml">src/PlanView/TransectStyleComplexItemTerrainFollow.qml</file>
         <file alias="QGroundControl/Controls/ValueSlider.qml">src/QmlControls/ValueSlider.qml</file>
+        <file alias="QGroundControl/Controls/VehicleMessageList.qml">src/UI/toolbar/VehicleMessageList.qml</file>
         <file alias="QGroundControl/Controls/VehicleRotationCal.qml">src/QmlControls/VehicleRotationCal.qml</file>
         <file alias="QGroundControl/Controls/VehicleSummaryRow.qml">src/QmlControls/VehicleSummaryRow.qml</file>
         <file alias="QGroundControl/Controls/VTOLLandingPatternMapVisual.qml">src/PlanView/VTOLLandingPatternMapVisual.qml</file>

diff --git a/resources/VehicleMessages.png b/resources/VehicleMessages.png
diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
@@ -213,7 +213,6 @@ const QVariantList& ArduSubFirmwarePlugin::toolIndicators(const Vehicle* vehicle
     //-- Sub specific list of indicators (Enter your modified list here)
     if(_toolIndicators.size() == 0) {
         _toolIndicators = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/JoystickIndicator.qml")),
         });

diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -310,7 +310,6 @@ const QVariantList& FirmwarePlugin::toolIndicators(const Vehicle*)
     if(_toolIndicatorList.size() == 0) {
         _toolIndicatorList = QVariantList({
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/FlightModeIndicator.qml")),
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/VehicleGPSIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")),

diff --git a/src/FlightDisplay/FlyView.qml b/src/FlightDisplay/FlyView.qml
@@ -69,8 +69,8 @@ Item {
         toolstrip.adjustToolInset(newToolInset)
     }
 
-    function dropMessageIndicatorTool() {
-        toolbar.dropMessageIndicatorTool();
+    function dropMainStatusIndicatorTool() {
+        toolbar.dropMainStatusIndicatorTool();
     }
 
     QGCToolInsets {

diff --git a/src/MAVLink/StatusTextHandler.cc b/src/MAVLink/StatusTextHandler.cc
@@ -373,8 +373,18 @@ void StatusTextHandler::_handleTextMessage(uint32_t newCount, MessageType messag
         emit messageCountChanged(messageCount());
     }
 
-    if (messageType != m_messageType) {
-        m_messageType = messageType;
+    // messageType represents the worst message which hasn't been viewed yet
+    MessageType newMessageType = MessageType::MessageNone;
+    if (getErrorCount() > 0) {
+        newMessageType = MessageType::MessageError;
+    } else if (getWarningCount() > 0) {
+        newMessageType = MessageType::MessageWarning;
+    } else if (getNormalCount() > 0) {
+        newMessageType = MessageType::MessageNormal;
+    }
+
+    if (newMessageType != m_messageType) {
+        m_messageType = newMessageType;
         emit messageTypeChanged();
     }
 }
diff --git a/src/MissionManager/PlanManager.cc b/src/MissionManager/PlanManager.cc
@@ -77,7 +77,7 @@ void PlanManager::writeMissionItems(const QList<MissionItem*>& missionItems)
 
     bool skipFirstItem = _planType == MAV_MISSION_TYPE_MISSION && !_vehicle->firmwarePlugin()->sendHomePositionToVehicle();
 
-    if (skipFirstItem) {
+    if (skipFirstItem && missionItems.count() > 0) {
         // First item is not going to be moved to _writeMissionItems, free it now.
         delete missionItems[0];
     }

diff --git a/src/QmlControls/QGroundControl/Controls/qmldir b/src/QmlControls/QGroundControl/Controls/qmldir
@@ -127,5 +127,6 @@ TransectStyleComplexItemTabBar          1.0 TransectStyleComplexItemTabBar.qml
 TransectStyleComplexItemTerrainFollow   1.0 TransectStyleComplexItemTerrainFollow.qml
 TransectStyleMapVisuals                 1.0 TransectStyleMapVisuals.qml
 ValueSlider                             1.0 ValueSlider.qml
+VehicleMessageList                      1.0 VehicleMessageList.qml
 VehicleRotationCal                      1.0 VehicleRotationCal.qml
 VehicleSummaryRow                       1.0 VehicleSummaryRow.qml
diff --git a/src/UI/MainRootWindow.qml b/src/UI/MainRootWindow.qml
@@ -561,28 +561,27 @@ ApplicationWindow {
     function showCriticalVehicleMessage(message) {
         closeIndicatorDrawer()
         if (criticalVehicleMessagePopup.visible || QGroundControl.videoManager.fullScreen) {
-            // We received additional wanring message while an older warning message was still displayed.
+            // We received additional warning message while an older warning message was still displayed.
             // When the user close the older one drop the message indicator tool so they can see the rest of them.
-            criticalVehicleMessagePopup.dropMessageIndicatorOnClose = true
+            criticalVehicleMessagePopup.additionalCriticalMessagesReceived = true
         } else {
             criticalVehicleMessagePopup.criticalVehicleMessage      = message
-            criticalVehicleMessagePopup.dropMessageIndicatorOnClose = false
+            criticalVehicleMessagePopup.additionalCriticalMessagesReceived = false
             criticalVehicleMessagePopup.open()
         }
     }
 
     Popup {
         id:                 criticalVehicleMessagePopup
-        y:                  ScreenTools.defaultFontPixelHeight
+        y:                  ScreenTools.toolbarHeight + ScreenTools.defaultFontPixelHeight
         x:                  Math.round((mainWindow.width - width) * 0.5)
         width:              mainWindow.width  * 0.55
         height:             criticalVehicleMessageText.contentHeight + ScreenTools.defaultFontPixelHeight * 2
         modal:              false
         focus:              true
-        closePolicy:        Popup.CloseOnEscape
 
-        property alias  criticalVehicleMessage:        criticalVehicleMessageText.text
-        property bool   dropMessageIndicatorOnClose:   false
+        property alias  criticalVehicleMessage:             criticalVehicleMessageText.text
+        property bool   additionalCriticalMessagesReceived: false
 
         background: Rectangle {
             anchors.fill:   parent
@@ -624,7 +623,7 @@ ApplicationWindow {
                 border.width:               1
                 width:                      additionalErrorsLabel.contentWidth + _margins
                 height:                     additionalErrorsLabel.contentHeight + _margins
-                visible:                    criticalVehicleMessagePopup.dropMessageIndicatorOnClose
+                visible:                    criticalVehicleMessagePopup.additionalCriticalMessagesReceived
 
                 property real _margins: ScreenTools.defaultFontPixelHeight * 0.25
 
@@ -651,10 +650,11 @@ ApplicationWindow {
             anchors.fill: parent
             onClicked: {
                 criticalVehicleMessagePopup.close()
-                if (criticalVehicleMessagePopup.dropMessageIndicatorOnClose) {
-                    criticalVehicleMessagePopup.dropMessageIndicatorOnClose = false;
+                if (criticalVehicleMessagePopup.additionalCriticalMessagesReceived) {
+                    criticalVehicleMessagePopup.additionalCriticalMessagesReceived = false;
+                    flyView.dropMainStatusIndicatorTool();
+                } else {
                     QGroundControl.multiVehicleManager.activeVehicle.resetErrorLevelMessages();
-                    flyView.dropMessageIndicatorTool();
                 }
             }
         }

diff --git a/src/UI/toolbar/FlyViewToolBar.qml b/src/UI/toolbar/FlyViewToolBar.qml
@@ -29,8 +29,8 @@ Rectangle {
     property bool   _communicationLost: _activeVehicle ? _activeVehicle.vehicleLinkManager.communicationLost : false
     property color  _mainStatusBGColor: qgcPal.brandingPurple
 
-    function dropMessageIndicatorTool() {
-        toolIndicators.dropMessageIndicatorTool();
+    function dropMainStatusIndicatorTool() {
+        mainStatusIndicator.dropMainStatusIndicator();
     }
 
     QGCPalette { id: qgcPal }
@@ -72,6 +72,7 @@ Rectangle {
         }
 
         MainStatusIndicator {
+            id: mainStatusIndicator
             Layout.preferredHeight: viewButtonRow.height
         }
 

diff --git a/src/UI/toolbar/FlyViewToolBarIndicators.qml b/src/UI/toolbar/FlyViewToolBarIndicators.qml
@@ -24,10 +24,6 @@ Row {
     property var  _activeVehicle:           QGroundControl.multiVehicleManager.activeVehicle
     property real _toolIndicatorMargins:    ScreenTools.defaultFontPixelHeight * 0.66
 
-    function dropMessageIndicatorTool() {
-        toolIndicatorsRepeater.dropMessageIndicatorTool();
-    }
-
     Repeater {
         id:     appRepeater
         model:  QGroundControl.corePlugin.toolBarIndicators
@@ -43,15 +39,6 @@ Row {
         id:     toolIndicatorsRepeater
         model:  _activeVehicle ? _activeVehicle.toolIndicators : []
 
-        function dropMessageIndicatorTool() {
-            for (var i=0; i<count; i++) {
-                var thisTool = itemAt(i);
-                if (thisTool.item.dropMessageIndicator) {
-                    thisTool.item.dropMessageIndicator();
-                }
-            }
-        }
-
         Loader {
             anchors.top:        parent.top
             anchors.bottom:     parent.bottom