zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #8977 from DonLakeFlyer/ViewsAndTools 

Split into Views and Tools
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
8cdaa3c28d 1d264a8e00
commit
0a24a90faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 103 additions and 139 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/AnalyzeView/AnalyzeView.qml
  2. 5
      src/FlightDisplay/FlyViewToolStripActionList.qml
  3. 21
      src/PlanView/PlanView.qml
  4. 8
      src/VehicleSetup/SetupView.qml
  5. 8
      src/ui/AppSettings.qml
  6. 157
      src/ui/MainRootWindow.qml
  7. 26
      src/ui/toolbar/MainToolBar.qml

9
src/AnalyzeView/AnalyzeView.qml
Unescape View File

@ -82,15 +82,6 @@ Rectangle { @@ -82,15 +82,6 @@ Rectangle {
}
}
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Analyze")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
visible: !ScreenTools.isShortScreen
}
Repeater {
id: buttonRepeater
model: QGroundControl.corePlugin ? QGroundControl.corePlugin.analyzePages : []

5
src/FlightDisplay/FlyViewToolStripActionList.qml
Unescape View File

@ -18,6 +18,11 @@ ToolStripActionList { @@ -18,6 +18,11 @@ ToolStripActionList {
signal displayPreFlightChecklist
model: [
ToolStripAction {
text: qsTr("Plan")
iconSource: "/qmlimages/Plan.svg"
onTriggered: mainWindow.showPlanView()
},
PreFlightCheckListShowAction { onTriggered: displayPreFlightChecklist() },
GuidedActionTakeoff { },
GuidedActionLand { },

21
src/PlanView/PlanView.qml
Unescape View File

@ -624,14 +624,14 @@ Item { @@ -624,14 +624,14 @@ Item {
maxHeight: parent.height - toolStrip.y
title: qsTr("Plan")
//readonly property int flyButtonIndex: 0
readonly property int fileButtonIndex: 0
readonly property int takeoffButtonIndex: 1
readonly property int waypointButtonIndex: 2
readonly property int roiButtonIndex: 3
readonly property int patternButtonIndex: 4
readonly property int landButtonIndex: 5
readonly property int centerButtonIndex: 6
readonly property int flyButtonIndex: 0
readonly property int fileButtonIndex: 1
readonly property int takeoffButtonIndex: 2
readonly property int waypointButtonIndex: 3
readonly property int roiButtonIndex: 4
readonly property int patternButtonIndex: 5
readonly property int landButtonIndex: 6
readonly property int centerButtonIndex: 7
property bool _isRallyLayer: _editingLayer == _layerRallyPoints
property bool _isMissionLayer: _editingLayer == _layerMission
@ -640,6 +640,11 @@ Item { @@ -640,6 +640,11 @@ Item {
id: toolStripActionList
model: [
ToolStripAction {
text: qsTr("Fly")
iconSource: "/qmlimages/PaperPlane.svg"
onTriggered: mainWindow.showFlyView()
},
ToolStripAction {
text: qsTr("File")
enabled: !_planMasterController.syncInProgress
visible: true

8
src/VehicleSetup/SetupView.qml
Unescape View File

@ -205,14 +205,6 @@ Rectangle { @@ -205,14 +205,6 @@ Rectangle {
id: buttonColumn
spacing: _defaultTextHeight / 2
QGCLabel {
Layout.fillWidth: true
text: qsTr("Vehicle Setup")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
visible: !ScreenTools.isShortScreen
}
Repeater {
model: _corePlugin ? _corePlugin.settingsPages : []
visible: _corePlugin && _corePlugin.options.combineSettingsAndSetup

8
src/ui/AppSettings.qml
Unescape View File

@ -57,14 +57,6 @@ Rectangle { @@ -57,14 +57,6 @@ Rectangle {
property real _maxButtonWidth: 0
QGCLabel {
Layout.fillWidth: true
text: qsTr("Application Settings")
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
visible: !ScreenTools.isShortScreen
}
Repeater {
model: QGroundControl.corePlugin.settingsPages
QGCButton {

157
src/ui/MainRootWindow.qml
Unescape View File

@ -124,11 +124,10 @@ ApplicationWindow { @@ -124,11 +124,10 @@ ApplicationWindow {
}
function viewSwitch(currentToolbar) {
settingsWindow.visible = false
setupWindow.visible = false
analyzeWindow.visible = false
toolDrawer.visible = false
toolDrawer.source = ""
flightView.visible = false
planViewLoader.visible = false
planView.visible = false
toolbar.currentToolbar = currentToolbar
}
@ -142,22 +141,25 @@ ApplicationWindow { @@ -142,22 +141,25 @@ ApplicationWindow {
function showPlanView() {
viewSwitch(toolbar.planViewToolbar)
planViewLoader.visible = true
planView.visible = true
}
function showAnalyzeView() {
viewSwitch(toolbar.simpleToolbar)
analyzeWindow.visible = true
toolDrawer.source = "AnalyzeView.qml"
toolDrawer.title = qsTr("Analyze Tools")
toolDrawer.visible = true
}
function showSetupView() {
viewSwitch(toolbar.simpleToolbar)
setupWindow.visible = true
toolDrawer.source = "SetupView.qml"
toolDrawer.title = qsTr("Vehicle Setup")
toolDrawer.visible = true
}
function showSettingsView() {
viewSwitch(toolbar.simpleToolbar)
settingsWindow.visible = true
toolDrawer.source = "AppSettings.qml"
toolDrawer.title = qsTr("Application Settings")
toolDrawer.visible = true
}
//-------------------------------------------------------------------------
@ -326,11 +328,12 @@ ApplicationWindow { @@ -326,11 +328,12 @@ ApplicationWindow {
}
Drawer {
id: viewSelectDrawer
id: toolSelectDrawer
height: mainWindow.height
edge: Qt.LeftEdge
interactive: true
dragMargin: 0
closePolicy: Drawer.NoAutoClose
visible: false
property var _mainWindow: mainWindow
@ -357,74 +360,48 @@ ApplicationWindow { @@ -357,74 +360,48 @@ ApplicationWindow {
spacing: ScreenTools.defaultFontPixelWidth
SubMenuButton {
id: flyButton
height: viewSelectDrawer._toolButtonHeight
Layout.fillWidth: true
text: qsTr("Fly View")
imageResource: "/qmlimages/PaperPlane.svg"
imageColor: qgcPal.text
onClicked: {
if (toolbar.viewButtonClicked(this)) {
mainWindow.showFlyView()
}
}
}
SubMenuButton {
id: planButton
height: viewSelectDrawer._toolButtonHeight
id: setupButton
height: toolSelectDrawer._toolButtonHeight
Layout.fillWidth: true
text: qsTr("Plan Mission")
imageResource: "/qmlimages/Plan.svg"
text: qsTr("Vehicle Setup")
imageColor: qgcPal.text
imageResource: "/qmlimages/Gears.svg"
onClicked: {
if (toolbar.viewButtonClicked(this)) {
mainWindow.showPlanView()
if (!mainWindow.preventViewSwitch()) {
mainWindow.showSetupView()
toolSelectDrawer.visible = false
}
}
}
SubMenuButton {
id: analyzeButton
height: viewSelectDrawer._toolButtonHeight
height: toolSelectDrawer._toolButtonHeight
Layout.fillWidth: true
text: qsTr("Analyze Tools")
imageResource: "/qmlimages/Analyze.svg"
imageColor: qgcPal.text
visible: QGroundControl.corePlugin.showAdvancedUI
onClicked: {
if (toolbar.viewButtonClicked(this)) {
if (!mainWindow.preventViewSwitch()) {
mainWindow.showAnalyzeView()
}
}
}
SubMenuButton {
id: setupButton
height: viewSelectDrawer._toolButtonHeight
Layout.fillWidth: true
text: qsTr("Vehicle Setup")
imageColor: qgcPal.text
imageResource: "/qmlimages/Gears.svg"
onClicked: {
if (toolbar.viewButtonClicked(this)) {
mainWindow.showSetupView()
toolSelectDrawer.visible = false
}
}
}
SubMenuButton {
id: settingsButton
height: viewSelectDrawer._toolButtonHeight
height: toolSelectDrawer._toolButtonHeight
Layout.fillWidth: true
text: qsTr("Application Settings")
imageResource: "/res/QGCLogoFull"
imageColor: "transparent"
visible: !QGroundControl.corePlugin.options.combineSettingsAndSetup
onClicked: {
if (toolbar.viewButtonClicked(this)) {
if (!mainWindow.preventViewSwitch()) {
mainWindow.showSettingsView()
toolSelectDrawer.visible = false
}
}
}
@ -454,13 +431,18 @@ ApplicationWindow { @@ -454,13 +431,18 @@ ApplicationWindow {
}
}
DeadMouseArea {
anchors.fill: easterEggMouseArea
}
QGCMouseArea {
id: easterEggMouseArea
anchors.fill: qgcVersionLayout
onClicked: {
if (mouse.modifiers & Qt.ShiftModifier) {
if (mouse.modifiers & Qt.ControlModifier) {
QGroundControl.corePlugin.showTouchAreas = !QGroundControl.corePlugin.showTouchAreas
} else {
} else if (mouse.modifiers & Qt.ShiftModifier) {
if(!QGroundControl.corePlugin.showAdvancedUI) {
advancedModeConfirmation.open()
} else {
@ -483,47 +465,64 @@ ApplicationWindow { @@ -483,47 +465,64 @@ ApplicationWindow {
}
}
//-------------------------------------------------------------------------
/// Fly View
FlyView {
id: flightView
anchors.fill: parent
}
//-------------------------------------------------------------------------
/// Plan View
Loader {
id: planViewLoader
PlanView {
id: planView
anchors.fill: parent
visible: false
source: "PlanView.qml"
}
//-------------------------------------------------------------------------
/// Settings
Loader {
id: settingsWindow
anchors.fill: parent
Drawer {
id: toolDrawer
width: mainWindow.width
height: mainWindow.height
edge: Qt.LeftEdge
dragMargin: 0
visible: false
source: "AppSettings.qml"
property alias title: toolbarDrawerText.text
property alias source: toolDrawerLoader.source
Rectangle {
id: toolDrawerToolbar
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
height: ScreenTools.toolbarHeight
color: qgcPal.toolbarBackground
QGCLabel {
id: toolbarDrawerText
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
font.pointSize: ScreenTools.largeFontPointSize
}
//-------------------------------------------------------------------------
/// Setup
Loader {
id: setupWindow
anchors.fill: parent
visible: false
source: "SetupView.qml"
QGCButton {
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: qsTr("Close")
enabled: !mainWindow.preventViewSwitch()
onClicked: {
toolDrawer.visible = false
toolDrawer.source = ""
}
}
}
//-------------------------------------------------------------------------
/// Analyze
Loader {
id: analyzeWindow
anchors.fill: parent
visible: false
source: "AnalyzeView.qml"
id: toolDrawerLoader
anchors.left: parent.left
anchors.right: parent.right
anchors.top: toolDrawerToolbar.bottom
anchors.bottom: parent.bottom
}
}
//-------------------------------------------------------------------------

26
src/ui/toolbar/MainToolBar.qml
Unescape View File

@ -33,28 +33,6 @@ Rectangle { @@ -33,28 +33,6 @@ Rectangle {
property bool _communicationLost: _activeVehicle ? _activeVehicle.connectionLost : false
property color _mainStatusBGColor: qgcPal.brandingPurple
Component.onCompleted: toolbar.viewButtonClicked(flyButton)
function viewButtonClicked(button) {
if (mainWindow.preventViewSwitch()) {
return false
}
viewSelectDrawer.visible = false
currentButton.icon.source = button.imageResource
currentButton.logo = button.imageColor == "transparent"
return true
}
//-- Setup can be invoked from c++ side
Connections {
target: setupWindow
onVisibleChanged: {
if (setupWindow.visible) {
toolbar.viewButtonClicked(setupButton)
}
}
}
QGCPalette { id: qgcPal }
/// Bottom single pixel divider
@ -89,7 +67,9 @@ Rectangle { @@ -89,7 +67,9 @@ Rectangle {
QGCToolBarButton {
id: currentButton
Layout.preferredHeight: viewButtonRow.height
onClicked: viewSelectDrawer.visible = true
icon.source: "/res/QGCLogoFull"
logo: true
onClicked: toolSelectDrawer.visible = true
}
MainStatusIndicator {

Write Preview
Loading…
Cancel
Save