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
94f96564
Commit
94f96564
authored
Apr 25, 2016
by
Don Gagne
Browse files
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
src/VehicleSetup/SetupView.qml
View file @
94f96564
...
@@ -36,6 +36,7 @@ import QGroundControl.ScreenTools 1.0
...
@@ -36,6 +36,7 @@ import QGroundControl.ScreenTools 1.0
import
QGroundControl
.
MultiVehicleManager
1.0
import
QGroundControl
.
MultiVehicleManager
1.0
Rectangle
{
Rectangle
{
id
:
setupView
color
:
qgcPal
.
window
color
:
qgcPal
.
window
z
:
QGroundControl
.
zOrderTopMost
z
:
QGroundControl
.
zOrderTopMost
...
@@ -110,6 +111,13 @@ Rectangle {
...
@@ -110,6 +111,13 @@ Rectangle {
panelLoader
.
sourceComponent
=
messagePanelComponent
panelLoader
.
sourceComponent
=
messagePanelComponent
}
else
{
}
else
{
panelLoader
.
source
=
vehicleComponent
.
setupSource
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 {
...
@@ -296,7 +304,6 @@ Rectangle {
text
:
modelData
.
name
text
:
modelData
.
name
visible
:
modelData
.
setupSource
.
toString
()
!=
""
visible
:
modelData
.
setupSource
.
toString
()
!=
""
onClicked
:
showVehicleComponentPanel
(
modelData
)
onClicked
:
showVehicleComponentPanel
(
modelData
)
}
}
}
}
...
...
src/VehicleSetup/VehicleSummary.qml
View file @
94f96564
...
@@ -117,19 +117,11 @@ Rectangle {
...
@@ -117,19 +117,11 @@ Rectangle {
readonly
property
real
titleHeight
:
ScreenTools
.
defaultFontPixelHeight
*
2
readonly
property
real
titleHeight
:
ScreenTools
.
defaultFontPixelHeight
*
2
// Title bar
// Title bar
Rectangle
{
QGCButton
{
id
:
titleBar
id
:
titleBar
width
:
parent
.
width
width
:
parent
.
width
height
:
titleHeight
height
:
titleHeight
color
:
qgcPal
.
windowShade
text
:
capitalizeWords
(
modelData
.
name
)
// Title text
QGCLabel
{
anchors.fill
:
parent
verticalAlignment
:
TextEdit
.
AlignVCenter
horizontalAlignment
:
TextEdit
.
AlignHCenter
text
:
capitalizeWords
(
modelData
.
name
)
}
// Setup indicator
// Setup indicator
Rectangle
{
Rectangle
{
...
@@ -142,6 +134,10 @@ Rectangle {
...
@@ -142,6 +134,10 @@ Rectangle {
color
:
modelData
.
setupComplete
?
"
#00d932
"
:
"
red
"
color
:
modelData
.
setupComplete
?
"
#00d932
"
:
"
red
"
visible
:
modelData
.
requiresSetup
visible
:
modelData
.
requiresSetup
}
}
onClicked
:
{
setupView
.
showVehicleComponentPanel
(
modelData
)
}
}
}
// Summary Qml
// Summary Qml
...
...
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