Browse Source

Move Log Replay bar to Window footer

QGC4.4
Don Gagne 6 years ago
parent
commit
448cec020e
  1. 15
      src/FlightDisplay/FlightDisplayView.qml
  2. 6
      src/ui/MainRootWindow.qml

15
src/FlightDisplay/FlightDisplayView.qml

@ -311,10 +311,7 @@ Item { @@ -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 { @@ -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 { @@ -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

6
src/ui/MainRootWindow.qml

@ -48,7 +48,7 @@ ApplicationWindow { @@ -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 { @@ -268,6 +268,10 @@ ApplicationWindow {
}
}
footer: LogReplayStatusBar {
visible: QGroundControl.settingsManager.flyViewSettings.showLogReplayStatusBar.rawValue
}
//-------------------------------------------------------------------------
//-- Fly View
FlightDisplayView {

Loading…
Cancel
Save