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
96eae82a
Commit
96eae82a
authored
Sep 25, 2018
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
959b4729
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+8
-7
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+4
-2
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
96eae82a
...
...
@@ -469,13 +469,14 @@ QGCView {
}
MultiVehicleList
{
anchors.margins
:
_margins
anchors.top
:
singleMultiSelector
.
bottom
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
width
:
ScreenTools
.
defaultFontPixelWidth
*
30
visible
:
!
singleVehicleView
.
checked
&&
!
QGroundControl
.
videoManager
.
fullScreen
z
:
_panel
.
z
+
4
anchors.margins
:
_margins
anchors.top
:
singleMultiSelector
.
bottom
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
width
:
ScreenTools
.
defaultFontPixelWidth
*
30
visible
:
!
singleVehicleView
.
checked
&&
!
QGroundControl
.
videoManager
.
fullScreen
z
:
_panel
.
z
+
4
guidedActionsController
:
_guidedController
}
//-- Virtual Joystick
...
...
src/FlightDisplay/GuidedActionsController.qml
View file @
96eae82a
...
...
@@ -40,10 +40,12 @@ Item {
readonly
property
string
takeoffTitle
:
qsTr
(
"
Takeoff
"
)
readonly
property
string
landTitle
:
qsTr
(
"
Land
"
)
readonly
property
string
startMissionTitle
:
qsTr
(
"
Start Mission
"
)
readonly
property
string
mvStartMissionTitle
:
qsTr
(
"
Start Mission (MV)
"
)
readonly
property
string
continueMissionTitle
:
qsTr
(
"
Continue Mission
"
)
readonly
property
string
resumeMissionTitle
:
qsTr
(
"
Resume Mission
"
)
readonly
property
string
resumeMissionUploadFailTitle
:
qsTr
(
"
Resume FAILED
"
)
readonly
property
string
pauseTitle
:
qsTr
(
"
Pause
"
)
readonly
property
string
mvPauseTitle
:
qsTr
(
"
Pause (MV)
"
)
readonly
property
string
changeAltTitle
:
qsTr
(
"
Change Altitude
"
)
readonly
property
string
orbitTitle
:
qsTr
(
"
Orbit
"
)
readonly
property
string
landAbortTitle
:
qsTr
(
"
Land Abort
"
)
...
...
@@ -247,7 +249,7 @@ Item {
confirmDialog
.
hideTrigger
=
Qt
.
binding
(
function
()
{
return
!
showStartMission
})
break
;
case
actionMVStartMission
:
confirmDialog
.
title
=
s
tartMissionTitle
confirmDialog
.
title
=
mvS
tartMissionTitle
confirmDialog
.
message
=
startMissionMessage
confirmDialog
.
hideTrigger
=
true
break
;
...
...
@@ -319,7 +321,7 @@ Item {
altitudeSlider
.
visible
=
true
break
;
case
actionMVPause
:
confirmDialog
.
title
=
p
auseTitle
confirmDialog
.
title
=
mvP
auseTitle
confirmDialog
.
message
=
mvPauseMessage
confirmDialog
.
hideTrigger
=
true
break
;
...
...
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