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
c4cf8396
Unverified
Commit
c4cf8396
authored
Sep 03, 2019
by
Don Gagne
Committed by
GitHub
Sep 03, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7756 from DonLakeFlyer/LogReplay
Move Log Replay bar to Window footer
parents
6179a340
448cec02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
14 deletions
+7
-14
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+2
-13
MainRootWindow.qml
src/ui/MainRootWindow.qml
+5
-1
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
c4cf8396
...
...
@@ -311,10 +311,7 @@ Item {
Item
{
id
:
_mapAndVideo
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
anchors.bottom
:
logReplayStatusBar
.
top
anchors.fill
:
parent
//-- Map View
Item
{
...
...
@@ -518,7 +515,7 @@ Item {
anchors.left
:
parent
.
left
anchors.right
:
altitudeSlider
.
visible
?
altitudeSlider
.
left
:
parent
.
right
anchors.bottom
:
parent
.
bottom
anchors.top
:
singleMultiSelector
.
visible
?
singleMultiSelector
.
bottom
:
undefined
anchors.top
:
singleMultiSelector
.
visible
?
singleMultiSelector
.
bottom
:
undefined
useLightColors
:
isBackgroundDark
missionController
:
_missionController
visible
:
singleVehicleView
.
checked
&&
!
QGroundControl
.
videoManager
.
fullScreen
...
...
@@ -751,14 +748,6 @@ Item {
}
}
LogReplayStatusBar
{
id
:
logReplayStatusBar
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
visible
:
QGroundControl
.
settingsManager
.
flyViewSettings
.
showLogReplayStatusBar
.
rawValue
&&
_flightMapContainer
.
state
===
"
fullMode
"
}
//-- Airspace Indicator
Rectangle
{
id
:
airspaceIndicator
...
...
src/ui/MainRootWindow.qml
View file @
c4cf8396
...
...
@@ -48,7 +48,7 @@ ApplicationWindow {
property
var
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
bool
communicationLost
:
activeVehicle
?
activeVehicle
.
connectionLost
:
false
property
string
formatedMessage
:
activeVehicle
?
activeVehicle
.
formatedMessage
:
""
property
real
availableHeight
:
mainWindow
.
height
-
mainWindow
.
header
.
height
property
real
availableHeight
:
mainWindow
.
height
-
mainWindow
.
header
.
height
-
mainWindow
.
footer
.
height
property
var
currentPlanMissionItem
:
planMasterControllerPlan
?
planMasterControllerPlan
.
missionController
.
currentPlanViewItem
:
null
property
var
planMasterControllerPlan
:
null
...
...
@@ -268,6 +268,10 @@ ApplicationWindow {
}
}
footer
:
LogReplayStatusBar
{
visible
:
QGroundControl
.
settingsManager
.
flyViewSettings
.
showLogReplayStatusBar
.
rawValue
}
//-------------------------------------------------------------------------
//-- Fly View
FlightDisplayView
{
...
...
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