Browse Source

Cleanup for better visibility

Also distinguish Emergency Stop better
QGC4.4
DonLakeFlyer 7 years ago
parent
commit
5fca2d756d
  1. 14
      src/FlightDisplay/GuidedActionConfirm.qml
  2. 6
      src/FlightDisplay/GuidedActionList.qml
  3. 4
      src/FlightDisplay/GuidedActionsController.qml
  4. 9
      src/QmlControls/SliderSwitch.qml

14
src/FlightDisplay/GuidedActionConfirm.qml

@ -18,13 +18,12 @@ import QGroundControl.Palette 1.0 @@ -18,13 +18,12 @@ import QGroundControl.Palette 1.0
/// Guided actions confirmation dialog
Rectangle {
id: _root
border.color: qgcPal.alertBorder
border.width: 1
width: confirmColumn.width + (_margins * 4)
height: confirmColumn.height + (_margins * 4)
radius: ScreenTools.defaultFontPixelHeight / 2
color: qgcPal.alertBackground
opacity: 0.9
color: qgcPal.window
border.color: _emergencyAction ? "red" : qgcPal.windowShade
border.width: _emergencyAction ? 4 : 1
z: guidedController.z
visible: false
@ -36,7 +35,8 @@ Rectangle { @@ -36,7 +35,8 @@ Rectangle {
property var actionData
property bool hideTrigger: false
property real _margins: ScreenTools.defaultFontPixelWidth
property real _margins: ScreenTools.defaultFontPixelWidth
property bool _emergencyAction: action === guidedController.actionEmergencyStop
onHideTriggerChanged: {
if (hideTrigger) {
@ -78,7 +78,6 @@ Rectangle { @@ -78,7 +78,6 @@ Rectangle {
QGCLabel {
id: titleText
color: qgcPal.alertText
anchors.left: slider.left
anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter
@ -87,7 +86,6 @@ Rectangle { @@ -87,7 +86,6 @@ Rectangle {
QGCLabel {
id: messageText
color: qgcPal.alertText
anchors.left: slider.left
anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter
@ -127,7 +125,7 @@ Rectangle { @@ -127,7 +125,7 @@ Rectangle {
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.alertText
color: qgcPal.text
QGCMouseArea {
fillItem: parent
onClicked: {

6
src/FlightDisplay/GuidedActionList.qml

@ -85,9 +85,9 @@ Rectangle { @@ -85,9 +85,9 @@ Rectangle {
}
QGCButton {
id: actionButton
anchors.horizontalCenter: parent.horizontalCenter
text: modelData.title
id: actionButton
text: modelData.title
Layout.alignment: Qt.AlignCenter
onClicked: {
_root.visible = false

4
src/FlightDisplay/GuidedActionsController.qml

@ -32,7 +32,7 @@ Item { @@ -32,7 +32,7 @@ Item {
property var actionList
property var altitudeSlider
readonly property string emergencyStopTitle: qsTr("Emergency Stop")
readonly property string emergencyStopTitle: qsTr("EMERGENCY STOP")
readonly property string armTitle: qsTr("Arm")
readonly property string disarmTitle: qsTr("Disarm")
readonly property string rtlTitle: qsTr("RTL")
@ -52,7 +52,7 @@ Item { @@ -52,7 +52,7 @@ Item {
readonly property string armMessage: qsTr("Arm the vehicle.")
readonly property string disarmMessage: qsTr("Disarm the vehicle")
readonly property string emergencyStopMessage: qsTr("WARNING: This will stop all motors. If vehicle is currently in air it will crash.")
readonly property string emergencyStopMessage: qsTr("WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.")
readonly property string takeoffMessage: qsTr("Takeoff from ground and hold position.")
readonly property string startMissionMessage: qsTr("Takeoff from ground and start the current mission.")
readonly property string continueMissionMessage: qsTr("Continue the mission from the current waypoint.")

9
src/QmlControls/SliderSwitch.qml

@ -11,7 +11,7 @@ Rectangle { @@ -11,7 +11,7 @@ Rectangle {
implicitWidth: label.contentWidth + (_diameter * 2.5) + (_border * 4)
implicitHeight: label.height * 2.5
radius: height /2
color: qgcPal.text
color: qgcPal.windowShade
signal accept ///< Action confirmed
signal reject ///< Action rejected
@ -29,7 +29,7 @@ Rectangle { @@ -29,7 +29,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
text: confirmText
color: qgcPal.window
color: qgcPal.buttonText
}
Rectangle {
@ -39,8 +39,7 @@ Rectangle { @@ -39,8 +39,7 @@ Rectangle {
height: _diameter
width: _diameter
radius: _diameter / 2
color: qgcPal.windowShade
opacity: 0.8
color: qgcPal.primaryButton
QGCColoredImage {
anchors.centerIn: parent
@ -50,7 +49,7 @@ Rectangle { @@ -50,7 +49,7 @@ Rectangle {
fillMode: Image.PreserveAspectFit
smooth: false
mipmap: false
color: qgcPal.text
color: qgcPal.buttonText
cache: false
source: "/res/ArrowRight.svg"
}

Loading…
Cancel
Save