Skip to content

Add automatic mission start/resume popups setting #13689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubenp02 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −2
Open

Add automatic mission start/resume popups setting #13689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/FlightDisplay/GuidedActionsController.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ Item {
console.log("showStartMission", showStartMission)
}
_outputState()
if (showStartMission) {
if (showStartMission &&
_flyViewSettings.enableAutomaticMissionPopups.rawValue) {
confirmAction(actionStartMission)
}
}
Expand All @@ -290,7 +291,8 @@ Item {
console.log("showContinueMission", showContinueMission)
}
_outputState()
if (showContinueMission) {
if (showContinueMission &&
_flyViewSettings.enableAutomaticMissionPopups.rawValue) {
confirmAction(actionContinueMission)
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/Settings/FlyView.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@
"shortDesc": "Show joystick indicator in toolbar",
"type": "bool",
"default": false
},
{
"name": "enableAutomaticMissionPopups",
"shortDesc": "Enable automatic mission start/resume popups",
"type": "bool",
"default": true
}
]
}
1 change: 1 addition & 0 deletions src/Settings/FlyViewSettings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ DECLARE_SETTINGSFACT(FlyViewSettings, instrumentQmlFile2)
DECLARE_SETTINGSFACT(FlyViewSettings, requestControlAllowTakeover)
DECLARE_SETTINGSFACT(FlyViewSettings, requestControlTimeout)
DECLARE_SETTINGSFACT(FlyViewSettings, showJoystickIndicatorInToolbar)
DECLARE_SETTINGSFACT(FlyViewSettings, enableAutomaticMissionPopups)
1 change: 1 addition & 0 deletions src/Settings/FlyViewSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ class FlyViewSettings : public SettingsGroup
DEFINE_SETTINGFACT(requestControlAllowTakeover)
DEFINE_SETTINGFACT(requestControlTimeout)
DEFINE_SETTINGFACT(showJoystickIndicatorInToolbar)
DEFINE_SETTINGFACT(enableAutomaticMissionPopups)
};
9 changes: 9 additions & 0 deletions src/UI/AppSettings/FlyViewSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ SettingsPage {
property Fact _viewer3DOsmFilePath: _viewer3DSettings.osmFilePath
property Fact _viewer3DBuildingLevelHeight: _viewer3DSettings.buildingLevelHeight
property Fact _viewer3DAltitudeBias: _viewer3DSettings.altitudeBias
property Fact _enableAutomaticMissionPopups: _flyViewSettings.enableAutomaticMissionPopups

function mavlinkActionList() {
var fileModel = QGCFileDialogController.getFiles(_settingsManager.appSettings.mavlinkActionsSavePath, "*.json")
Expand Down Expand Up @@ -114,6 +115,14 @@ SettingsPage {
fact: _flyViewSettings.showJoystickIndicatorInToolbar
visible: fact.visible
}

FactCheckBoxSlider {
Layout.fillWidth: true
text: qsTr("Enable Automatic Mission Start/Resume Popups")
fact: _enableAutomaticMissionPopups
visible: _enableAutomaticMissionPopups.visible
property Fact _enableAutomaticMissionPopups: _flyViewSettings.enableAutomaticMissionPopups
}
}

SettingsGroupLayout {
Expand Down
Loading