Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
dccfcc1f
Unverified
Commit
dccfcc1f
authored
Feb 22, 2020
by
Don Gagne
Committed by
GitHub
Feb 22, 2020
Browse files
Merge pull request #8389 from dakejahl/pr-show_checklist_if_needed
Show checklist if needed
parents
47390a71
4a637d90
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/FlightDisplay/FlightDisplayView.qml
View file @
dccfcc1f
...
...
@@ -70,12 +70,6 @@ Item {
readonly
property
string
_mainIsMapKey
:
"
MainFlyWindowIsMap
"
readonly
property
string
_PIPVisibleKey
:
"
IsPIPVisible
"
onVisibleChanged
:
{
if
(
activeVehicle
&&
!
_checklistComplete
&&
_enforceChecklist
)
{
checklistPopupTimer
.
restart
()
}
}
Timer
{
id
:
checklistPopupTimer
interval
:
1000
...
...
@@ -122,6 +116,12 @@ Item {
return
true
;
}
function
showPreflightChecklistIfNeeded
()
{
if
(
activeVehicle
&&
!
_checklistComplete
&&
_enforceChecklist
)
{
checklistPopupTimer
.
restart
()
}
}
Connections
{
target
:
_missionController
onResumeMissionUploadFail
:
guidedActionsController
.
confirmAction
(
guidedActionsController
.
actionResumeMissionUploadFail
)
...
...
src/ui/MainRootWindow.qml
View file @
dccfcc1f
...
...
@@ -113,6 +113,10 @@ ApplicationWindow {
}
function
showFlyView
()
{
if
(
!
flightView
.
visible
)
{
flightView
.
showPreflightChecklistIfNeeded
()
}
viewSwitch
(
false
)
flightView
.
visible
=
true
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment