From 6919af35a72ed901719a4fcfe7471bebc42dab7e Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 22 Aug 2015 20:52:46 -0700 Subject: [PATCH] Use new warningText QGCPalette entry --- src/AutoPilotPlugins/PX4/PowerComponent.qml | 4 ++-- src/VehicleSetup/VehicleSummary.qml | 2 +- src/ui/toolbar/MainToolBar.qml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 1db5b8aea..ef3a6d0dd 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -248,7 +248,7 @@ QGCView { spacing: 10 QGCLabel { - color: "yellow" + color: palette.warningText text: "WARNING: Propellers must be removed from vehicle prior to performing ESC calibration." } @@ -279,7 +279,7 @@ QGCView { spacing: 10 QGCLabel { - color: "yellow" + color: palette.warningText text: "WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration." } diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 55c3d3f91..89824977e 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/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." : diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 5b11d4f63..1b0211fef 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/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: { -- 2.22.0