From 6be532d5095b2fac50a13afb7eb4019591fe462c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 7 Apr 2021 10:01:15 +0200
Subject: [PATCH] ODH warning -> yellow, maint -> blue
---
NON-APPROVED/TS2/pss/popups/odh_faceplate.bob | 10 ----------
NON-APPROVED/odh/ODH_Expert_Monit.bob | 14 ++------------
NON-APPROVED/odh/ODH_Monit_Sub.bob | 7 +++----
NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob | 7 +++----
4 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/NON-APPROVED/TS2/pss/popups/odh_faceplate.bob b/NON-APPROVED/TS2/pss/popups/odh_faceplate.bob
index 17e7384f..e376d57d 100644
--- a/NON-APPROVED/TS2/pss/popups/odh_faceplate.bob
+++ b/NON-APPROVED/TS2/pss/popups/odh_faceplate.bob
@@ -133,9 +133,7 @@
<x>72</x>
<y>118</y>
<width>116</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="led" version="2.0.0">
<name>O2Lvl19_5</name>
@@ -179,9 +177,7 @@
<x>72</x>
<y>172</y>
<width>108</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="led" version="2.0.0">
<name>Maint</name>
@@ -246,9 +242,7 @@
<x>72</x>
<y>255</y>
<width>110</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="led" version="2.0.0">
<name>SysOK</name>
@@ -270,9 +264,7 @@
<x>72</x>
<y>282</y>
<width>43</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="led" version="2.0.0">
<name>ConnStat</name>
@@ -294,9 +286,7 @@
<x>72</x>
<y>308</y>
<width>140</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
</widget>
</widget>
diff --git a/NON-APPROVED/odh/ODH_Expert_Monit.bob b/NON-APPROVED/odh/ODH_Expert_Monit.bob
index f4a1d30c..629320d0 100644
--- a/NON-APPROVED/odh/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/odh/ODH_Expert_Monit.bob
@@ -126,7 +126,7 @@
</color>
</off_color>
<on_color>
- <color name="LED-ORANGE-ON" red="255" green="175" blue="81">
+ <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
</color>
</on_color>
</widget>
@@ -154,7 +154,7 @@
</color>
</off_color>
<on_color>
- <color name="LED-YELLOW-ON" red="255" green="235" blue="17">
+ <color name="LED-BLUE-ON" red="81" green="232" blue="255">
</color>
</on_color>
</widget>
@@ -178,9 +178,7 @@
<x>72</x>
<y>118</y>
<width>116</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="label" version="2.0.0">
<name>LB_LB</name>
@@ -196,9 +194,7 @@
<x>72</x>
<y>172</y>
<width>108</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="label" version="2.0.0">
<name>LB_WARNING</name>
@@ -235,9 +231,7 @@
<x>72</x>
<y>255</y>
<width>110</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="led" version="2.0.0">
<name>LED_ALARM_2</name>
@@ -259,9 +253,7 @@
<x>72</x>
<y>282</y>
<width>43</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
<widget type="led" version="2.0.0">
<name>LED_ALARM_3</name>
@@ -283,9 +275,7 @@
<x>72</x>
<y>308</y>
<width>140</width>
- <height>21</height>
<vertical_alignment>1</vertical_alignment>
- <auto_size>true</auto_size>
</widget>
</widget>
</widget>
diff --git a/NON-APPROVED/odh/ODH_Monit_Sub.bob b/NON-APPROVED/odh/ODH_Monit_Sub.bob
index b2b2250a..4c6a0c97 100644
--- a/NON-APPROVED/odh/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/ODH_Monit_Sub.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>Display</name>
+ <name>ODH monitor LEDs</name>
<width>490</width>
<height>40</height>
<widget type="textupdate" version="2.0.0">
@@ -66,7 +66,7 @@
</color>
</off_color>
<on_color>
- <color name="MINOR" red="252" green="242" blue="17">
+ <color name="LED-BLUE-ON" red="81" green="232" blue="255">
</color>
</on_color>
</widget>
@@ -95,7 +95,6 @@
<x>153</x>
<y>4</y>
<width>14</width>
- <height>21</height>
- <auto_size>true</auto_size>
+ <vertical_alignment>1</vertical_alignment>
</widget>
</display>
diff --git a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob b/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
index 2c60ada1..2e022edd 100644
--- a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>Display</name>
+ <name>TS2 ODH monitor LEDs</name>
<width>490</width>
<height>40</height>
<widget type="textupdate" version="2.0.0">
@@ -66,7 +66,7 @@
</color>
</off_color>
<on_color>
- <color name="MINOR" red="252" green="242" blue="17">
+ <color name="LED-BLUE-ON" red="81" green="232" blue="255">
</color>
</on_color>
</widget>
@@ -95,7 +95,6 @@
<x>153</x>
<y>4</y>
<width>14</width>
- <height>21</height>
- <auto_size>true</auto_size>
+ <vertical_alignment>1</vertical_alignment>
</widget>
</display>
--
GitLab