Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
5fca2d75
Commit
5fca2d75
authored
Jun 05, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup for better visibility
Also distinguish Emergency Stop better
parent
d7194083
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
18 deletions
+15
-18
GuidedActionConfirm.qml
src/FlightDisplay/GuidedActionConfirm.qml
+6
-8
GuidedActionList.qml
src/FlightDisplay/GuidedActionList.qml
+3
-3
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+2
-2
SliderSwitch.qml
src/QmlControls/SliderSwitch.qml
+4
-5
No files found.
src/FlightDisplay/GuidedActionConfirm.qml
View file @
5fca2d75
...
...
@@ -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
...
...
@@ -37,6 +36,7 @@ Rectangle {
property
bool
hideTrigger
:
false
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
property
bool
_emergencyAction
:
action
===
guidedController
.
actionEmergencyStop
onHideTriggerChanged
:
{
if
(
hideTrigger
)
{
...
...
@@ -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 {
QGCLabel
{
id
:
messageText
color
:
qgcPal
.
alertText
anchors.left
:
slider
.
left
anchors.right
:
slider
.
right
horizontalAlignment
:
Text
.
AlignHCenter
...
...
@@ -127,7 +125,7 @@ Rectangle {
sourceSize.height
:
width
source
:
"
/res/XDelete.svg
"
fillMode
:
Image
.
PreserveAspectFit
color
:
qgcPal
.
alertT
ext
color
:
qgcPal
.
t
ext
QGCMouseArea
{
fillItem
:
parent
onClicked
:
{
...
...
src/FlightDisplay/GuidedActionList.qml
View file @
5fca2d75
...
...
@@ -86,8 +86,8 @@ Rectangle {
QGCButton
{
id
:
actionButton
anchors.horizontalCenter
:
parent
.
horizontalCenter
text
:
modelData
.
title
Layout.alignment
:
Qt
.
AlignCenter
onClicked
:
{
_root
.
visible
=
false
...
...
src/FlightDisplay/GuidedActionsController.qml
View file @
5fca2d75
...
...
@@ -32,7 +32,7 @@ Item {
property
var
actionList
property
var
altitudeSlider
readonly
property
string
emergencyStopTitle
:
qsTr
(
"
E
mergency Stop
"
)
readonly
property
string
emergencyStopTitle
:
qsTr
(
"
E
MERGENCY STOP
"
)
readonly
property
string
armTitle
:
qsTr
(
"
Arm
"
)
readonly
property
string
disarmTitle
:
qsTr
(
"
Disarm
"
)
readonly
property
string
rtlTitle
:
qsTr
(
"
RTL
"
)
...
...
@@ -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: T
his will stop all motors. If vehicle is currently in air it will crash
.
"
)
readonly
property
string
emergencyStopMessage
:
qsTr
(
"
WARNING: T
HIS 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.
"
)
...
...
src/QmlControls/SliderSwitch.qml
View file @
5fca2d75
...
...
@@ -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 {
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
confirmText
color
:
qgcPal
.
window
color
:
qgcPal
.
buttonText
}
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 {
fillMode
:
Image
.
PreserveAspectFit
smooth
:
false
mipmap
:
false
color
:
qgcPal
.
t
ext
color
:
qgcPal
.
buttonT
ext
cache
:
false
source
:
"
/res/ArrowRight.svg
"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment