diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc index 16379b79ea26dcb143660b8925cd6c5458024c5c..6abd89938b517fec3e805f05150d8755954cd952 100644 --- a/src/QGCPalette.cc +++ b/src/QGCPalette.cc @@ -77,6 +77,9 @@ void QGCPalette::_buildMap() DECLARE_QGC_COLOR(alertText, "#000000", "#000000", "#000000", "#000000") DECLARE_QGC_COLOR(missionItemEditor, "#585858", "#dbfef8", "#585858", "#585d83") DECLARE_QGC_COLOR(hoverColor, "#585858", "#dbfef8", "#585858", "#585d83") + DECLARE_QGC_COLOR(statusFailedText, "#9d9d9d", "#000000", "#707070", "#ffffff") + DECLARE_QGC_COLOR(statusPassedText, "#9d9d9d", "#000000", "#707070", "#ffffff") + DECLARE_QGC_COLOR(statusPendingText, "#9d9d9d", "#000000", "#707070", "#ffffff") // Colors are not affecting by theming DECLARE_QGC_COLOR(mapWidgetBorderLight, "#ffffff", "#ffffff", "#ffffff", "#ffffff") diff --git a/src/QGCPalette.h b/src/QGCPalette.h index 7c96a3543851b510bc1a193c0e682a5dffeda80c..91f597ef9a2ec6c58662913689611a3cc5ec31b4 100644 --- a/src/QGCPalette.h +++ b/src/QGCPalette.h @@ -115,6 +115,9 @@ public: DEFINE_QGC_COLOR(alertText, setAlertText) DEFINE_QGC_COLOR(missionItemEditor, setMissionItemEditor) DEFINE_QGC_COLOR(hoverColor, setHoverColor) + DEFINE_QGC_COLOR(statusFailedText, setstatusFailedText) + DEFINE_QGC_COLOR(statusPassedText, setstatusPassedText) + DEFINE_QGC_COLOR(statusPendingText, setstatusPendingText) QGCPalette(QObject* parent = nullptr); ~QGCPalette(); diff --git a/src/QmlControls/PreFlightCheckButton.qml b/src/QmlControls/PreFlightCheckButton.qml index 7f87bebbdb55408516f87e5262f52ba61b2f4e43..6692a0f3ab8326c3617773020e5be5181403852c 100644 --- a/src/QmlControls/PreFlightCheckButton.qml +++ b/src/QmlControls/PreFlightCheckButton.qml @@ -32,6 +32,7 @@ QGCButton { 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 passed: _manualState === _statePassed && _telemetryState === _statePassed + property bool failed: _manualState === _stateFailed || _telemetryState === _stateFailed property int _manualState: manualText === "" ? _statePassed : _statePending property int _telemetryState: _statePassed diff --git a/src/QmlControls/PreFlightCheckGroup.qml b/src/QmlControls/PreFlightCheckGroup.qml index 97a40a40033f7245cd7a0f842325c12dd8b206cf..0e071321853657c2b2fff35c2c0aace0a1707091 100644 --- a/src/QmlControls/PreFlightCheckGroup.qml +++ b/src/QmlControls/PreFlightCheckGroup.qml @@ -17,6 +17,7 @@ import QGroundControl.ScreenTools 1.0 Column { property string name property bool passed: false + property bool failed: false spacing: ScreenTools.defaultFontPixelHeight / 2 @@ -47,6 +48,7 @@ Column { anchors.left: parent.left anchors.right: parent.right text: name + (passed ? qsTr(" (passed)") : "") + color: failed ? qgcPal.statusFailedText : (passed ? qgcPal.statusPassedText : qgcPal.statusPendingText) } Column { @@ -58,9 +60,11 @@ Column { for (var i=0; i