Add Plan/Fly switch to ToolStrip

src/FlightDisplay/FlightDisplayView.qml

@@ -570,8 +570,9 @@ Item {
             anchors.top:        _mapAndVideo.top
             z:                  _mapAndVideo.z + 4
             maxHeight:          (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y
-            buttonVisible:      [_useChecklist, _guidedController.showTakeoff || !_guidedController.showLand, _guidedController.showLand && !_guidedController.showTakeoff, true, _guidedController.showPause, !_guidedController.showPause ]
-            buttonEnabled:      [_useChecklist && activeVehicle, _guidedController.showTakeoff, _guidedController.showLand, _guidedController.showRTL, _guidedController.showPause, _anyActionAvailable ]
+
+            buttonVisible:      [true, _useChecklist, _guidedController.showTakeoff || !_guidedController.showLand, _guidedController.showLand && !_guidedController.showTakeoff, true, _guidedController.showPause, !_guidedController.showPause ]
+            buttonEnabled:      [true, _useChecklist && activeVehicle, _guidedController.showTakeoff, _guidedController.showLand, _guidedController.showRTL, _guidedController.showPause, _anyActionAvailable ]
 
             property bool _anyActionAvailable: _guidedController.showStartMission || _guidedController.showResumeMission || _guidedController.showChangeAlt || _guidedController.showLandAbort
             property var _actionModel: [
@@ -609,6 +610,10 @@ Item {
 
             model: [
                 {
+                    name:               "Plan",
+                    iconSource:         "/qmlimages/Plan.svg",
+                },
+                {
                     name:               "Checklist",
                     iconSource:         "/qmlimages/check.svg",
                     dropPanelComponent: checklistDropPanel
@@ -642,6 +647,9 @@ Item {
 
             onClicked: {
                 guidedActionsController.closeAll()
+                if(index === 0) {
+                    mainWindow.showPlanView()
+                } else {
                     var action = model[index].action
                     if (action === -1) {
                         guidedActionList.model   = _actionModel
@@ -650,6 +658,8 @@ Item {
                         _guidedController.confirmAction(action)
                     }
                 }
+
+            }
         }
 
         GuidedActionsController {

src/PlanView/PlanView.qml

@@ -544,16 +544,22 @@ Item {
             anchors.topMargin:  _toolButtonTopMargin + anchors.leftMargin
             anchors.top:        parent.top
             z:                  QGroundControl.zOrderWidgets
-            showAlternateIcon:  [ _planMasterController.dirty, false, false, false, false, false, false ]
-            rotateImage:        [ _planMasterController.syncInProgress, false, false, false, false, false, false ]
-            animateImage:       [ _planMasterController.dirty, false, false, false, false, false, false ]
-            buttonEnabled:      [ !_planMasterController.syncInProgress, true, true, true, true, true, true ]
-            buttonVisible:      [ true, true, _waypointsOnlyMode, true, true, _showZoom, _showZoom ]
+
+            showAlternateIcon:  [ false, _planMasterController.dirty, false, false, false, false, false, false ]
+            rotateImage:        [ false, _planMasterController.syncInProgress, false, false, false, false, false, false ]
+            animateImage:       [ false, _planMasterController.dirty, false, false, false, false, false, false ]
+            buttonEnabled:      [ true, !_planMasterController.syncInProgress, true, true, true, true, true, true ]
+            buttonVisible:      [ true, true, true, _waypointsOnlyMode, true, true, false, false ]
             maxHeight:          mapScale.y - toolStrip.y
+
             property bool _showZoom: !ScreenTools.isMobile
 
             model: [
                 {
+                    name:                   qsTr("Fly"),
+                    iconSource:             "/qmlimages/PaperPlane.svg",
+                },
+                {
                     name:                   qsTr("File"),
                     iconSource:             "/qmlimages/MapSync.svg",
                     alternateIconSource:    "/qmlimages/MapSyncChanged.svg",
@@ -591,23 +597,26 @@ Item {
 
             onClicked: {
                 switch (index) {
-                    case 1:
+                case 0:
+                    mainWindow.showFlyView()
+                    break;
+                case 2:
                     _addWaypointOnClick = checked
                     _addROIOnClick      = false
                     break
-                    case 2:
+                case 3:
                     _addROIOnClick      = checked
                     _addWaypointOnClick = false
                     break
-                    case 3:
+                case 4:
                     if (_singleComplexItem) {
                         addComplexItem(_missionController.complexMissionItemNames[0])
                     }
                     break
-                    case 5:
+                case 6:
                     editorMap.zoomLevel += 0.5
                     break
-                    case 6:
+                case 7:
                     editorMap.zoomLevel -= 0.5
                     break
                 }