Merge pull request #1788 from DonLakeFlyer/WarningColor

Warning color

src/AutoPilotPlugins/PX4/PowerComponent.qml

@@ -248,7 +248,7 @@ QGCView {
                     spacing:            10
 
                     QGCLabel {
-                        color:  "yellow"
+                        color:  palette.warningText
                         text:   "<font color=\"yellow\">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</font>"
                     }
 
@@ -279,7 +279,7 @@ QGCView {
                     spacing:            10
 
                     QGCLabel {
-                        color:  "yellow"
+                        color:  palette.warningText
                         text:   "<font color=\"yellow\">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</font>"
                     }
 

src/QGCPalette.cc

@@ -53,6 +53,11 @@ QColor QGCPalette::_text[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
     { QColor(0x58, 0x58, 0x58), QColor(0xFF, 0xFF, 0xFF) }
 };
 
+QColor QGCPalette::_warningText[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
+		{ QColor(0xFF, 0xFF, 0x00), QColor(0xFF, 0xFF, 0x00) },
+		{ QColor(0xFF, 0xFF, 0x00), QColor(0xFF, 0xFF, 0x00) }
+};
+
 QColor QGCPalette::_button[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
     { QColor(0x58, 0x58, 0x58), QColor(0x1b, 0x6f, 0xad) },
     { QColor(0x58, 0x58, 0x58), QColor(98, 98, 100) },

src/QGCPalette.h

@@ -57,7 +57,10 @@ class QGCPalette : public QObject
     /// Standard text color for label text
     Q_PROPERTY(QColor text READ text NOTIFY paletteChanged)
     
-    /// Background color for buttons
+	/// Color for warning text
+	Q_PROPERTY(QColor warningText READ warningText NOTIFY paletteChanged)
+
+	/// Background color for buttons
     Q_PROPERTY(QColor button READ button NOTIFY paletteChanged)
     
     /// Text color for buttons
@@ -105,7 +108,8 @@ public:
     QColor windowShadeDark(void) const { return _windowShadeDark[_theme][_colorGroupEnabled ? 1 : 0]; }
     
     QColor text(void) const { return _text[_theme][_colorGroupEnabled ? 1 : 0]; }
-    
+	QColor warningText(void) const { return _warningText[_theme][_colorGroupEnabled ? 1 : 0]; }
+
     QColor button(void) const { return _button[_theme][_colorGroupEnabled ? 1 : 0]; }
     QColor buttonText(void) const { return _buttonText[_theme][_colorGroupEnabled ? 1 : 0]; }
     QColor buttonHighlight(void) const { return _buttonHighlight[_theme][_colorGroupEnabled ? 1 : 0]; }
@@ -134,7 +138,8 @@ private:
     static QColor _windowShade[_cThemes][_cColorGroups];
     static QColor _windowShadeDark[_cThemes][_cColorGroups];
     
-    static QColor _text[_cThemes][_cColorGroups];
+	static QColor _warningText[_cThemes][_cColorGroups];
+	static QColor _text[_cThemes][_cColorGroups];
     
     static QColor _button[_cThemes][_cColorGroups];
     static QColor _buttonText[_cThemes][_cColorGroups];

src/VehicleSetup/VehicleSummary.qml

@@ -58,7 +58,7 @@ Rectangle {
         QGCLabel {
             width:			parent.width
 			wrapMode:		Text.WordWrap
-			color:			setupComplete ? qgcPal.text : "red"
+			color:			setupComplete ? qgcPal.text : qgcPal.warningText
             font.pixelSize: setupComplete ? ScreenTools.defaultFontPixelSize : ScreenTools.mediumFontPixelSize
 			text:           setupComplete ?
                                 "Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." :

src/ui/toolbar/MainToolBar.qml

@@ -784,6 +784,7 @@ Rectangle {
             id:             toolBarMessage
             anchors.fill:   parent
             wrapMode:       Text.WordWrap
+			color:			qgcPal.warningText
         }
 
         QGCButton {
@@ -792,6 +793,7 @@ Rectangle {
             anchors.topMargin:      verticalMargins
             anchors.top:            parent.top
             anchors.right:          parent.right
+			primary:				true
             text:                   "Close Message"
 
             onClicked: {