diff --git a/custom-example/custom.qrc b/custom-example/custom.qrc index a53c4ad..08de536 100644 --- a/custom-example/custom.qrc +++ b/custom-example/custom.qrc @@ -25,8 +25,9 @@ res/Images/compass_pointer.svg res/Images/distance.svg res/Images/gimbal_icon.svg - res/Images/gimbal_pitch.svg res/Images/gimbal_position.svg + res/Images/gimbal_pitch_indoors.svg + res/Images/gimbal_pitch_outdoors.svg res/Images/horizontal_speed.svg res/Images/microSD.svg res/Images/odometer.svg diff --git a/custom-example/res/CustomCameraControl.qml b/custom-example/res/CustomCameraControl.qml index 2d2b538..530c6db 100644 --- a/custom-example/res/CustomCameraControl.qml +++ b/custom-example/res/CustomCameraControl.qml @@ -409,8 +409,9 @@ Item { id: gimbalCol spacing: ScreenTools.defaultFontPixelHeight * 0.75 anchors.centerIn: parent - Image { + QGCColoredImage { source: "/custom/img/gimbal_icon.svg" + color: qgcPal.text width: ScreenTools.defaultFontPixelWidth * 2 height: width smooth: true @@ -419,11 +420,12 @@ Item { fillMode: Image.PreserveAspectFit sourceSize.width: width anchors.horizontalCenter: parent.horizontalCenter + } Image { id: pitchScale height: cameraRect.height * 0.65 - source: "/custom/img/gimbal_pitch.svg" + source: qgcPal.globalTheme === QGCPalette.Light ? "/custom/img/gimbal_pitch_indoors.svg" : "/custom/img/gimbal_pitch_outdoors.svg" fillMode: Image.PreserveAspectFit sourceSize.height: height smooth: true @@ -451,7 +453,7 @@ Item { QGCLabel { id: gimbalLabel text: _gimbalPitch ? _gimbalPitch.toFixed(0) : 0 - color: "#FFF" + color: qgcPal.text font.pointSize: ScreenTools.smallFontPointSize anchors.horizontalCenter: parent.horizontalCenter } diff --git a/custom-example/res/Images/gimbal_pitch_indoors.svg b/custom-example/res/Images/gimbal_pitch_indoors.svg new file mode 100644 index 0000000..f153e91 --- /dev/null +++ b/custom-example/res/Images/gimbal_pitch_indoors.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/custom-example/res/Images/gimbal_pitch_outdoors.svg b/custom-example/res/Images/gimbal_pitch_outdoors.svg new file mode 100644 index 0000000..90312c7 --- /dev/null +++ b/custom-example/res/Images/gimbal_pitch_outdoors.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +