Commit 19d9faea authored by DonLakeFlyer's avatar DonLakeFlyer

Make the Message Indicator respect palette settings

parent 07805f16
...@@ -25,7 +25,7 @@ public: ...@@ -25,7 +25,7 @@ public:
PowerComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); PowerComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL);
// Overrides from VehicleComponent // Overrides from VehicleComponent
virtual QStringList setupCompleteChangedTriggerList(void) const; QStringList setupCompleteChangedTriggerList(void) const override;
// Overrides from VehicleComponent // Overrides from VehicleComponent
QString name (void) const override; QString name (void) const override;
......
...@@ -212,10 +212,10 @@ Item { ...@@ -212,10 +212,10 @@ Item {
} }
} }
function formatMessage(message) { function formatMessage(message) {
message = message.replace(new RegExp("<#E>", "g"), "color: #f95e5e; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;"); message = message.replace(new RegExp("<#E>", "g"), "color: " + qgcPal.warningText + "; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;");
message = message.replace(new RegExp("<#I>", "g"), "color: #f9b55e; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;"); message = message.replace(new RegExp("<#I>", "g"), "color: " + qgcPal.warningText + "; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;");
message = message.replace(new RegExp("<#N>", "g"), "color: #ffffff; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;"); message = message.replace(new RegExp("<#N>", "g"), "color: " + qgcPal.text + "; font: " + (ScreenTools.defaultFontPointSize.toFixed(0) - 1) + "pt monospace;");
return message; return message;
} }
...@@ -400,22 +400,22 @@ Item { ...@@ -400,22 +400,22 @@ Item {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//-- System Message Area //-- System Message Area
Rectangle { Rectangle {
id: messageArea id: messageArea
width: mainWindow.width * 0.5
height: mainWindow.height * 0.5
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: toolBar.height + ScreenTools.defaultFontPixelHeight
radius: ScreenTools.defaultFontPixelHeight * 0.5
color: qgcPal.window
border.color: qgcPal.text
visible: false
function close() { function close() {
currentPopUp = null currentPopUp = null
messageText.text = "" messageText.text = ""
messageArea.visible = false messageArea.visible = false
} }
width: mainWindow.width * 0.5
height: mainWindow.height * 0.5
color: Qt.rgba(0,0,0,0.8)
visible: false
radius: ScreenTools.defaultFontPixelHeight * 0.5
border.color: "#808080"
border.width: 2
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: toolBar.height + ScreenTools.defaultFontPixelHeight
MouseArea { MouseArea {
// This MouseArea prevents the Map below it from getting Mouse events. Without this // This MouseArea prevents the Map below it from getting Mouse events. Without this
// things like mousewheel will scroll the Flickable and then scroll the map as well. // things like mousewheel will scroll the Flickable and then scroll the map as well.
...@@ -435,11 +435,11 @@ Item { ...@@ -435,11 +435,11 @@ Item {
id: messageText id: messageText
readOnly: true readOnly: true
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
color: "white" color: qgcPal.text
} }
} }
//-- Dismiss System Message //-- Dismiss System Message
Image { QGCColoredImage {
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
...@@ -450,6 +450,7 @@ Item { ...@@ -450,6 +450,7 @@ Item {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
mipmap: true mipmap: true
smooth: true smooth: true
color: qgcPal.text
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.isMobile ? -ScreenTools.defaultFontPixelHeight : 0 anchors.margins: ScreenTools.isMobile ? -ScreenTools.defaultFontPixelHeight : 0
...@@ -459,7 +460,7 @@ Item { ...@@ -459,7 +460,7 @@ Item {
} }
} }
//-- Clear Messages //-- Clear Messages
Image { QGCColoredImage {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
...@@ -470,6 +471,7 @@ Item { ...@@ -470,6 +471,7 @@ Item {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
mipmap: true mipmap: true
smooth: true smooth: true
color: qgcPal.text
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
......
...@@ -19,7 +19,7 @@ import QGroundControl.ScreenTools 1.0 ...@@ -19,7 +19,7 @@ import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//-- GPS Indicator //-- Message Indicator
Item { Item {
width: height width: height
anchors.top: parent.top anchors.top: parent.top
......
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