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
cb69cc82
Commit
cb69cc82
authored
Jun 03, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove mission dialog shows image count
parent
859766f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
7 deletions
+28
-7
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+28
-7
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
cb69cc82
...
@@ -148,7 +148,7 @@ QGCView {
...
@@ -148,7 +148,7 @@ QGCView {
}
}
}
else
{
}
else
{
if
(
promptForMissionRemove
&&
(
_missionController
.
containsItems
||
_geoFenceController
.
containsItems
||
_rallyPointController
.
containsItems
))
{
if
(
promptForMissionRemove
&&
(
_missionController
.
containsItems
||
_geoFenceController
.
containsItems
||
_rallyPointController
.
containsItems
))
{
root
.
showDialog
(
removeMissionDialogComponent
,
qsTr
(
"
Flight complete
"
),
showDialogDefaultWidth
,
StandardButton
.
No
|
StandardButton
.
Yes
)
root
.
showDialog
(
missionCompleteDialogComponent
,
qsTr
(
"
Flight Plan complete
"
),
showDialogDefaultWidth
,
StandardButton
.
Close
)
}
}
promptForMissionRemove
=
false
promptForMissionRemove
=
false
}
}
...
@@ -161,14 +161,35 @@ QGCView {
...
@@ -161,14 +161,35 @@ QGCView {
}
}
Component
{
Component
{
id
:
removeMission
DialogComponent
id
:
missionComplete
DialogComponent
QGCViewMessage
{
QGCViewDialog
{
message
:
qsTr
(
"
Do you want to remove the mission from the vehicle?
"
)
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
()
{
QGCButton
{
_planMasterController
.
removeAllFromVehicle
()
text
:
qsTr
(
"
Remove plan from vehicle
"
)
hideDialog
()
anchors.horizontalCenter
:
parent
.
horizontalCenter
onClicked
:
{
_planMasterController
.
removeAllFromVehicle
()
hideDialog
()
}
}
}
}
}
}
}
}
}
...
...
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