Commit 6919af35 authored by Don Gagne's avatar Don Gagne

Use new warningText QGCPalette entry

parent 8867b541
...@@ -248,7 +248,7 @@ QGCView { ...@@ -248,7 +248,7 @@ QGCView {
spacing: 10 spacing: 10
QGCLabel { QGCLabel {
color: "yellow" color: palette.warningText
text: "<font color=\"yellow\">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</font>" text: "<font color=\"yellow\">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</font>"
} }
...@@ -279,7 +279,7 @@ QGCView { ...@@ -279,7 +279,7 @@ QGCView {
spacing: 10 spacing: 10
QGCLabel { QGCLabel {
color: "yellow" color: palette.warningText
text: "<font color=\"yellow\">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</font>" text: "<font color=\"yellow\">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</font>"
} }
......
...@@ -58,7 +58,7 @@ Rectangle { ...@@ -58,7 +58,7 @@ Rectangle {
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: setupComplete ? qgcPal.text : "red" color: setupComplete ? qgcPal.text : qgcPal.warningText
font.pixelSize: setupComplete ? ScreenTools.defaultFontPixelSize : ScreenTools.mediumFontPixelSize font.pixelSize: setupComplete ? ScreenTools.defaultFontPixelSize : ScreenTools.mediumFontPixelSize
text: setupComplete ? text: setupComplete ?
"Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." : "Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." :
......
...@@ -784,6 +784,7 @@ Rectangle { ...@@ -784,6 +784,7 @@ Rectangle {
id: toolBarMessage id: toolBarMessage
anchors.fill: parent anchors.fill: parent
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: qgcPal.warningText
} }
QGCButton { QGCButton {
...@@ -792,6 +793,7 @@ Rectangle { ...@@ -792,6 +793,7 @@ Rectangle {
anchors.topMargin: verticalMargins anchors.topMargin: verticalMargins
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
primary: true
text: "Close Message" text: "Close Message"
onClicked: { onClicked: {
......
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