Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a08427a3
Commit
a08427a3
authored
Apr 24, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow plugins to enable/disable multiple vehicles selector
parent
2c91fdd2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+2
-2
QGCOptions.h
src/api/QGCOptions.h
+2
-0
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
a08427a3
...
...
@@ -486,7 +486,7 @@ Item {
anchors.top
:
parent
.
top
spacing
:
ScreenTools
.
defaultFontPixelWidth
z
:
_mapAndVideo
.
z
+
4
visible
:
QGroundControl
.
multiVehicleManager
.
vehicles
.
count
>
1
visible
:
QGroundControl
.
multiVehicleManager
.
vehicles
.
count
>
1
&&
QGroundControl
.
corePlugin
.
options
.
enableMultiVehicleList
ExclusiveGroup
{
id
:
multiVehicleSelectorGroup
}
...
...
@@ -535,7 +535,7 @@ Item {
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
width
:
ScreenTools
.
defaultFontPixelWidth
*
30
visible
:
!
singleVehicleView
.
checked
&&
!
QGroundControl
.
videoManager
.
fullScreen
visible
:
!
singleVehicleView
.
checked
&&
!
QGroundControl
.
videoManager
.
fullScreen
&&
QGroundControl
.
corePlugin
.
options
.
enableMultiVehicleList
z
:
_mapAndVideo
.
z
+
4
guidedActionsController
:
_guidedController
}
...
...
src/api/QGCOptions.h
View file @
a08427a3
...
...
@@ -62,6 +62,7 @@ public:
Q_PROPERTY
(
float
devicePixelDensity
READ
devicePixelDensity
NOTIFY
devicePixelDensityChanged
)
Q_PROPERTY
(
bool
checkFirmwareVersion
READ
checkFirmwareVersion
CONSTANT
)
Q_PROPERTY
(
bool
showMavlinkLogOptions
READ
showMavlinkLogOptions
CONSTANT
)
Q_PROPERTY
(
bool
enableMultiVehicleList
READ
enableMultiVehicleList
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.
...
...
@@ -113,6 +114,7 @@ public:
virtual
bool
disableVehicleConnection
()
const
{
return
false
;
}
///< true: vehicle connection is disabled
virtual
bool
checkFirmwareVersion
()
const
{
return
true
;
}
virtual
bool
showMavlinkLogOptions
()
const
{
return
true
;
}
virtual
bool
enableMultiVehicleList
()
const
{
return
true
;
}
#if defined(__mobile__)
virtual
bool
useMobileFileDialog
()
const
{
return
true
;}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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