zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #4944 from DonLakeFlyer/Safety 

Fix Safety page layout loop
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
6651bd0590 6a26acaf77
commit
8d6b18df9e
2 changed files with 8 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/AutoPilotPlugins/PX4/SafetyComponent.qml
  2. 3
      src/Settings/App.SettingsGroup.json

12
src/AutoPilotPlugins/PX4/SafetyComponent.qml
Unescape View File

@ -123,7 +123,7 @@ SetupPage { @@ -123,7 +123,7 @@ SetupPage {
sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg"
source: "/qmlimages/check.png"///qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg"
Layout.rowSpan: 3
Layout.minimumWidth: _imageWidth
}
@ -177,7 +177,7 @@ SetupPage { @@ -177,7 +177,7 @@ SetupPage {
sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/RCLossLight.svg" : "/qmlimages/RCLoss.svg"
//source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/RCLossLight.svg" : "/qmlimages/RCLoss.svg"
Layout.rowSpan: 3
Layout.minimumWidth: _imageWidth
}
@ -222,7 +222,7 @@ SetupPage { @@ -222,7 +222,7 @@ SetupPage {
sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/DatalinkLossLight.svg" : "/qmlimages/DatalinkLoss.svg"
//source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/DatalinkLossLight.svg" : "/qmlimages/DatalinkLoss.svg"
Layout.rowSpan: 3
Layout.minimumWidth: _imageWidth
}
@ -267,7 +267,7 @@ SetupPage { @@ -267,7 +267,7 @@ SetupPage {
sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/GeoFenceLight.svg" : "/qmlimages/GeoFence.svg"
//source: qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/GeoFenceLight.svg" : "/qmlimages/GeoFence.svg"
Layout.rowSpan: 3
Layout.minimumWidth: _imageWidth
}
@ -330,7 +330,7 @@ SetupPage { @@ -330,7 +330,7 @@ SetupPage {
sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectFit
source: controller.vehicle.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg"
//source: controller.vehicle.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg"
Layout.rowSpan: 7
Layout.minimumWidth: _imageWidth
}
@ -424,7 +424,7 @@ SetupPage { @@ -424,7 +424,7 @@ SetupPage {
sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectFit
source: controller.vehicle.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg"
//source: controller.vehicle.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg"
Layout.rowSpan: landVelocityLabel.visible ? 2 : 1
Layout.minimumWidth: _imageWidth
}

3
src/Settings/App.SettingsGroup.json
Unescape View File

@ -106,7 +106,8 @@ @@ -106,7 +106,8 @@
"longDescription": "The color scheme for the user interface.",
"type": "uint32",
"enumStrings": "Indoor,Outdoor",
"enumValues": "1,0"
"enumValues": "1,0",
"defaultValue": 0
},
{
"name": "ShowLargeCompass",

Write Preview
Loading…
Cancel
Save