Skip to content

Q
qgroundcontrol
Commit 6de8d0ef authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #3495 from DonLakeFlyer/SafetySmallScreen 

Safety: Hide icon on small screens
parents 0cec7741 24e17be4
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 17 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ 6de8d0ef
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
QGCView { QGCView {
...@@ -44,6 +44,8 @@ QGCView { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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
......
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