Skip to content

Q
qgroundcontrol
Commit 1e5929ce authored by Don Gagne's avatar Don Gagne
Browse files
Options

Cleanup Vehicle Summary Qml 

No longer buttons so switch to Rectangle for cleaner Qml
parent 2a4c779d
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 50 deletions
src/VehicleSetup/VehicleSummary.qml
View file @ 1e5929ce
...@@ -4,6 +4,7 @@ import QtQuick.Controls.Styles 1.2 ...@@ -4,6 +4,7 @@ import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
Rectangle { Rectangle {
width: 600 width: 600
...@@ -16,74 +17,80 @@ Rectangle { ...@@ -16,74 +17,80 @@ Rectangle {
color: qgcPal.window color: qgcPal.window
Flow { Column {
anchors.fill: parent anchors.fill: parent
spacing: 10
Repeater { QGCLabel {
model: autopilot.components text: "VEHICLE SUMMARY"
font.pointSize: 20
}
Button { Item {
width: 250 // Just used as a spacer
height: 200 height: 20
width: 10
}
property var summaryQmlSource: modelData.summaryQmlSource Flow {
text: modelData.name width: parent.width
property bool setupComplete: modelData.setupComplete spacing: 10
style: ButtonStyle { Repeater {
id: buttonStyle model: autopilot.components
background: Rectangle {
id: innerRect
readonly property real titleHeight: 30
color: qgcPal.windowShadeDark // Outer summary item rectangle
Rectangle {
readonly property real titleHeight: 30
Text { width: 250
id: titleBar height: 200
color: qgcPal.windowShade
width: parent.width // Title bar
height: parent.titleHeight Rectangle {
verticalAlignment: TextEdit.AlignVCenter
horizontalAlignment: TextEdit.AlignHCenter
text: control.text.toUpperCase()
color: qgcPal.buttonText
font.pixelSize: 12
Rectangle { width: parent.width
id: setupIndicator height: titleHeight
color: qgcPal.windowShadeDark
property bool setupComplete: true // Title text
readonly property real indicatorRadius: 6 Text {
anchors.fill: parent
x: parent.width - (indicatorRadius * 2) - 5 color: qgcPal.buttonText
y: (parent.height - (indicatorRadius * 2)) / 2 font.pixelSize: 12
width: indicatorRadius * 2 text: modelData.name.toUpperCase()
height: indicatorRadius * 2
radius: indicatorRadius verticalAlignment: TextEdit.AlignVCenter
color: control.setupComplete ? "#00d932" : "red" horizontalAlignment: TextEdit.AlignHCenter
}
} }
}
Rectangle { // Setup indicator
width: parent.width Rectangle {
height: parent.height - parent.titleHeight readonly property real indicatorRadius: 6
readonly property real indicatorRightInset: 5
y: parent.titleHeight
x: parent.width - (indicatorRadius * 2) - indicatorRightInset
y: (parent.titleHeight - (indicatorRadius * 2)) / 2
width: indicatorRadius * 2
height: indicatorRadius * 2
radius: indicatorRadius
color: modelData.setupComplete ? "#00d932" : "red"
}
color: qgcPal.windowShade // Summary Qml
Rectangle {
y: parent.titleHeight
width: parent.width
height: parent.height - parent.titleHeight
color: qgcPal.windowShade
Loader { Loader {
anchors.fill: parent anchors.fill: parent
source: summaryQmlSource source: modelData.summaryQmlSource
}
} }
} }
label: Item {}
} }
} }
} }
......
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