Browse Source

Merge pull request #3495 from DonLakeFlyer/SafetySmallScreen

Safety: Hide icon on small screens
QGC4.4
Don Gagne 9 years ago
parent
commit
6de8d0ef79
  1. 39
      src/AutoPilotPlugins/PX4/SafetyComponent.qml

39
src/AutoPilotPlugins/PX4/SafetyComponent.qml

@ -44,6 +44,8 @@ QGCView {
property Fact _disarmLandDelay: controller.getParameterFact(-1, "COM_DISARM_LAND") property Fact _disarmLandDelay: controller.getParameterFact(-1, "COM_DISARM_LAND")
property Fact _landSpeedMC: controller.getParameterFact(-1, "MPC_LAND_SPEED", false) property Fact _landSpeedMC: controller.getParameterFact(-1, "MPC_LAND_SPEED", false)
property bool _showIcons: !ScreenTools.isTinyScreen
QGCViewPanel { QGCViewPanel {
id: panel id: panel
anchors.fill: parent anchors.fill: parent
@ -81,8 +83,13 @@ QGCView {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg" source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _showIcons
}
Item {
width: _margins * 0.5
height: 1
visible: _showIcons
} }
Item { width: _margins * 0.5; height: 1; }
Column { Column {
spacing: _margins * 0.5 spacing: _margins * 0.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -152,8 +159,13 @@ QGCView {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/RCLossLight.svg" : "/qmlimages/RCLoss.svg" source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/RCLossLight.svg" : "/qmlimages/RCLoss.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _showIcons
}
Item {
width: _margins * 0.5
height: 1
visible: _showIcons
} }
Item { width: _margins * 0.5; height: 1; }
Column { Column {
spacing: _margins * 0.5 spacing: _margins * 0.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -210,8 +222,13 @@ QGCView {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/DatalinkLossLight.svg" : "/qmlimages/DatalinkLoss.svg" source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/DatalinkLossLight.svg" : "/qmlimages/DatalinkLoss.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _showIcons
}
Item {
width: _margins * 0.5
height: 1
visible: _showIcons
} }
Item { width: _margins * 0.5; height: 1; }
Column { Column {
spacing: _margins * 0.5 spacing: _margins * 0.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -268,8 +285,13 @@ QGCView {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/GeoFenceLight.svg" : "/qmlimages/GeoFence.svg" source: qgcPal.globalTheme === QGCPalette.Light ? "/qmlimages/GeoFenceLight.svg" : "/qmlimages/GeoFence.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _showIcons
}
Item {
width: _margins * 0.5
height: 1
visible: _showIcons
} }
Item { width: _margins * 0.5; height: 1; }
Column { Column {
spacing: _margins * 0.5 spacing: _margins * 0.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -352,8 +374,13 @@ QGCView {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: controller.vehicle.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg" source: controller.vehicle.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _showIcons
}
Item {
width: _margins * 0.5
height: 1
visible: _showIcons
} }
Item { width: _margins * 0.5; height: 1; }
Column { Column {
spacing: _margins * 0.5 spacing: _margins * 0.5
Row { Row {
@ -467,10 +494,12 @@ QGCView {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: controller.vehicle.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg" source: controller.vehicle.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: _showIcons
} }
Item { Item {
width: _margins * 0.5 width: _margins * 0.5
height: 1 height: 1
visible: _showIcons
} }
Column { Column {
spacing: _margins * 0.5 spacing: _margins * 0.5

Loading…
Cancel
Save