Skip to content

Q
qgroundcontrol
Unverified Commit 3df9b40f authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6560 from DonLakeFlyer/Fixes 

Various fixes
parents 81aa4b4a 5fca2d75
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 20 deletions
src/FlightDisplay/GuidedActionConfirm.qml
View file @ 3df9b40f
...@@ -18,13 +18,12 @@ import QGroundControl.Palette 1.0 ...@@ -18,13 +18,12 @@ import QGroundControl.Palette 1.0
/// Guided actions confirmation dialog /// Guided actions confirmation dialog
Rectangle { Rectangle {
id: _root id: _root
border.color: qgcPal.alertBorder
border.width: 1
width: confirmColumn.width + (_margins * 4) width: confirmColumn.width + (_margins * 4)
height: confirmColumn.height + (_margins * 4) height: confirmColumn.height + (_margins * 4)
radius: ScreenTools.defaultFontPixelHeight / 2 radius: ScreenTools.defaultFontPixelHeight / 2
color: qgcPal.alertBackground color: qgcPal.window
opacity: 0.9 border.color: _emergencyAction ? "red" : qgcPal.windowShade
border.width: _emergencyAction ? 4 : 1
z: guidedController.z z: guidedController.z
visible: false visible: false
...@@ -36,7 +35,8 @@ Rectangle { ...@@ -36,7 +35,8 @@ Rectangle {
property var actionData property var actionData
property bool hideTrigger: false property bool hideTrigger: false
property real _margins: ScreenTools.defaultFontPixelWidth property real _margins: ScreenTools.defaultFontPixelWidth
property bool _emergencyAction: action === guidedController.actionEmergencyStop
onHideTriggerChanged: { onHideTriggerChanged: {
if (hideTrigger) { if (hideTrigger) {
...@@ -78,7 +78,6 @@ Rectangle { ...@@ -78,7 +78,6 @@ Rectangle {
QGCLabel { QGCLabel {
id: titleText id: titleText
color: qgcPal.alertText
anchors.left: slider.left anchors.left: slider.left
anchors.right: slider.right anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
...@@ -87,7 +86,6 @@ Rectangle { ...@@ -87,7 +86,6 @@ Rectangle {
QGCLabel { QGCLabel {
id: messageText id: messageText
color: qgcPal.alertText
anchors.left: slider.left anchors.left: slider.left
anchors.right: slider.right anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
...@@ -127,7 +125,7 @@ Rectangle { ...@@ -127,7 +125,7 @@ Rectangle {
sourceSize.height: width sourceSize.height: width
source: "/res/XDelete.svg" source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
color: qgcPal.alertText color: qgcPal.text
QGCMouseArea { QGCMouseArea {
fillItem: parent fillItem: parent
onClicked: { onClicked: {
......
src/FlightDisplay/GuidedActionList.qml
View file @ 3df9b40f
...@@ -85,9 +85,9 @@ Rectangle { ...@@ -85,9 +85,9 @@ Rectangle {
} }
QGCButton { QGCButton {
id: actionButton id: actionButton
anchors.horizontalCenter: parent.horizontalCenter text: modelData.title
text: modelData.title Layout.alignment: Qt.AlignCenter
onClicked: { onClicked: {
_root.visible = false _root.visible = false
......
src/FlightDisplay/GuidedActionsController.qml
View file @ 3df9b40f
...@@ -32,7 +32,7 @@ Item { ...@@ -32,7 +32,7 @@ Item {
property var actionList property var actionList
property var altitudeSlider 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 armTitle: qsTr("Arm")
readonly property string disarmTitle: qsTr("Disarm") readonly property string disarmTitle: qsTr("Disarm")
readonly property string rtlTitle: qsTr("RTL") 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 armMessage: qsTr("Arm the vehicle.")
readonly property string disarmMessage: qsTr("Disarm 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 takeoffMessage: qsTr("Takeoff from ground and hold position.")
readonly property string startMissionMessage: qsTr("Takeoff from ground and start the current mission.") 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.") readonly property string continueMissionMessage: qsTr("Continue the mission from the current waypoint.")
......
src/PlanView/SimpleItemEditor.qml
View file @ 3df9b40f
...@@ -132,7 +132,7 @@ Rectangle { ...@@ -132,7 +132,7 @@ Rectangle {
text: qsTr("TerrF") text: qsTr("TerrF")
exclusiveGroup: altRadios exclusiveGroup: altRadios
checked: missionItem.altitudeMode === altModeValue checked: missionItem.altitudeMode === altModeValue
visible: missionItem.supportsTerrainFrame || missionItem.altitudeMode === altModeValue visible: missionItem.altitudeMode === altModeValue
readonly property int altModeValue: _altModeTerrainFrame readonly property int altModeValue: _altModeTerrainFrame
readonly property string helpText: qsTr("Using terrain reference frame") readonly property string helpText: qsTr("Using terrain reference frame")
......
src/QmlControls/SliderSwitch.qml
View file @ 3df9b40f
...@@ -11,7 +11,7 @@ Rectangle { ...@@ -11,7 +11,7 @@ Rectangle {
implicitWidth: label.contentWidth + (_diameter * 2.5) + (_border * 4) implicitWidth: label.contentWidth + (_diameter * 2.5) + (_border * 4)
implicitHeight: label.height * 2.5 implicitHeight: label.height * 2.5
radius: height /2 radius: height /2
color: qgcPal.text color: qgcPal.windowShade
signal accept ///< Action confirmed signal accept ///< Action confirmed
signal reject ///< Action rejected signal reject ///< Action rejected
...@@ -29,7 +29,7 @@ Rectangle { ...@@ -29,7 +29,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: confirmText text: confirmText
color: qgcPal.window color: qgcPal.buttonText
} }
Rectangle { Rectangle {
...@@ -39,8 +39,7 @@ Rectangle { ...@@ -39,8 +39,7 @@ Rectangle {
height: _diameter height: _diameter
width: _diameter width: _diameter
radius: _diameter / 2 radius: _diameter / 2
color: qgcPal.windowShade color: qgcPal.primaryButton
opacity: 0.8
QGCColoredImage { QGCColoredImage {
anchors.centerIn: parent anchors.centerIn: parent
...@@ -50,7 +49,7 @@ Rectangle { ...@@ -50,7 +49,7 @@ Rectangle {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
smooth: false smooth: false
mipmap: false mipmap: false
color: qgcPal.text color: qgcPal.buttonText
cache: false cache: false
source: "/res/ArrowRight.svg" source: "/res/ArrowRight.svg"
} }
......
src/ui/MainWindowInner.qml
View file @ 3df9b40f
...@@ -175,7 +175,7 @@ Item { ...@@ -175,7 +175,7 @@ Item {
MessageDialog { MessageDialog {
id: activeConnectionsCloseDialog id: activeConnectionsCloseDialog
title: qsTr("%1 close").arg(QGroundControl.appName) title: qsTr("%1 close").arg(QGroundControl.appName)
text: qsTr("There are still active connections to vehicles. Do you want to disconnect these before closing?") text: qsTr("There are still active connections to vehicles. Are you sure you want to exit?")
standardButtons: StandardButton.Yes | StandardButton.Cancel standardButtons: StandardButton.Yes | StandardButton.Cancel
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
visible: false visible: false
......
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