From adc519c74fc3e40b4d63981377bec85ff7fc232e Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Thu, 13 Feb 2020 21:13:39 -0700 Subject: [PATCH] Added pass/fail/pending text colors to the QGC palette which default to standard text color. Added such that custom builds can override --- src/QGCPalette.cc | 3 +++ src/QGCPalette.h | 3 +++ src/QmlControls/PreFlightCheckGroup.qml | 6 +----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc index 16379b79e..6abd89938 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 7c96a3543..91f597ef9 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/PreFlightCheckGroup.qml b/src/QmlControls/PreFlightCheckGroup.qml index 4e1a0f7b3..0e0713218 100644 --- a/src/QmlControls/PreFlightCheckGroup.qml +++ b/src/QmlControls/PreFlightCheckGroup.qml @@ -16,10 +16,6 @@ import QGroundControl.ScreenTools 1.0 /// A PreFlightCheckGroup manages a set of PreFlightCheckButtons as a single entity. Column { property string name - property string passedTextColor: "black" - property string failedTextColor: "black" - property string pendingTextColor: "black" - property bool passed: false property bool failed: false @@ -52,7 +48,7 @@ Column { anchors.left: parent.left anchors.right: parent.right text: name + (passed ? qsTr(" (passed)") : "") - color: failed ? failedTextColor : (passed ? passedTextColor : pendingTextColor) + color: failed ? qgcPal.statusFailedText : (passed ? qgcPal.statusPassedText : qgcPal.statusPendingText) } Column { -- 2.22.0