Skip to content

Q
qgroundcontrol
Commit 8d6b18df authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4944 from DonLakeFlyer/Safety 

Fix Safety page layout loop
parents 6651bd05 6a26acaf
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ 8d6b18df
......@@ -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 {
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 {
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 {
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 {
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 {
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
}
......
src/Settings/App.SettingsGroup.json
View file @ 8d6b18df
......@@ -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",
......
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