Merge pull request #8409 from DonLakeFlyer/PresetWork

Preset work: Allow custom build to specify which presets are built in

src/MissionManager/ComplexMissionItem.cc

@@ -9,6 +9,8 @@
 
 #include "ComplexMissionItem.h"
 #include "QGCApplication.h"
+#include "QGCCorePlugin.h"
+#include "QGCOptions.h"
 
 #include <QSettings>
 
@@ -54,8 +56,12 @@ void ComplexMissionItem::savePreset(const QString& name)
 
 void ComplexMissionItem::deletePreset(const QString& name)
 {
-    QSettings settings;
+    if (qgcApp()->toolbox()->corePlugin()->options()->surveyBuiltInPresetNames().contains(name)) {
+        qgcApp()->showMessage(tr("'%1' is a built-in preset which cannot be deleted.").arg(name));
+        return;
+    }
 
+    QSettings settings;
     settings.beginGroup(presetsSettingsGroup());
     settings.beginGroup(_presetSettingsKey);
     settings.remove(name);

src/PlanView/SurveyItemEditor.qml

@@ -440,7 +440,19 @@ Rectangle {
                         Layout.fillWidth:   true
                         text:               qsTr("Delete Preset")
                         enabled:            missionItem.presetNames.length != 0
-                        onClicked:          missionItem.deletePreset(presetCombo.textAt(presetCombo.currentIndex))
+                        onClicked:          mainWindow.showComponentDialog(deletePresetMessage, qsTr("Delete Preset"), mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
+
+                        Component {
+                            id: deletePresetMessage
+                            QGCViewMessage {
+                                message: qsTr("Are you sure you want to delete '%1' preset?").arg(presetName)
+                                property string presetName: presetCombo.textAt(presetCombo.currentIndex)
+                                function accept() {
+                                    missionItem.deletePreset(presetName)
+                                    hideDialog()
+                                }
+                            }
+                        }
                     }
 
                 }

src/api/QGCOptions.h

@@ -67,6 +67,7 @@ public:
     Q_PROPERTY(bool                     enableMultiVehicleList          READ enableMultiVehicleList         CONSTANT)
     Q_PROPERTY(bool                     enableMapScale                  READ enableMapScale                 CONSTANT)
     Q_PROPERTY(bool                     enableSaveMainWindowPosition    READ enableSaveMainWindowPosition   CONSTANT)
+    Q_PROPERTY(QStringList              surveyBuiltInPresetNames        READ surveyBuiltInPresetNames       CONSTANT)
 
     /// 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.
@@ -130,6 +131,7 @@ public:
     virtual bool    enableMapScale                  () const { return true; }
     /// Desktop builds save the main application size and position on close (and restore it on open)
     virtual bool    enableSaveMainWindowPosition    () const { return true; }
+    virtual QStringList surveyBuiltInPresetNames    () const { return QStringList(); } // Built in presets cannot be deleted
 
 #if defined(__mobile__)
     virtual bool    useMobileFileDialog             () const { return true;}