Skip to content

Q
qgroundcontrol
Commit 4a6492d5 authored by Yasen's avatar Yasen
Browse files
Options

Updated Gimbal Indicator - now reflects custom theme 

Added gimbal pitch SVGs for indoors and outdoors theme
parent b74f4bcd
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 4 deletions
custom-example/custom.qrc
View file @ 4a6492d5
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
<file alias="compass_pointer.svg">res/Images/compass_pointer.svg</file> <file alias="compass_pointer.svg">res/Images/compass_pointer.svg</file>
<file alias="distance.svg">res/Images/distance.svg</file> <file alias="distance.svg">res/Images/distance.svg</file>
<file alias="gimbal_icon.svg">res/Images/gimbal_icon.svg</file> <file alias="gimbal_icon.svg">res/Images/gimbal_icon.svg</file>
<file alias="gimbal_pitch.svg">res/Images/gimbal_pitch.svg</file>
<file alias="gimbal_position.svg">res/Images/gimbal_position.svg</file> <file alias="gimbal_position.svg">res/Images/gimbal_position.svg</file>
<file alias="gimbal_pitch_indoors.svg">res/Images/gimbal_pitch_indoors.svg</file>
<file alias="gimbal_pitch_outdoors.svg">res/Images/gimbal_pitch_outdoors.svg</file>
<file alias="horizontal_speed.svg">res/Images/horizontal_speed.svg</file> <file alias="horizontal_speed.svg">res/Images/horizontal_speed.svg</file>
<file alias="microSD.svg">res/Images/microSD.svg</file> <file alias="microSD.svg">res/Images/microSD.svg</file>
<file alias="odometer.svg">res/Images/odometer.svg</file> <file alias="odometer.svg">res/Images/odometer.svg</file>
......
custom-example/res/CustomCameraControl.qml
View file @ 4a6492d5
...@@ -409,8 +409,9 @@ Item { ...@@ -409,8 +409,9 @@ Item {
id: gimbalCol id: gimbalCol
spacing: ScreenTools.defaultFontPixelHeight * 0.75 spacing: ScreenTools.defaultFontPixelHeight * 0.75
anchors.centerIn: parent anchors.centerIn: parent
Image { QGCColoredImage {
source: "/custom/img/gimbal_icon.svg" source: "/custom/img/gimbal_icon.svg"
color: qgcPal.text
width: ScreenTools.defaultFontPixelWidth * 2 width: ScreenTools.defaultFontPixelWidth * 2
height: width height: width
smooth: true smooth: true
...@@ -419,11 +420,12 @@ Item { ...@@ -419,11 +420,12 @@ Item {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
sourceSize.width: width sourceSize.width: width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
Image { Image {
id: pitchScale id: pitchScale
height: cameraRect.height * 0.65 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 fillMode: Image.PreserveAspectFit
sourceSize.height: height sourceSize.height: height
smooth: true smooth: true
...@@ -451,7 +453,7 @@ Item { ...@@ -451,7 +453,7 @@ Item {
QGCLabel { QGCLabel {
id: gimbalLabel id: gimbalLabel
text: _gimbalPitch ? _gimbalPitch.toFixed(0) : 0 text: _gimbalPitch ? _gimbalPitch.toFixed(0) : 0
color: "#FFF" color: qgcPal.text
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
......
custom-example/res/Images/gimbal_pitch_indoors.svg 0 → 100644
View file @ 4a6492d5
<svg width="72" height="756" viewBox="0 0 72 756" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M36 0V108" stroke="#C92A30" stroke-width="3" stroke-miterlimit="10"/>
<path d="M18 108H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 324H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 540H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 753H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 3H54" stroke="#9F0B10" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 216H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 432H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 648H54" stroke="#212529" stroke-width="6" stroke-miterlimit="10"/>
</svg>
custom-example/res/Images/gimbal_pitch_outdoors.svg 0 → 100644
View file @ 4a6492d5
<svg width="72" height="756" viewBox="0 0 72 756" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M36 0V108" stroke="#E03131" stroke-width="3" stroke-miterlimit="10"/>
<path d="M18 108H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 324H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 540H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 753H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 3H54" stroke="#E03131" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 216H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 432H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
<path d="M18 648H54" stroke="white" stroke-width="6" stroke-miterlimit="10"/>
</svg>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment