Commit 448cec02 authored by Don Gagne's avatar Don Gagne

parent e17deefa
...@@ -311,10 +311,7 @@ Item { ...@@ -311,10 +311,7 @@ Item {
Item { Item {
id: _mapAndVideo id: _mapAndVideo
anchors.left: parent.left anchors.fill: parent
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: logReplayStatusBar.top
//-- Map View //-- Map View
Item { Item {
...@@ -518,7 +515,7 @@ Item { ...@@ -518,7 +515,7 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.top: singleMultiSelector.visible? singleMultiSelector.bottom:undefined anchors.top: singleMultiSelector.visible? singleMultiSelector.bottom : undefined
useLightColors: isBackgroundDark useLightColors: isBackgroundDark
missionController: _missionController missionController: _missionController
visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
...@@ -751,14 +748,6 @@ Item { ...@@ -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 //-- Airspace Indicator
Rectangle { Rectangle {
id: airspaceIndicator id: airspaceIndicator
......
...@@ -48,7 +48,7 @@ ApplicationWindow { ...@@ -48,7 +48,7 @@ ApplicationWindow {
property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property bool communicationLost: activeVehicle ? activeVehicle.connectionLost : false property bool communicationLost: activeVehicle ? activeVehicle.connectionLost : false
property string formatedMessage: activeVehicle ? activeVehicle.formatedMessage : "" 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 currentPlanMissionItem: planMasterControllerPlan ? planMasterControllerPlan.missionController.currentPlanViewItem : null
property var planMasterControllerPlan: null property var planMasterControllerPlan: null
...@@ -268,6 +268,10 @@ ApplicationWindow { ...@@ -268,6 +268,10 @@ ApplicationWindow {
} }
} }
footer: LogReplayStatusBar {
visible: QGroundControl.settingsManager.flyViewSettings.showLogReplayStatusBar.rawValue
}
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//-- Fly View //-- Fly View
FlightDisplayView { FlightDisplayView {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment