Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c7f840ac
Commit
c7f840ac
authored
Dec 12, 2019
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
48fa322b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
31 deletions
+24
-31
SubMenuButton.qml
src/QmlControls/SubMenuButton.qml
+7
-2
SetupView.qml
src/VehicleSetup/SetupView.qml
+17
-29
No files found.
src/QmlControls/SubMenuButton.qml
View file @
c7f840ac
...
...
@@ -6,6 +6,9 @@ import QtGraphicalEffects 1.0
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
ScreenTools
1.0
// Important Note: SubMenuButtons must manage their checked state manually in order to support
// view switch prevention. This means they can't be checkable or autoExclusive.
Button
{
id
:
_rootButton
property
bool
setupComplete
:
true
///< true: setup complete indicator shows as completed
...
...
@@ -13,12 +16,14 @@ Button {
property
string
imageResource
:
"
/qmlimages/subMenuButtonImage.png
"
///< Button image
property
size
sourceSize
:
Qt
.
size
(
ScreenTools
.
defaultFontPixelHeight
*
2
,
ScreenTools
.
defaultFontPixelHeight
*
2
)
text
:
"
Button
"
///< Pass in your own button text
text
:
"
Button
"
///< Pass in your own button text
activeFocusOnPress
:
true
checkable
:
true
implicitHeight
:
ScreenTools
.
isTinyScreen
?
ScreenTools
.
defaultFontPixelHeight
*
3.5
:
ScreenTools
.
defaultFontPixelHeight
*
2.5
implicitWidth
:
__panel
.
implicitWidth
onCheckedChanged
:
checkable
=
false
style
:
ButtonStyle
{
id
:
buttonStyle
...
...
src/VehicleSetup/SetupView.qml
View file @
c7f840ac
...
...
@@ -41,6 +41,9 @@ Rectangle {
function
showSummaryPanel
()
{
if
(
mainWindow
.
preventViewSwitch
)
{
return
}
if
(
_fullParameterVehicleAvailable
)
{
if
(
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
autopilot
.
vehicleComponents
.
length
===
0
)
{
panelLoader
.
setSourceComponent
(
noComponentsVehicleSummaryComponent
)
...
...
@@ -54,30 +57,19 @@ Rectangle {
}
}
function
showFirmwarePanel
()
{
if
(
!
ScreenTools
.
isMobile
)
{
panelLoader
.
setSource
(
"
FirmwareUpgrade.qml
"
)
function
showPanel
(
button
,
qmlSource
)
{
if
(
mainWindow
.
preventViewSwitch
)
{
return
}
}
function
showJoystickPanel
()
{
panelLoader
.
setSource
(
"
JoystickConfig.qml
"
)
}
function
showParametersPanel
()
{
panelLoader
.
setSource
(
"
SetupParameterEditor.qml
"
)
}
function
showPX4FlowPanel
()
{
panelLoader
.
setSource
(
"
PX4FlowSensor.qml
"
)
button
.
checked
=
true
panelLoader
.
setSource
(
qmlSource
)
}
function
showVehicleComponentPanel
(
vehicleComponent
)
{
if
(
mainWindow
.
preventViewSwitch
)
{
return
}
var
autopilotPlugin
=
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
autopilot
var
prereq
=
autopilotPlugin
.
prerequisiteSetup
(
vehicleComponent
)
if
(
prereq
!==
""
)
{
...
...
@@ -229,7 +221,7 @@ Rectangle {
exclusiveGroup
:
setupButtonGroup
text
:
modelData
.
title
visible
:
_corePlugin
&&
_corePlugin
.
options
.
combineSettingsAndSetup
onClicked
:
panelLoader
.
setSource
(
modelData
.
url
)
onClicked
:
showPanel
(
this
,
modelData
.
url
)
Layout.fillWidth
:
true
}
}
...
...
@@ -255,7 +247,7 @@ Rectangle {
text
:
qsTr
(
"
Firmware
"
)
Layout.fillWidth
:
true
onClicked
:
show
FirmwarePanel
(
)
onClicked
:
show
Panel
(
this
,
"
FirmwareUpgrade.qml
"
)
}
SubMenuButton
{
...
...
@@ -265,8 +257,7 @@ Rectangle {
setupIndicator
:
false
text
:
qsTr
(
"
PX4Flow
"
)
Layout.fillWidth
:
true
onClicked
:
showPX4FlowPanel
()
onClicked
:
showPX4FlowPanel
(
this
,
"
PX4FlowSensor.qml
"
)
}
SubMenuButton
{
...
...
@@ -277,8 +268,7 @@ Rectangle {
visible
:
_fullParameterVehicleAvailable
&&
joystickManager
.
joysticks
.
length
!==
0
text
:
qsTr
(
"
Joystick
"
)
Layout.fillWidth
:
true
onClicked
:
showJoystickPanel
()
onClicked
:
showJoystickPanel
(
this
,
"
JoystickConfig.qml
"
)
}
Repeater
{
...
...
@@ -293,8 +283,7 @@ Rectangle {
text
:
modelData
.
name
visible
:
modelData
.
setupSource
.
toString
()
!==
""
Layout.fillWidth
:
true
onClicked
:
showVehicleComponentPanel
(
modelData
)
onClicked
:
showVehicleComponentPanel
(
modelData
)
}
}
...
...
@@ -306,8 +295,7 @@ Rectangle {
_corePlugin
.
showAdvancedUI
text
:
qsTr
(
"
Parameters
"
)
Layout.fillWidth
:
true
onClicked
:
showParametersPanel
()
onClicked
:
showPanel
(
this
,
"
SetupParameterEditor.qml
"
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment