Merge pull request #6543 from DonLakeFlyer/SimpleMissionStart

Support for simple MissionStart item

src/PlanView/MissionSettingsEditor.qml

@@ -37,6 +37,7 @@ Rectangle {
     property var    _appSettings:                   QGroundControl.settingsManager.appSettings
     property bool   _waypointsOnlyMode:             QGroundControl.corePlugin.options.missionWaypointsOnly
     property bool   _showCameraSection:             !_waypointsOnlyMode || QGroundControl.corePlugin.showAdvancedUI
+    property bool   _simpleMissionStart:            QGroundControl.corePlugin.options.showSimpleMissionStart
 
     readonly property string _firmwareLabel:    qsTr("Firmware")
     readonly property string _vehicleLabel:     qsTr("Vehicle")
@@ -53,11 +54,6 @@ Rectangle {
         anchors.top:        parent.top
         spacing:            _margin
 
-        Column {
-            anchors.left:   parent.left
-            anchors.right:  parent.right
-            spacing:        _margin
-
         GridLayout {
             anchors.left:   parent.left
             anchors.right:  parent.right
@@ -76,7 +72,7 @@ Rectangle {
             QGCCheckBox {
                 id:         flightSpeedCheckBox
                 text:       qsTr("Flight speed")
-                    visible:    !_missionVehicle.vtol
+                visible:    !_missionVehicle.vtol && !_simpleMissionStart
                 checked:    missionItem.speedSection.specifyFlightSpeed
                 onClicked:   missionItem.speedSection.specifyFlightSpeed = checked
             }
@@ -86,9 +82,14 @@ Rectangle {
                 visible:            flightSpeedCheckBox.visible
                 enabled:            flightSpeedCheckBox.checked
             }
-            } // GridLayout
         }
 
+        Column {
+            anchors.left:   parent.left
+            anchors.right:  parent.right
+            spacing:        _margin
+            visible:        !_simpleMissionStart
+
             CameraSection {
                 id:         cameraSection
                 checked:    missionItem.cameraSection.settingsSpecified
@@ -233,4 +234,5 @@ Rectangle {
                 }
             }
         } // Column
+    } // Column
 } // Rectangle

src/api/QGCOptions.h

@@ -48,6 +48,7 @@ public:
     Q_PROPERTY(bool                     showMissionStatus               READ showMissionStatus              CONSTANT)
     Q_PROPERTY(bool                     guidedActionsRequireRCRSSI      READ guidedActionsRequireRCRSSI     CONSTANT)
     Q_PROPERTY(bool                     showMissionAbsoluteAltitude     READ showMissionAbsoluteAltitude    NOTIFY showMissionAbsoluteAltitudeChanged)
+    Q_PROPERTY(bool                     showSimpleMissionStart          READ showSimpleMissionStart         NOTIFY showSimpleMissionStartChanged)
 
     /// Should QGC hide its settings menu and colapse it into one single menu (Settings and Vehicle Setup)?
     /// @return true if QGC should consolidate both menus into one.
@@ -88,6 +89,7 @@ public:
     virtual bool    showOfflineMapExport            () const { return true; }
     virtual bool    showOfflineMapImport            () const { return true; }
     virtual bool    showMissionAbsoluteAltitude     () const { return true; }
+    virtual bool    showSimpleMissionStart          () const { return false; }
 
 #if defined(__mobile__)
     virtual bool    useMobileFileDialog             () const { return true;}
@@ -114,6 +116,7 @@ signals:
     void showOfflineMapExportChanged            ();
     void showOfflineMapImportChanged            ();
     void showMissionAbsoluteAltitudeChanged     ();
+    void showSimpleMissionStartChanged          ();
 
 private:
     CustomInstrumentWidget* _defaultInstrumentWidget;