Commit 3eca3cca authored by Gus Grubba's avatar Gus Grubba

Merge pull request #2079 from dogmaphobic/flightView

Preliminary work on the Flight View
parents 5b076d01 44e40518
......@@ -127,7 +127,9 @@ include(QGCExternalLibs.pri)
# Main QGroundControl portion of project file
#
RESOURCES += qgroundcontrol.qrc
RESOURCES += \
qgroundcontrol.qrc \
qgcresources.qrc
DEPENDPATH += \
. \
......
This diff is collapsed.
This diff is collapsed.
......@@ -30,20 +30,20 @@ import QGroundControl.FlightDisplay 1.0
import QGroundControl.ScreenTools 1.0
/// Qml for MainWindow
FlightDisplayView {
Item {
id: _root
topMargin: toolbarLoader.height + (ScreenTools.defaultFontPixelHeight / 2)
property var _toolbar: toolbarLoader.item
readonly property string _planViewSource: "MissionEditor.qml"
readonly property string _setupViewSource: "SetupView.qml"
Connections {
target: controller
onShowFlyView: {
flightView.visible = true
setupViewLoader.visible = false
planViewLoader.visible = false
_root.hideWidgets = false
......@@ -53,6 +53,7 @@ FlightDisplayView {
if (planViewLoader.source != _planViewSource) {
planViewLoader.source = _planViewSource
}
flightView.visible = false
setupViewLoader.visible = false
planViewLoader.visible = true
_root.hideWidgets = true
......@@ -62,6 +63,7 @@ FlightDisplayView {
if (setupViewLoader.source != _setupViewSource) {
setupViewLoader.source = _setupViewSource
}
flightView.visible = false
setupViewLoader.visible = true
planViewLoader.visible = false
_root.hideWidgets = true
......@@ -89,6 +91,17 @@ FlightDisplayView {
z: _root.zOrderTopMost
}
FlightDisplayView {
id: flightView
anchors.left: parent.left
anchors.right: parent.right
anchors.top: toolbarLoader.bottom
anchors.bottom: parent.bottom
visible: true
property real zOrder: _root.zOrderTopMost
}
Loader {
id: planViewLoader
anchors.left: parent.left
......
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