Commit 3a00fdad authored by Jacob Dahl's avatar Jacob Dahl

Added properties to enable changing the color of the checklist section headers...

Added properties to enable changing the color of the checklist section headers based on the pass/fail status of the checklist items
parent 72d2cce4
...@@ -32,6 +32,7 @@ QGCButton { ...@@ -32,6 +32,7 @@ QGCButton {
property bool telemetryFailure: false ///< true: telemetry check failing, false: telemetry check passing property bool telemetryFailure: false ///< true: telemetry check failing, false: telemetry check passing
property bool allowTelemetryFailureOverride: false ///< true: user can click past telemetry failure property bool allowTelemetryFailureOverride: false ///< true: user can click past telemetry failure
property bool passed: _manualState === _statePassed && _telemetryState === _statePassed property bool passed: _manualState === _statePassed && _telemetryState === _statePassed
property bool failed: _manualState === _stateFailed || _telemetryState === _stateFailed
property int _manualState: manualText === "" ? _statePassed : _statePending property int _manualState: manualText === "" ? _statePassed : _statePending
property int _telemetryState: _statePassed property int _telemetryState: _statePassed
......
...@@ -16,7 +16,12 @@ import QGroundControl.ScreenTools 1.0 ...@@ -16,7 +16,12 @@ import QGroundControl.ScreenTools 1.0
/// A PreFlightCheckGroup manages a set of PreFlightCheckButtons as a single entity. /// A PreFlightCheckGroup manages a set of PreFlightCheckButtons as a single entity.
Column { Column {
property string name property string name
property string passedTextColor: "black"
property string failedTextColor: "black"
property string pendingTextColor: "black"
property bool passed: false property bool passed: false
property bool failed: false
spacing: ScreenTools.defaultFontPixelHeight / 2 spacing: ScreenTools.defaultFontPixelHeight / 2
...@@ -47,6 +52,7 @@ Column { ...@@ -47,6 +52,7 @@ Column {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: name + (passed ? qsTr(" (passed)") : "") text: name + (passed ? qsTr(" (passed)") : "")
color: failed ? failedTextColor : (passed ? passedTextColor : pendingTextColor)
} }
Column { Column {
...@@ -58,9 +64,11 @@ Column { ...@@ -58,9 +64,11 @@ Column {
for (var i=0; i<children.length; i++) { for (var i=0; i<children.length; i++) {
if (!children[i].passed) { if (!children[i].passed) {
passed = false passed = false
failed = children[i].failed
return return
} }
} }
failed = false
passed = true passed = true
} }
} }
......
...@@ -10,6 +10,7 @@ FocusScope { ...@@ -10,6 +10,7 @@ FocusScope {
id: _root id: _root
height: column.height height: column.height
property alias color: label.color
property alias text: label.text property alias text: label.text
property bool checked: true property bool checked: true
property bool showSpacer: true property bool showSpacer: true
......
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