From 1e5929ce0e2cbdba3944c9159c11b2d27c7d2764 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 26 Feb 2015 19:32:47 -0800 Subject: [PATCH] Cleanup Vehicle Summary Qml No longer buttons so switch to Rectangle for cleaner Qml --- src/VehicleSetup/VehicleSummary.qml | 107 +++++++++++++++------------- 1 file changed, 57 insertions(+), 50 deletions(-) diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 6b8f8bd5e..f9105eb26 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -4,6 +4,7 @@ import QtQuick.Controls.Styles 1.2 import QGroundControl.FactSystem 1.0 import QGroundControl.Palette 1.0 +import QGroundControl.Controls 1.0 Rectangle { width: 600 @@ -16,74 +17,80 @@ Rectangle { color: qgcPal.window - Flow { + Column { anchors.fill: parent - spacing: 10 - Repeater { - model: autopilot.components + QGCLabel { + text: "VEHICLE SUMMARY" + font.pointSize: 20 + } - Button { - width: 250 - height: 200 + Item { + // Just used as a spacer + height: 20 + width: 10 + } - property var summaryQmlSource: modelData.summaryQmlSource - text: modelData.name - property bool setupComplete: modelData.setupComplete + Flow { + width: parent.width + spacing: 10 - style: ButtonStyle { - id: buttonStyle - background: Rectangle { - id: innerRect - readonly property real titleHeight: 30 + Repeater { + model: autopilot.components - color: qgcPal.windowShadeDark + // Outer summary item rectangle + Rectangle { + readonly property real titleHeight: 30 - Text { - id: titleBar + width: 250 + height: 200 + color: qgcPal.windowShade - width: parent.width - height: parent.titleHeight - - verticalAlignment: TextEdit.AlignVCenter - horizontalAlignment: TextEdit.AlignHCenter - - text: control.text.toUpperCase() - color: qgcPal.buttonText - font.pixelSize: 12 + // Title bar + Rectangle { - Rectangle { - id: setupIndicator + width: parent.width + height: titleHeight + color: qgcPal.windowShadeDark - property bool setupComplete: true - readonly property real indicatorRadius: 6 + // Title text + Text { + anchors.fill: parent - x: parent.width - (indicatorRadius * 2) - 5 - y: (parent.height - (indicatorRadius * 2)) / 2 - width: indicatorRadius * 2 - height: indicatorRadius * 2 + color: qgcPal.buttonText + font.pixelSize: 12 + text: modelData.name.toUpperCase() - radius: indicatorRadius - color: control.setupComplete ? "#00d932" : "red" - } + verticalAlignment: TextEdit.AlignVCenter + horizontalAlignment: TextEdit.AlignHCenter } + } - Rectangle { - width: parent.width - height: parent.height - parent.titleHeight - - y: parent.titleHeight + // Setup indicator + Rectangle { + readonly property real indicatorRadius: 6 + readonly property real indicatorRightInset: 5 + + 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 { - anchors.fill: parent - source: summaryQmlSource - } + Loader { + anchors.fill: parent + source: modelData.summaryQmlSource } } - - label: Item {} } } } -- 2.22.0