Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2b4453e5
Commit
2b4453e5
authored
Sep 22, 2015
by
Don Gagne
Browse files
Merge pull request #1876 from DonLakeFlyer/Flickable
Allow buttons to be scrolled
parents
39a2500b
bc2c607b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/VehicleSetup/SetupView.qml
View file @
2b4453e5
...
...
@@ -153,76 +153,85 @@ Rectangle {
}
}
Column
{
id
:
buttonColumn
width
:
buttonWidth
SubMenuButton
{
id
:
summaryButton
width
:
buttonWidth
imageResource
:
"
/qmlimages/VehicleSummaryIcon.png
"
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
text
:
"
SUMMARY
"
onClicked
:
showSummaryPanel
()
}
SubMenuButton
{
id
:
firmwareButton
width
:
buttonWidth
imageResource
:
"
/qmlimages/FirmwareUpgradeIcon.png
"
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
visible
:
!
ScreenTools
.
isMobile
text
:
"
FIRMWARE
"
Flickable
{
id
:
buttonFlickable
width
:
buttonWidth
height
:
parent
.
height
contentWidth
:
buttonWidth
contentHeight
:
buttonColumn
.
height
flickableDirection
:
Flickable
.
VerticalFlick
Column
{
id
:
buttonColumn
width
:
buttonWidth
onClicked
:
showFirmwarePanel
()
}
SubMenuButton
{
id
:
summaryButton
width
:
buttonWidth
imageResource
:
"
/qmlimages/VehicleSummaryIcon.png
"
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
text
:
"
SUMMARY
"
SubMenuButton
{
id
:
joystickButton
width
:
buttonWidth
setupIndicator
:
true
setupComplete
:
joystickManager
.
activeJoystick
?
joystickManager
.
activeJoystick
.
calibrated
:
false
exclusiveGroup
:
setupButtonGroup
visible
:
multiVehicleManager
.
parameterReadyVehicleAvailable
&&
joystickManager
.
joysticks
.
length
!=
0
text
:
"
JOYSTICK
"
onClicked
:
showSummaryPanel
()
}
onClicked
:
showJoystickPanel
()
}
SubMenuButton
{
id
:
firmwareButton
width
:
buttonWidth
imageResource
:
"
/qmlimages/FirmwareUpgradeIcon.png
"
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
visible
:
!
ScreenTools
.
isMobile
text
:
"
FIRMWARE
"
Repeater
{
model
:
multiVehicleManager
.
parameterReadyVehicleAvailable
?
multiVehicleManager
.
activeVehicle
.
autopilot
.
vehicleComponents
:
0
onClicked
:
showFirmwarePanel
()
}
SubMenuButton
{
id
:
joystickButton
width
:
buttonWidth
imageResource
:
modelData
.
iconResource
setupIndicator
:
modelData
.
requiresSetup
setupComplete
:
modelData
.
setupComplete
setupIndicator
:
true
setupComplete
:
joystickManager
.
activeJoystick
?
joystickManager
.
activeJoystick
.
calibrated
:
false
exclusiveGroup
:
setupButtonGroup
text
:
modelData
.
name
.
toUpperCase
()
visible
:
multiVehicleManager
.
parameterReadyVehicleAvailable
&&
joystickManager
.
joysticks
.
length
!=
0
text
:
"
JOYSTICK
"
onClicked
:
show
VehicleComponentPanel
(
modelData
)
onClicked
:
show
JoystickPanel
(
)
}
}
SubMenuButton
{
width
:
buttonWidth
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
visible
:
multiVehicleManager
.
parameterReadyVehicleAvailable
text
:
"
PARAMETERS
"
Repeater
{
model
:
multiVehicleManager
.
parameterReadyVehicleAvailable
?
multiVehicleManager
.
activeVehicle
.
autopilot
.
vehicleComponents
:
0
onClicked
:
showParametersPanel
()
}
}
// Column
SubMenuButton
{
width
:
buttonWidth
imageResource
:
modelData
.
iconResource
setupIndicator
:
modelData
.
requiresSetup
setupComplete
:
modelData
.
setupComplete
exclusiveGroup
:
setupButtonGroup
text
:
modelData
.
name
.
toUpperCase
()
onClicked
:
showVehicleComponentPanel
(
modelData
)
}
}
SubMenuButton
{
width
:
buttonWidth
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
visible
:
multiVehicleManager
.
parameterReadyVehicleAvailable
text
:
"
PARAMETERS
"
onClicked
:
showParametersPanel
()
}
}
// Column
}
// Flickable
Loader
{
id
:
panelLoader
anchors.leftMargin
:
defaultTextWidth
anchors.rightMargin
:
defaultTextWidth
anchors.left
:
button
Column
.
right
anchors.left
:
button
Flickable
.
right
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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