Merge pull request #6885 from DonLakeFlyer/MVStartPause

Multi-Vehicle Start/Pause Fixes

ChangeLog.md

@@ -5,7 +5,7 @@ Note: This file only contains high level features or important fixes.
 ## 3.4
 
 ### 3.4.4 - Not yet released
-* 
+* Multi-Vehicle Start Mission and Pause now work correctly. Issue #6864.
 
 ### 3.4.3
 * Fix bug where Resume Mission would not display correctly in some cases. Issue #6835.

src/FlightDisplay/FlightDisplayView.qml

@@ -469,13 +469,14 @@ QGCView {
         }
 
         MultiVehicleList {
-            anchors.margins:    _margins
-            anchors.top:        singleMultiSelector.bottom
-            anchors.right:      parent.right
-            anchors.bottom:     parent.bottom
-            width:              ScreenTools.defaultFontPixelWidth * 30
-            visible:            !singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
-            z:                  _panel.z + 4
+            anchors.margins:            _margins
+            anchors.top:                singleMultiSelector.bottom
+            anchors.right:              parent.right
+            anchors.bottom:             parent.bottom
+            width:                      ScreenTools.defaultFontPixelWidth * 30
+            visible:                    !singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
+            z:                          _panel.z + 4
+            guidedActionsController:    _guidedController
         }
 
         //-- Virtual Joystick

src/FlightDisplay/GuidedActionsController.qml

@@ -40,10 +40,12 @@ Item {
     readonly property string takeoffTitle:                  qsTr("Takeoff")
     readonly property string landTitle:                     qsTr("Land")
     readonly property string startMissionTitle:             qsTr("Start Mission")
+    readonly property string mvStartMissionTitle:           qsTr("Start Mission (MV)")
     readonly property string continueMissionTitle:          qsTr("Continue Mission")
     readonly property string resumeMissionTitle:            qsTr("Resume Mission")
     readonly property string resumeMissionUploadFailTitle:  qsTr("Resume FAILED")
     readonly property string pauseTitle:                    qsTr("Pause")
+    readonly property string mvPauseTitle:                  qsTr("Pause (MV)")
     readonly property string changeAltTitle:                qsTr("Change Altitude")
     readonly property string orbitTitle:                    qsTr("Orbit")
     readonly property string landAbortTitle:                qsTr("Land Abort")
@@ -247,7 +249,7 @@ Item {
             confirmDialog.hideTrigger = Qt.binding(function() { return !showStartMission })
             break;
         case actionMVStartMission:
-            confirmDialog.title = startMissionTitle
+            confirmDialog.title = mvStartMissionTitle
             confirmDialog.message = startMissionMessage
             confirmDialog.hideTrigger = true
             break;
@@ -319,7 +321,7 @@ Item {
             altitudeSlider.visible = true
             break;
         case actionMVPause:
-            confirmDialog.title = pauseTitle
+            confirmDialog.title = mvPauseTitle
             confirmDialog.message = mvPauseMessage
             confirmDialog.hideTrigger = true
             break;