Commit cb69cc82 authored by Don Gagne's avatar Don Gagne

Remove mission dialog shows image count

parent 859766f1
...@@ -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: removeMissionDialogComponent id: missionCompleteDialogComponent
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()
}
}
}
} }
} }
} }
......
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