|
|
@ -284,6 +284,8 @@ Item { |
|
|
|
z: QGroundControl.zOrderWidgets |
|
|
|
z: QGroundControl.zOrderWidgets |
|
|
|
state: "Shown" |
|
|
|
state: "Shown" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
property real _fontPointSize: ScreenTools.isMobile ? ScreenTools.largeFontPointSize : ScreenTools.defaultFontPointSize |
|
|
|
|
|
|
|
|
|
|
|
states: [ |
|
|
|
states: [ |
|
|
|
State { |
|
|
|
State { |
|
|
|
name: "Shown" |
|
|
|
name: "Shown" |
|
|
@ -448,28 +450,28 @@ Item { |
|
|
|
spacing: _margins * 2 |
|
|
|
spacing: _margins * 2 |
|
|
|
|
|
|
|
|
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
pointSize: ScreenTools.largeFontPointSize |
|
|
|
pointSize: _guidedModeBar._fontPointSize |
|
|
|
text: (_activeVehicle && _activeVehicle.armed) ? (_activeVehicle.flying ? qsTr("Emergency Stop") : qsTr("Disarm")) : qsTr("Arm") |
|
|
|
text: (_activeVehicle && _activeVehicle.armed) ? (_activeVehicle.flying ? qsTr("Emergency Stop") : qsTr("Disarm")) : qsTr("Arm") |
|
|
|
visible: _activeVehicle |
|
|
|
visible: _activeVehicle |
|
|
|
onClicked: _guidedModeBar.confirmAction(_activeVehicle.armed ? (_activeVehicle.flying ? _guidedModeBar.confirmEmergencyStop : _guidedModeBar.confirmDisarm) : _guidedModeBar.confirmArm) |
|
|
|
onClicked: _guidedModeBar.confirmAction(_activeVehicle.armed ? (_activeVehicle.flying ? _guidedModeBar.confirmEmergencyStop : _guidedModeBar.confirmDisarm) : _guidedModeBar.confirmArm) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
pointSize: ScreenTools.largeFontPointSize |
|
|
|
pointSize: _guidedModeBar._fontPointSize |
|
|
|
text: qsTr("RTL") |
|
|
|
text: qsTr("RTL") |
|
|
|
visible: (_activeVehicle && _activeVehicle.armed) && _activeVehicle.guidedModeSupported && _activeVehicle.flying |
|
|
|
visible: (_activeVehicle && _activeVehicle.armed) && _activeVehicle.guidedModeSupported && _activeVehicle.flying |
|
|
|
onClicked: _guidedModeBar.confirmAction(_guidedModeBar.confirmHome) |
|
|
|
onClicked: _guidedModeBar.confirmAction(_guidedModeBar.confirmHome) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
pointSize: ScreenTools.largeFontPointSize |
|
|
|
pointSize: _guidedModeBar._fontPointSize |
|
|
|
text: (_activeVehicle && _activeVehicle.flying) ? qsTr("Land"): qsTr("Takeoff") |
|
|
|
text: (_activeVehicle && _activeVehicle.flying) ? qsTr("Land"): qsTr("Takeoff") |
|
|
|
visible: _activeVehicle && _activeVehicle.guidedModeSupported && _activeVehicle.armed |
|
|
|
visible: _activeVehicle && _activeVehicle.guidedModeSupported && _activeVehicle.armed |
|
|
|
onClicked: _guidedModeBar.confirmAction(_activeVehicle.flying ? _guidedModeBar.confirmLand : _guidedModeBar.confirmTakeoff) |
|
|
|
onClicked: _guidedModeBar.confirmAction(_activeVehicle.flying ? _guidedModeBar.confirmLand : _guidedModeBar.confirmTakeoff) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
pointSize: ScreenTools.largeFontPointSize |
|
|
|
pointSize: _guidedModeBar._fontPointSize |
|
|
|
text: qsTr("Pause") |
|
|
|
text: qsTr("Pause") |
|
|
|
visible: (_activeVehicle && _activeVehicle.armed) && _activeVehicle.pauseVehicleSupported && _activeVehicle.flying |
|
|
|
visible: (_activeVehicle && _activeVehicle.armed) && _activeVehicle.pauseVehicleSupported && _activeVehicle.flying |
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
@ -479,7 +481,7 @@ Item { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCButton { |
|
|
|
QGCButton { |
|
|
|
pointSize: ScreenTools.largeFontPointSize |
|
|
|
pointSize: _guidedModeBar._fontPointSize |
|
|
|
text: qsTr("Change Altitude") |
|
|
|
text: qsTr("Change Altitude") |
|
|
|
visible: (_activeVehicle && _activeVehicle.flying) && _activeVehicle.guidedModeSupported && _activeVehicle.armed |
|
|
|
visible: (_activeVehicle && _activeVehicle.flying) && _activeVehicle.guidedModeSupported && _activeVehicle.armed |
|
|
|
onClicked: _guidedModeBar.confirmAction(_guidedModeBar.confirmChangeAlt) |
|
|
|
onClicked: _guidedModeBar.confirmAction(_guidedModeBar.confirmChangeAlt) |
|
|
@ -503,6 +505,7 @@ Item { |
|
|
|
height: _guidedModeBar.height |
|
|
|
height: _guidedModeBar.height |
|
|
|
visible: false |
|
|
|
visible: false |
|
|
|
z: QGroundControl.zOrderWidgets |
|
|
|
z: QGroundControl.zOrderWidgets |
|
|
|
|
|
|
|
fontPointSize: _guidedModeBar._fontPointSize |
|
|
|
|
|
|
|
|
|
|
|
onAccept: { |
|
|
|
onAccept: { |
|
|
|
guidedModeConfirm.visible = false |
|
|
|
guidedModeConfirm.visible = false |
|
|
|