RemoteIDIndicator.qml: Fix indicator on light palette

mavlink · Feb 14, 2025 · 1ba4b6d · 1ba4b6d
1 parent a8ab437
commit 1ba4b6d
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 48 deletions.
diff --git a/qgcimages.qrc b/qgcimages.qrc
@@ -160,10 +160,8 @@
         <file alias="RidEmergencyBackground.svg">src/UI/toolbar/Images/RidEmergencyBackground.svg</file>
         <file alias="RidFlagBackgroundGreen.svg">src/UI/toolbar/Images/RidFlagBackgroundGreen.svg</file>
         <file alias="RidFlagBackgroundRed.svg">src/UI/toolbar/Images/RidFlagBackgroundRed.svg</file>
-        <file alias="RidIconGreen.svg">src/UI/toolbar/Images/RidIconGreen.svg</file>
-        <file alias="RidIconGrey.svg">src/UI/toolbar/Images/RidIconGrey.svg</file>
-        <file alias="RidIconRed.svg">src/UI/toolbar/Images/RidIconRed.svg</file>
-        <file alias="RidIconYellow.svg">src/UI/toolbar/Images/RidIconYellow.svg</file>
+        <file alias="RidIconMan.svg">src/UI/toolbar/Images/RidIconMan.svg</file>
+        <file alias="RidIconText.svg">src/UI/toolbar/Images/RidIconText.svg</file>
         <file alias="RC.svg">src/UI/toolbar/Images/RC.svg</file>
         <file alias="RCLoss.svg">src/AutoPilotPlugins/PX4/Images/RCLoss.svg</file>
         <file alias="RCLossLight.svg">src/AutoPilotPlugins/PX4/Images/RCLossLight.svg</file>

diff --git a/src/UI/toolbar/Images/RidIconGreen.svg b/src/UI/toolbar/Images/RidIconGreen.svg
diff --git a/src/UI/toolbar/Images/RidIconGrey.svg b/src/UI/toolbar/Images/RidIconGrey.svg
diff --git a/src/UI/toolbar/Images/RidIconMan.svg b/src/UI/toolbar/Images/RidIconMan.svg
diff --git a/src/UI/toolbar/Images/RidIconRed.svg b/src/UI/toolbar/Images/RidIconRed.svg
diff --git a/src/UI/toolbar/Images/RidIconText.svg b/src/UI/toolbar/Images/RidIconText.svg
diff --git a/src/UI/toolbar/Images/RidIconYellow.svg b/src/UI/toolbar/Images/RidIconYellow.svg
diff --git a/src/UI/toolbar/RemoteIDIndicator.qml b/src/UI/toolbar/RemoteIDIndicator.qml
@@ -51,22 +51,22 @@ Item {
         EU
     }
 
-    function getRIDIcon() {
+    function getRidColor() {
         switch (remoteIDState) {
             case RemoteIDIndicator.RIDState.HEALTHY: 
-                return "/qmlimages/RidIconGreen.svg"
+                return qgcPal.colorGreen
                 break
             case RemoteIDIndicator.RIDState.WARNING: 
-                return "/qmlimages/RidIconYellow.svg"
+                return qgcPal.colorYellow
                 break
             case RemoteIDIndicator.RIDState.ERROR: 
-                return "/qmlimages/RidIconRed.svg"
+                return qgcPal.colorRed
                 break
             case RemoteIDIndicator.RIDState.UNAVAILABLE: 
-                return "/qmlimages/RidIconGrey.svg"
+                return qgcPal.colorGrey
                 break
             default:
-                return "/qmlimages/RidIconGrey.svg"
+                return qgcPal.colorGrey
         }
     }
 
@@ -96,14 +96,24 @@ Item {
         }
     }
 
-    Image {
+    QGCColoredImage {
         id:                 remoteIDIcon
         width:              height
         anchors.top:        parent.top
         anchors.bottom:     parent.bottom
-        source:             getRIDIcon()
+        source:             "/qmlimages/RidIconMan.svg"
+        color:              getRidColor()
         fillMode:           Image.PreserveAspectFit
         sourceSize.height:  height
+
+        QGCColoredImage {
+            width:              height
+            anchors.fill:       parent
+            sourceSize.height:  height
+            source:             "/qmlimages/RidIconText.svg"
+            fillMode:           Image.PreserveAspectFit
+            color:              qgcPal.text
+        }
     }
 
     MouseArea {