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
94f96564
Commit
94f96564
authored
Apr 25, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3256 from tcanabrava/fix_summary_buttons
Clicking on the summary titles enter edit mode
parents
7d3efb1b
33541e58
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
SetupView.qml
src/VehicleSetup/SetupView.qml
+8
-1
VehicleSummary.qml
src/VehicleSetup/VehicleSummary.qml
+6
-10
No files found.
src/VehicleSetup/SetupView.qml
View file @
94f96564
...
...
@@ -36,6 +36,7 @@ import QGroundControl.ScreenTools 1.0
import
QGroundControl
.
MultiVehicleManager
1.0
Rectangle
{
id
:
setupView
color
:
qgcPal
.
window
z
:
QGroundControl
.
zOrderTopMost
...
...
@@ -110,6 +111,13 @@ Rectangle {
panelLoader
.
sourceComponent
=
messagePanelComponent
}
else
{
panelLoader
.
source
=
vehicleComponent
.
setupSource
for
(
var
i
=
0
;
i
<
componentRepeater
.
count
;
i
++
)
{
var
obj
=
componentRepeater
.
itemAt
(
i
);
if
(
obj
.
text
===
vehicleComponent
.
name
)
{
obj
.
checked
=
true
;
break
;
}
}
}
}
}
...
...
@@ -296,7 +304,6 @@ Rectangle {
text
:
modelData
.
name
visible
:
modelData
.
setupSource
.
toString
()
!=
""
onClicked
:
showVehicleComponentPanel
(
modelData
)
}
}
...
...
src/VehicleSetup/VehicleSummary.qml
View file @
94f96564
...
...
@@ -117,19 +117,11 @@ Rectangle {
readonly
property
real
titleHeight
:
ScreenTools
.
defaultFontPixelHeight
*
2
// Title bar
Rectangle
{
QGCButton
{
id
:
titleBar
width
:
parent
.
width
height
:
titleHeight
color
:
qgcPal
.
windowShade
// Title text
QGCLabel
{
anchors.fill
:
parent
verticalAlignment
:
TextEdit
.
AlignVCenter
horizontalAlignment
:
TextEdit
.
AlignHCenter
text
:
capitalizeWords
(
modelData
.
name
)
}
text
:
capitalizeWords
(
modelData
.
name
)
// Setup indicator
Rectangle
{
...
...
@@ -142,6 +134,10 @@ Rectangle {
color
:
modelData
.
setupComplete
?
"
#00d932
"
:
"
red
"
visible
:
modelData
.
requiresSetup
}
onClicked
:
{
setupView
.
showVehicleComponentPanel
(
modelData
)
}
}
// Summary 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