Skip to content

Commit 837087e

Browse files
committed
Add automatic mission confirm. popups setting
Added a FlyView setting to enable mission start/resume confirmation popups appearing automatically. This option is enabled by default to match the previous behavior.
1 parent 7c11680 commit 837087e

File tree

5 files changed

+21
-2
lines changed

5 files changed

+21
-2
lines changed

src/FlightDisplay/GuidedActionsController.qml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ Item {
281281
console.log("showStartMission", showStartMission)
282282
}
283283
_outputState()
284-
if (showStartMission) {
284+
if (showStartMission &&
285+
QGroundControl.settingsManager.flyViewSettings.enableAutomaticConfirmPopups) {
285286
confirmAction(actionStartMission)
286287
}
287288
}
@@ -290,7 +291,8 @@ Item {
290291
console.log("showContinueMission", showContinueMission)
291292
}
292293
_outputState()
293-
if (showContinueMission) {
294+
if (showContinueMission &&
295+
QGroundControl.settingsManager.flyViewSettings.enableAutomaticConfirmPopups) {
294296
confirmAction(actionContinueMission)
295297
}
296298
}

src/Settings/FlyView.SettingsGroup.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@
108108
"shortDesc": "Show joystick indicator in toolbar",
109109
"type": "bool",
110110
"default": false
111+
},
112+
{
113+
"name": "enableAutomaticMissionConfirmPopups",
114+
"shortDesc": "Enable automatic mission start/resume confirmation popups",
115+
"type": "bool",
116+
"default": true
111117
}
112118
]
113119
}

src/Settings/FlyViewSettings.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ DECLARE_SETTINGSFACT(FlyViewSettings, instrumentQmlFile2)
2929
DECLARE_SETTINGSFACT(FlyViewSettings, requestControlAllowTakeover)
3030
DECLARE_SETTINGSFACT(FlyViewSettings, requestControlTimeout)
3131
DECLARE_SETTINGSFACT(FlyViewSettings, showJoystickIndicatorInToolbar)
32+
DECLARE_SETTINGSFACT(FlyViewSettings, enableAutomaticMissionConfirmPopups)

src/Settings/FlyViewSettings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ class FlyViewSettings : public SettingsGroup
3939
DEFINE_SETTINGFACT(requestControlAllowTakeover)
4040
DEFINE_SETTINGFACT(requestControlTimeout)
4141
DEFINE_SETTINGFACT(showJoystickIndicatorInToolbar)
42+
DEFINE_SETTINGFACT(enableAutomaticMissionConfirmPopups)
4243
};

src/UI/AppSettings/FlyViewSettings.qml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ SettingsPage {
3939
property Fact _viewer3DOsmFilePath: _viewer3DSettings.osmFilePath
4040
property Fact _viewer3DBuildingLevelHeight: _viewer3DSettings.buildingLevelHeight
4141
property Fact _viewer3DAltitudeBias: _viewer3DSettings.altitudeBias
42+
property Fact _enableAutomaticConfirmPopups: _flyViewSettings.enableAutomaticMissionConfirmPopups
4243

4344
function mavlinkActionList() {
4445
var fileModel = QGCFileDialogController.getFiles(_settingsManager.appSettings.mavlinkActionsSavePath, "*.json")
@@ -114,6 +115,14 @@ SettingsPage {
114115
fact: _flyViewSettings.showJoystickIndicatorInToolbar
115116
visible: fact.visible
116117
}
118+
119+
FactCheckBoxSlider {
120+
Layout.fillWidth: true
121+
text: qsTr("Enable Automatic Mission Start/Resume Confirmation Popups")
122+
fact: _enableAutomaticMissionConfirmPopups
123+
visible: _enableAutomaticMissionConfirmPopups.visible
124+
property Fact _enableAutomaticMissionConfirmPopups: _flyViewSettings.enableAutomaticMissionConfirmPopups
125+
}
117126
}
118127

119128
SettingsGroupLayout {

0 commit comments

Comments
 (0)