From c3a8400e5467cfd06bc06f5a35f18de0ce1d6b98 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@laptop-3.local>
Date: Tue, 9 May 2017 19:02:28 -0700
Subject: [PATCH] Guided fixes

- Altitude slider not showing up
- Continue mission not showing up in action list
---
 src/FlightDisplay/FlightDisplayView.qml       | 8 +++++++-
 src/FlightDisplay/GuidedActionList.qml        | 4 ----
 src/FlightDisplay/GuidedActionsController.qml | 3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 17bf719c4..b0cbf5fdc 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -417,6 +417,12 @@ QGCView {
                     action:     _guidedController.actionStartMission,
                     visible:    _guidedController.showStartMission
                 },
+                {
+                    title:      _guidedController.continueMissionTitle,
+                    text:       _guidedController.continueMissionMessage,
+                    action:     _guidedController.actionContinueMission,
+                    visible:    _guidedController.showContinueMission
+                },
                 {
                     title:      _guidedController.resumeMissionTitle,
                     text:       _guidedController.resumeMissionMessage,
@@ -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
diff --git a/src/FlightDisplay/GuidedActionList.qml b/src/FlightDisplay/GuidedActionList.qml
index 4e7d11727..6ff749c8f 100644
--- a/src/FlightDisplay/GuidedActionList.qml
+++ b/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)
                             }
diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
index daf14e027..77b560e60 100644
--- a/src/FlightDisplay/GuidedActionsController.qml
+++ b/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
-- 
2.22.0