Merge pull request #5124 from DonLakeFlyer/GuidedFixes

Guided fixes

src/FlightDisplay/FlightDisplayView.qml

@@ -418,6 +418,12 @@ QGCView {
                     visible:    _guidedController.showStartMission
                 },
                 {
+                    title:      _guidedController.continueMissionTitle,
+                    text:       _guidedController.continueMissionMessage,
+                    action:     _guidedController.actionContinueMission,
+                    visible:    _guidedController.showContinueMission
+                },
+                {
                     title:      _guidedController.resumeMissionTitle,
                     text:       _guidedController.resumeMissionMessage,
                     action:     _guidedController.actionResumeMission,
@@ -502,6 +508,7 @@ QGCView {
             id:                 guidedActionsController
             missionController:  _missionController
             confirmDialog:      guidedActionConfirm
+            altitudeSlider:     _altitudeSlider
             z:                  _flightVideoPipControl.z + 1
 
             onShowStartMissionChanged: {
@@ -552,7 +559,6 @@ QGCView {
             anchors.bottom:             parent.bottom
             anchors.horizontalCenter:   parent.horizontalCenter
             guidedController:           _guidedController
-            altitudeSlider:             _altitudeSlider
         }
 
         //-- Altitude slider

src/FlightDisplay/GuidedActionList.qml

@@ -86,10 +86,6 @@ Rectangle {
                             text:                       modelData.title
 
                             onClicked: {
-                                if (modelData.action === guidedController.actionChangeAlt) {
-                                    altitudeSlider.reset()
-                                    altitudeSlider.visible = true
-                                }
                                 _root.visible = false
                                 guidedController.confirmAction(modelData.action)
                             }

src/FlightDisplay/GuidedActionsController.qml

@@ -29,6 +29,7 @@ Item {
 
     property var missionController
     property var confirmDialog
+    property var altitudeSlider
 
     readonly property string emergencyStopTitle:    qsTr("Emergency Stop")
     readonly property string armTitle:              qsTr("Arm")
@@ -188,6 +189,8 @@ Item {
             confirmDialog.title = changeAltTitle
             confirmDialog.message = changeAltMessage
             confirmDialog.hideTrigger = Qt.binding(function() { return !showChangeAlt })
+            altitudeSlider.reset()
+            altitudeSlider.visible = true
             break;
         case actionGoto:
             confirmDialog.title = gotoTitle