From f5f9afe9b6e9995a908d86bdbb4b0b71808ef8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 1 Jun 2021 12:00:21 +0200
Subject: [PATCH] Added AREA macro
---
NON-APPROVED/odh/ODH_Area_Layout_CTL.bob | 40 +++++++++++++-----------
NON-APPROVED/odh/ODH_Area_Layout_CXB.bob | 5 +--
NON-APPROVED/odh/ODH_Area_Layout_HCB.bob | 5 +--
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
index aa8aa872..deb53453 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=CTL)</name>
<macros>
+ <AREA>$(LOC_ACRONYM)</AREA>
+ <EMBEDDED_DISPLAYS>99-Shared/embedded_displays</EMBEDDED_DISPLAYS>
<POPUPS>99-Shared/popups</POPUPS>
<SYMBOLS>99-Shared/symbols</SYMBOLS>
</macros>
@@ -30,6 +32,22 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey03-title</name>
+ <text>$(LOC)</text>
+ <width>600</width>
+ <height>50</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="group" version="2.0.0">
<name>Area</name>
<x>10</x>
@@ -125,7 +143,7 @@
</widget>
</widget>
<widget type="group" version="2.0.0">
- <name>Signals_1</name>
+ <name>Area</name>
<x>10</x>
<y>130</y>
<width>560</width>
@@ -486,7 +504,7 @@
</widget>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Action Button</name>
+ <name>Trend Button</name>
<actions>
<action type="open_display">
<file>$(POPUPS)/ODH_Trend.bob</file>
@@ -506,21 +524,5 @@
<tooltip>$(actions)</tooltip>
</widget>
</widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey03-title</name>
- <text>$(LOC)</text>
- <width>600</width>
- <height>50</height>
- <font>
- <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
</widget>
</display>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
index 565ba735..2bb05998 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=CXB)</name>
<macros>
+ <AREA>$(LOC_ACRONYM)</AREA>
<POPUPS>99-Shared/popups</POPUPS>
<SYMBOLS>99-Shared/symbols</SYMBOLS>
</macros>
@@ -119,7 +120,7 @@
<x>71</x>
<y>74</y>
<width>140</width>
- <height>21</height>
+ <height>25</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
index b0d41a64..a8d9be66 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(LOC_ACRONYM)</name>
+ <name>$(LOC_ACRONYM=HCB)</name>
<macros>
+ <AREA>$(LOC_ACRONYM)</AREA>
<POPUPS>99-Shared/popups</POPUPS>
<SYMBOLS>99-Shared/symbols</SYMBOLS>
</macros>
@@ -119,7 +120,7 @@
<x>71</x>
<y>74</y>
<width>140</width>
- <height>21</height>
+ <height>25</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
--
GitLab