Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
cb69cc82
Commit
cb69cc82
authored
Jun 03, 2017
by
Don Gagne
Browse files
Remove mission dialog shows image count
parent
859766f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/FlightDisplay/FlightDisplayView.qml
View file @
cb69cc82
...
...
@@ -148,7 +148,7 @@ QGCView {
}
}
else
{
if
(
promptForMissionRemove
&&
(
_missionController
.
containsItems
||
_geoFenceController
.
containsItems
||
_rallyPointController
.
containsItems
))
{
root
.
showDialog
(
removeMission
DialogComponent
,
qsTr
(
"
Flight complete
"
),
showDialogDefaultWidth
,
StandardButton
.
No
|
StandardButton
.
Yes
)
root
.
showDialog
(
missionComplete
DialogComponent
,
qsTr
(
"
Flight
Plan
complete
"
),
showDialogDefaultWidth
,
StandardButton
.
Close
)
}
promptForMissionRemove
=
false
}
...
...
@@ -161,14 +161,35 @@ QGCView {
}
Component
{
id
:
removeMission
DialogComponent
id
:
missionComplete
DialogComponent
QGCViewMessage
{
message
:
qsTr
(
"
Do you want to remove the mission from the vehicle?
"
)
QGCViewDialog
{
QGCFlickable
{
anchors.fill
:
parent
contentHeight
:
column
.
height
Column
{
id
:
column
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
spacing
:
ScreenTools
.
defaultFontPixelHeight
QGCLabel
{
text
:
qsTr
(
"
%1 Images Taken
"
).
arg
(
_activeVehicle
.
cameraTriggerPoints
.
count
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
visible
:
_activeVehicle
.
cameraTriggerPoints
.
count
!=
0
}
function
accept
()
{
_planMasterController
.
removeAllFromVehicle
()
hideDialog
()
QGCButton
{
text
:
qsTr
(
"
Remove plan from vehicle
"
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
onClicked
:
{
_planMasterController
.
removeAllFromVehicle
()
hideDialog
()
}
}
}
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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