Commit 94f96564 authored by Don Gagne's avatar Don Gagne

Merge pull request #3256 from tcanabrava/fix_summary_buttons

Clicking on the summary titles enter edit mode
parents 7d3efb1b 33541e58
......@@ -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)
}
}
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment