Skip to content

Q
qgroundcontrol
Commit edd8f9d0 authored by DoinLakeFlyer's avatar DoinLakeFlyer
Browse files
Options

parent e53d470f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 198 deletions
src/PlanView/MissionItemEditor.qml
View file @ edd8f9d0
This diff is collapsed.
src/PlanView/PlanView.qml
View file @ edd8f9d0
...@@ -49,7 +49,7 @@ Item { ...@@ -49,7 +49,7 @@ Item {
property bool _addWaypointOnClick: false property bool _addWaypointOnClick: false
property bool _addROIOnClick: false property bool _addROIOnClick: false
property bool _singleComplexItem: _missionController.complexMissionItemNames.length === 1 property bool _singleComplexItem: _missionController.complexMissionItemNames.length === 1
property int _editingLayer: bar.currentIndex ? _layers[bar.currentIndex] : _layerMission property int _editingLayer: layerTabBar.currentIndex ? _layers[layerTabBar.currentIndex] : _layerMission
property int _toolStripBottom: toolStrip.height + toolStrip.y property int _toolStripBottom: toolStrip.height + toolStrip.y
property var _appSettings: QGroundControl.settingsManager.appSettings property var _appSettings: QGroundControl.settingsManager.appSettings
property var _planViewSettings: QGroundControl.settingsManager.planViewSettings property var _planViewSettings: QGroundControl.settingsManager.planViewSettings
...@@ -704,7 +704,7 @@ Item { ...@@ -704,7 +704,7 @@ Item {
height: parent.height height: parent.height
width: _rightPanelWidth width: _rightPanelWidth
color: qgcPal.window color: qgcPal.window
opacity: planExpanded.visible ? 0.2 : 0 opacity: layerTabBar.visible ? 0.2 : 0
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: _toolsMargin anchors.rightMargin: _toolsMargin
...@@ -781,38 +781,21 @@ Item { ...@@ -781,38 +781,21 @@ Item {
} }
//------------------------------------------------------- //-------------------------------------------------------
// Mission Controls (Expanded) // Mission Controls (Expanded)
Rectangle { QGCTabBar {
id: planExpanded id: layerTabBar
width: parent.width width: parent.width
height: (!planControlColapsed || !_airspaceEnabled) ? bar.height + ScreenTools.defaultFontPixelHeight : 0
color: qgcPal.missionItemEditor
radius: _radius
visible: (!planControlColapsed || !_airspaceEnabled) && QGroundControl.corePlugin.options.enablePlanViewSelector visible: (!planControlColapsed || !_airspaceEnabled) && QGroundControl.corePlugin.options.enablePlanViewSelector
Item { Component.onCompleted: currentIndex = 0
height: bar.height QGCTabButton {
anchors.left: parent.left text: qsTr("Mission")
anchors.right: parent.right }
anchors.margins: ScreenTools.defaultFontPixelWidth QGCTabButton {
anchors.verticalCenter: parent.verticalCenter text: qsTr("Fence")
QGCTabBar { enabled: _geoFenceController.supported
id: bar }
width: parent.width QGCTabButton {
anchors.centerIn: parent text: qsTr("Rally")
Component.onCompleted: { enabled: _rallyPointController.supported
currentIndex = 0
}
QGCTabButton {
text: qsTr("Mission")
}
QGCTabButton {
text: qsTr("Fence")
enabled: _geoFenceController.supported
}
QGCTabButton {
text: qsTr("Rally")
enabled: _rallyPointController.supported
}
}
} }
} }
} }
......
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