Browse Source

Use new warningText QGCPalette entry

QGC4.4
Don Gagne 10 years ago
parent
commit
6919af35a7
  1. 4
      src/AutoPilotPlugins/PX4/PowerComponent.qml
  2. 2
      src/VehicleSetup/VehicleSummary.qml
  3. 2
      src/ui/toolbar/MainToolBar.qml

4
src/AutoPilotPlugins/PX4/PowerComponent.qml

@ -248,7 +248,7 @@ QGCView { @@ -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 { @@ -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>"
}

2
src/VehicleSetup/VehicleSummary.qml

@ -58,7 +58,7 @@ Rectangle { @@ -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." :

2
src/ui/toolbar/MainToolBar.qml

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

Loading…
Cancel
Save