Browse Source

Added pass/fail/pending text colors to the QGC palette which default to standard text color. Added such that custom builds can override

QGC4.4
Jacob Dahl 5 years ago
parent
commit
adc519c74f
  1. 3
      src/QGCPalette.cc
  2. 3
      src/QGCPalette.h
  3. 6
      src/QmlControls/PreFlightCheckGroup.qml

3
src/QGCPalette.cc

@ -77,6 +77,9 @@ void QGCPalette::_buildMap() @@ -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")

3
src/QGCPalette.h

@ -115,6 +115,9 @@ public: @@ -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();

6
src/QmlControls/PreFlightCheckGroup.qml

@ -16,10 +16,6 @@ import QGroundControl.ScreenTools 1.0 @@ -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 { @@ -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 {

Loading…
Cancel
Save