diff --git a/NON-APPROVED/odh/ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
similarity index 96%
rename from NON-APPROVED/odh/ODH_Monit_Sub.bob
rename to NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
index 6a096463d64f1025b0110ad634e6cf8ae001401f..c7b7ddb89c8855e5b57550cc7eda541f635163ef 100644
--- a/NON-APPROVED/odh/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>ODH monitor LEDs</name>
+ <macros>
+ <POPUPS>../popups</POPUPS>
+ </macros>
<width>490</width>
<height>30</height>
<widget type="textupdate" version="2.0.0">
@@ -74,7 +77,7 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<macros>
<P>$(P)-$(R)</P>
<R>$(R)</R>
diff --git a/NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
similarity index 100%
rename from NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob
rename to NON-APPROVED/odh/99-Shared/embedded_displays/TS2_ODH_Monit_Sub.bob
diff --git a/NON-APPROVED/odh/ODH_Expert_Diag.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Diag.bob
similarity index 94%
rename from NON-APPROVED/odh/ODH_Expert_Diag.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Diag.bob
index a772d7c0053e64bda895331e2e0e130141b14c5e..37c94215ffe9bf164808d8e51c46b4e7dc7d7a1a 100644
--- a/NON-APPROVED/odh/ODH_Expert_Diag.bob
+++ b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Diag.bob
@@ -3,6 +3,7 @@
<name>ODH Diagnostics</name>
<macros>
<PLC>KG-GTA:ODH-PLC-01</PLC>
+ <SYMBOLS>../symbols</SYMBOLS>
</macros>
<width>1900</width>
<height>900</height>
@@ -26,7 +27,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_12</name>
- <file>symbols/diagnostics/ODH_RIO1.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_RIO1.PNG</file>
<x>40</x>
<y>580</y>
<width>590</width>
@@ -55,7 +56,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_4</name>
- <file>symbols/diagnostics/ODH_RIO1.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_RIO1.PNG</file>
<x>1270</x>
<y>580</y>
<width>590</width>
@@ -63,7 +64,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_6</name>
- <file>symbols/diagnostics/ODH_CPU.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_CPU.PNG</file>
<x>627</x>
<y>100</y>
<width>249</width>
@@ -71,7 +72,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_8</name>
- <file>symbols/diagnostics/ODH_Switch.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_Switch.PNG</file>
<x>1068</x>
<y>110</y>
<width>120</width>
@@ -79,7 +80,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_9</name>
- <file>symbols/diagnostics/ODH_Switch.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_Switch.PNG</file>
<x>1228</x>
<y>110</y>
<width>120</width>
@@ -87,7 +88,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_10</name>
- <file>symbols/diagnostics/ODH_Switch.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_Switch.PNG</file>
<x>1378</x>
<y>110</y>
<width>120</width>
@@ -95,7 +96,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>Picture_11</name>
- <file>symbols/diagnostics/ODH_RIO1.PNG</file>
+ <file>$(SYMBOLS)/diagnostics/ODH_RIO1.PNG</file>
<x>650</x>
<y>580</y>
<width>590</width>
@@ -124,7 +125,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_73</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -142,7 +143,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_74</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -161,7 +162,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_75</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -190,7 +191,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_76</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -208,7 +209,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_77</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -227,7 +228,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_78</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -256,7 +257,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_79</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -274,7 +275,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_80</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -293,7 +294,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_81</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -322,7 +323,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_82</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -340,7 +341,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_83</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -359,7 +360,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_84</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -388,7 +389,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_85</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -406,7 +407,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_86</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -425,7 +426,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_87</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -454,7 +455,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_88</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -472,7 +473,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_89</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -491,7 +492,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_90</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -520,7 +521,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_91</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -538,7 +539,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_92</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -557,7 +558,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_93</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -586,7 +587,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_94</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -604,7 +605,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_95</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -623,7 +624,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_96</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -652,7 +653,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_97</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -670,7 +671,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_98</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -689,7 +690,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_99</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -718,7 +719,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_100</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -736,7 +737,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_101</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -755,7 +756,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_102</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -784,7 +785,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_103</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -802,7 +803,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_104</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -821,7 +822,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_105</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -850,7 +851,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_106</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -868,7 +869,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_107</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -887,7 +888,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_108</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -916,7 +917,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_109</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -934,7 +935,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_110</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -953,7 +954,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_111</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -994,7 +995,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_196</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1012,7 +1013,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_197</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1031,7 +1032,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_198</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1060,7 +1061,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_199</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1078,7 +1079,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_200</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1097,7 +1098,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_201</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1126,7 +1127,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_202</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1144,7 +1145,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_203</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1163,7 +1164,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_204</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1192,7 +1193,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_205</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1210,7 +1211,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_206</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1229,7 +1230,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_207</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1258,7 +1259,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_208</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1276,7 +1277,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_209</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1295,7 +1296,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_210</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1324,7 +1325,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_211</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1342,7 +1343,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_212</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1361,7 +1362,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_213</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1390,7 +1391,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_214</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1408,7 +1409,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_215</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1427,7 +1428,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_216</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1456,7 +1457,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_217</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1474,7 +1475,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_218</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1493,7 +1494,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_219</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1522,7 +1523,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_220</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1540,7 +1541,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_221</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1559,7 +1560,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_222</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1588,7 +1589,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_223</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1606,7 +1607,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_224</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1625,7 +1626,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_225</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1654,7 +1655,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_226</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1672,7 +1673,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_227</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1691,7 +1692,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_228</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1720,7 +1721,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_229</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1738,7 +1739,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_230</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1757,7 +1758,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_231</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1786,7 +1787,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_232</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1804,7 +1805,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_233</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1823,7 +1824,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_234</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1864,7 +1865,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_235</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1882,7 +1883,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_236</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1901,7 +1902,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_237</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1930,7 +1931,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_238</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1948,7 +1949,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_239</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -1967,7 +1968,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_240</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -1996,7 +1997,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_241</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2014,7 +2015,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_242</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2033,7 +2034,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_243</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2062,7 +2063,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_244</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2080,7 +2081,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_245</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2099,7 +2100,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_246</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2128,7 +2129,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_247</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2146,7 +2147,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_248</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2165,7 +2166,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_249</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2194,7 +2195,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_250</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2212,7 +2213,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_251</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2231,7 +2232,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_252</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2260,7 +2261,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_253</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2278,7 +2279,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_254</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2297,7 +2298,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_255</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2326,7 +2327,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_256</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2344,7 +2345,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_257</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2363,7 +2364,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_258</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2392,7 +2393,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_259</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2410,7 +2411,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_260</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2429,7 +2430,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_261</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2458,7 +2459,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_262</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2476,7 +2477,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_263</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2495,7 +2496,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_264</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2524,7 +2525,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_265</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2542,7 +2543,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_266</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2561,7 +2562,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_267</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2590,7 +2591,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_268</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2608,7 +2609,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_269</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2627,7 +2628,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_270</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2656,7 +2657,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_271</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2674,7 +2675,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_272</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2693,7 +2694,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_273</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2724,7 +2725,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_274</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2742,7 +2743,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_275</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2761,7 +2762,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_276</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2791,7 +2792,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_277</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2809,7 +2810,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_278</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2828,7 +2829,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_279</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2858,7 +2859,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_280</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2876,7 +2877,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_281</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>46</y>
<width>30</width>
<height>30</height>
@@ -2895,7 +2896,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_282</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2925,7 +2926,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_283</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
@@ -2943,7 +2944,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_284</name>
- <file>symbols/custom/warning.svg</file>
+ <file>$(SYMBOLS)/custom/warning.svg</file>
<y>34</y>
<width>30</width>
<height>30</height>
@@ -2962,7 +2963,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="picture" version="2.0.0">
<name>WID_IOErrorIcon_285</name>
- <file>symbols/custom/DisconnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/DisconnectedPNG.png</file>
<width>30</width>
<height>30</height>
<rules>
diff --git a/NON-APPROVED/odh/ODH_Expert_Monit.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
similarity index 100%
rename from NON-APPROVED/odh/ODH_Expert_Monit.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Monit.bob
diff --git a/NON-APPROVED/odh/ODH_Expert_Racks.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Racks.bob
similarity index 100%
rename from NON-APPROVED/odh/ODH_Expert_Racks.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Expert_Racks.bob
diff --git a/NON-APPROVED/odh/ODH_Trend.bob b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend.bob
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend.bob
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend.bob
diff --git a/NON-APPROVED/odh/ODH_Trend.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_CTL.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CTL.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_CTL.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CTL.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_CXB.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CXB.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_CXB.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_CXB.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_HCB.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_HCB.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_HCB.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_HCB.plt
diff --git a/NON-APPROVED/odh/ODH_Trend_TS2.plt b/NON-APPROVED/odh/99-Shared/popups/ODH_Trend_TS2.plt
similarity index 100%
rename from NON-APPROVED/odh/ODH_Trend_TS2.plt
rename to NON-APPROVED/odh/99-Shared/popups/ODH_Trend_TS2.plt
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_CTL.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CTL.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_CTL.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CTL.png
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_CXH.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CXH.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_CXH.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_CXH.png
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_HCB.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_HCB.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_HCB.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_HCB.png
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_TS2.png b/NON-APPROVED/odh/99-Shared/symbols/AreaLayout_TS2.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/AreaLayout_TS2.png
rename to NON-APPROVED/odh/99-Shared/symbols/AreaLayout_TS2.png
diff --git a/NON-APPROVED/odh/symbols/custom/Connected.png b/NON-APPROVED/odh/99-Shared/symbols/custom/Connected.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Connected.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Connected.png
diff --git a/NON-APPROVED/odh/symbols/custom/ConnectedNew.png b/NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedNew.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/ConnectedNew.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedNew.png
diff --git a/NON-APPROVED/odh/symbols/custom/ConnectedPNG.png b/NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedPNG.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/ConnectedPNG.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/ConnectedPNG.png
diff --git a/NON-APPROVED/odh/symbols/custom/Disconnected.png b/NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Disconnected.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.png
diff --git a/NON-APPROVED/odh/symbols/custom/Disconnected.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Disconnected.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected.svg
diff --git a/NON-APPROVED/odh/symbols/custom/Disconnected2.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected2.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/Disconnected2.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/Disconnected2.svg
diff --git a/NON-APPROVED/odh/symbols/custom/DisconnectedPNG.png b/NON-APPROVED/odh/99-Shared/symbols/custom/DisconnectedPNG.png
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/DisconnectedPNG.png
rename to NON-APPROVED/odh/99-Shared/symbols/custom/DisconnectedPNG.png
diff --git a/NON-APPROVED/odh/symbols/custom/PressureTransmitter_ERROR.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_ERROR.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/PressureTransmitter_ERROR.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_ERROR.svg
diff --git a/NON-APPROVED/odh/symbols/custom/PressureTransmitter_OK.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_OK.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/PressureTransmitter_OK.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_OK.svg
diff --git a/NON-APPROVED/odh/symbols/custom/PressureTransmitter_WARNING.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_WARNING.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/PressureTransmitter_WARNING.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/PressureTransmitter_WARNING.svg
diff --git a/NON-APPROVED/odh/symbols/custom/closing.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/closing.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/closing.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/closing.svg
diff --git a/NON-APPROVED/odh/symbols/custom/conn_disc.jpg b/NON-APPROVED/odh/99-Shared/symbols/custom/conn_disc.jpg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/conn_disc.jpg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/conn_disc.jpg
diff --git a/NON-APPROVED/odh/symbols/custom/error.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/error.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/error.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/error.svg
diff --git a/NON-APPROVED/odh/symbols/custom/gas cylinder.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/gas cylinder.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/gas cylinder.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/gas cylinder.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock healthy.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock healthy.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock healthy.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock healthy.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock off.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock off.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock off.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock off.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock overridden disabled.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock overridden disabled.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock overridden disabled.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock overridden disabled.svg
diff --git a/NON-APPROVED/odh/symbols/custom/interlock tripped.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/interlock tripped.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/interlock tripped.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/interlock tripped.svg
diff --git a/NON-APPROVED/odh/symbols/custom/lock.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/lock.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/lock.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/lock.svg
diff --git a/NON-APPROVED/odh/symbols/custom/lock_open.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/lock_open.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/lock_open.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/lock_open.svg
diff --git a/NON-APPROVED/odh/symbols/custom/opening.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/opening.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/opening.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/opening.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_default.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_default.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_default.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_default.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_disabled.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_disabled.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_disabled.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_disabled.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_error.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_error.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_error.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_error.svg
diff --git a/NON-APPROVED/odh/symbols/custom/pump_notcontrolled.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/pump_notcontrolled.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/pump_notcontrolled.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/pump_notcontrolled.svg
diff --git a/NON-APPROVED/odh/symbols/custom/ramp.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/ramp.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/ramp.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/ramp.svg
diff --git a/NON-APPROVED/odh/symbols/custom/start.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/start.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/start.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/start.svg
diff --git a/NON-APPROVED/odh/symbols/custom/stop.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/stop.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/stop.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/stop.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve (opened).svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve (opened).svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve (opened).svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve (opened).svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_analog.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_analog.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_analog.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_analog.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_closed.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_closed.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_closed.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_closed.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_error.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_error.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_error.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_error.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_general.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_general.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_general.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_general.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_opened.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_opened.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_opened.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_opened.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_solenoid_OFF.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_OFF.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_solenoid_OFF.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_OFF.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_solenoid_ON.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_ON.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_solenoid_ON.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_solenoid_ON.svg
diff --git a/NON-APPROVED/odh/symbols/custom/valve_undefined.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/valve_undefined.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/valve_undefined.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/valve_undefined.svg
diff --git a/NON-APPROVED/odh/symbols/custom/warning.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/warning.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/warning.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/warning.svg
diff --git a/NON-APPROVED/odh/symbols/custom/wrench.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/wrench.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/wrench.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/wrench.svg
diff --git a/NON-APPROVED/odh/symbols/custom/wrenchred.svg b/NON-APPROVED/odh/99-Shared/symbols/custom/wrenchred.svg
similarity index 100%
rename from NON-APPROVED/odh/symbols/custom/wrenchred.svg
rename to NON-APPROVED/odh/99-Shared/symbols/custom/wrenchred.svg
diff --git a/NON-APPROVED/odh/symbols/diagnostics/ODH_CPU.PNG b/NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_CPU.PNG
similarity index 100%
rename from NON-APPROVED/odh/symbols/diagnostics/ODH_CPU.PNG
rename to NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_CPU.PNG
diff --git a/NON-APPROVED/odh/symbols/diagnostics/ODH_RIO1.PNG b/NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_RIO1.PNG
similarity index 100%
rename from NON-APPROVED/odh/symbols/diagnostics/ODH_RIO1.PNG
rename to NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_RIO1.PNG
diff --git a/NON-APPROVED/odh/symbols/diagnostics/ODH_Switch.PNG b/NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_Switch.PNG
similarity index 100%
rename from NON-APPROVED/odh/symbols/diagnostics/ODH_Switch.PNG
rename to NON-APPROVED/odh/99-Shared/symbols/diagnostics/ODH_Switch.PNG
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
index 2b4198f4b21544ae037440863448ffb714a1c80f..c8c6b1e25b1313bc6b02607d424cb79660950c5b 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(LOC_ACRONYM)</name>
+ <macros>
+ <POPUPS>99-Shared/popups</POPUPS>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
+ </macros>
<width>630</width>
<height>830</height>
<widget type="group" version="2.0.0">
@@ -129,7 +133,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Picture_2</name>
- <file>symbols/AreaLayout_CTL.png</file>
+ <file>$(SYMBOLS)/AreaLayout_CTL.png</file>
<x>10</x>
<y>10</y>
<width>540</width>
@@ -198,7 +202,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_22</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -217,7 +221,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_22</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -238,7 +242,7 @@
<name>OpenExpert_22</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -312,7 +316,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_23</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -331,7 +335,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_23</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -352,7 +356,7 @@
<name>OpenExpert_23</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -426,7 +430,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_24</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -445,7 +449,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_24</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -466,7 +470,7 @@
<name>OpenExpert_24</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -482,7 +486,7 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_CTL.plt</PLT>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
index 6ab3c3533cdb95eeb6fb85e7c8767d443fbfccf1..9c0ee42471b2d208fc0b74680f3943931f1f230b 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(LOC_ACRONYM)</name>
+ <macros>
+ <POPUPS>99-Shared/popups</POPUPS>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
+ </macros>
<width>1040</width>
<height>830</height>
<widget type="group" version="2.0.0">
@@ -129,7 +133,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Picture_2</name>
- <file>symbols/AreaLayout_CXH.png</file>
+ <file>$(SYMBOLS)/AreaLayout_CXH.png</file>
<x>10</x>
<y>10</y>
<width>950</width>
@@ -198,7 +202,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_15</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -217,7 +221,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_15</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -238,7 +242,7 @@
<name>OpenExpert_15</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -312,7 +316,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_16</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -331,7 +335,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_16</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -352,7 +356,7 @@
<name>OpenExpert_16</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -426,7 +430,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_17</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -445,7 +449,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_17</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -466,7 +470,7 @@
<name>OpenExpert_17</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -540,7 +544,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_18</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -559,7 +563,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_18</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -580,7 +584,7 @@
<name>OpenExpert_18</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -654,7 +658,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_19</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -673,7 +677,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_19</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -694,7 +698,7 @@
<name>OpenExpert_19</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -768,7 +772,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_20</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -787,7 +791,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_20</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -808,7 +812,7 @@
<name>OpenExpert_20</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -883,7 +887,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_21</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -902,7 +906,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_21</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -923,7 +927,7 @@
<name>OpenExpert_21</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -939,7 +943,7 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_CXB.plt</PLT>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
index 74cb253fe7f2df7a52bb4c692d300074c9773130..7a5b6b5c49fb02b5bad4a98679f9f821f8727282 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(LOC_ACRONYM)</name>
+ <macros>
+ <POPUPS>99-Shared/popups</POPUPS>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
+ </macros>
<width>1040</width>
<height>830</height>
<widget type="group" version="2.0.0">
@@ -129,7 +133,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Picture_2</name>
- <file>symbols/AreaLayout_HCB.png</file>
+ <file>$(SYMBOLS)/AreaLayout_HCB.png</file>
<x>10</x>
<y>10</y>
<width>950</width>
@@ -151,7 +155,7 @@
<name>OpenExpert_4</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -212,7 +216,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_4</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -232,7 +236,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_4</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -267,7 +271,7 @@
<name>OpenExpert_12</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -328,7 +332,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_12</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -348,7 +352,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_12</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -383,7 +387,7 @@
<name>OpenExpert_13</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -444,7 +448,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_13</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -464,7 +468,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_13</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -499,7 +503,7 @@
<name>OpenExpert_8</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -560,7 +564,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_8</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -580,7 +584,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_8</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -615,7 +619,7 @@
<name>OpenExpert_10</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -676,7 +680,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_10</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -696,7 +700,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_10</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -731,7 +735,7 @@
<name>OpenExpert_6</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -792,7 +796,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_6</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -812,7 +816,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_6</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -847,7 +851,7 @@
<name>OpenExpert_7</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -908,7 +912,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_7</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<x>58</x>
<y>28</y>
<width>25</width>
@@ -928,7 +932,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_7</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<x>59</x>
<y>29</y>
<width>22</width>
@@ -963,7 +967,7 @@
<name>OpenExpert_5</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1024,7 +1028,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_5</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1043,7 +1047,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_5</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1077,7 +1081,7 @@
<name>OpenExpert_9</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1138,7 +1142,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_9</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1157,7 +1161,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_9</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1191,7 +1195,7 @@
<name>OpenExpert</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1252,7 +1256,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1271,7 +1275,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1305,7 +1309,7 @@
<name>OpenExpert_11</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1366,7 +1370,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_11</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1385,7 +1389,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_11</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1419,7 +1423,7 @@
<name>OpenExpert_14</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Monit.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
<target>standalone</target>
<description>O2iM $(R)</description>
</action>
@@ -1480,7 +1484,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_OK_14</name>
- <file>symbols/custom/ConnectedPNG.png</file>
+ <file>$(SYMBOLS)/custom/ConnectedPNG.png</file>
<y>28</y>
<width>25</width>
<height>25</height>
@@ -1499,7 +1503,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>MonitHealthy_Err_14</name>
- <file>symbols/custom/error.svg</file>
+ <file>$(SYMBOLS)/custom/error.svg</file>
<y>29</y>
<width>22</width>
<height>22</height>
@@ -1522,7 +1526,7 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_HCB.plt</PLT>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob b/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
index 45cbca42faaa84470970dd3f48875ca2a5bdc2a8..c9bdc6e1b7ef4b50f5b14295bc99f57ce1383145 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
@@ -4,6 +4,7 @@
<macros>
<AREA>$(LOC)</AREA>
<P>KG-GTA:PSS-Area-TS2</P>
+ <SYMBOLS>99-Shared/symbols</SYMBOLS>
</macros>
<width>860</width>
<height>830</height>
@@ -171,7 +172,7 @@
<style>3</style>
<widget type="picture" version="2.0.0">
<name>Plan</name>
- <file>symbols/AreaLayout_TS2.png</file>
+ <file>$(SYMBOLS)/AreaLayout_TS2.png</file>
<x>10</x>
<y>10</y>
<width>780</width>
@@ -252,8 +253,8 @@
<name>MonitHealthy_23</name>
<pv_name>$(P):MonitHealthy</pv_name>
<symbols>
- <symbol>symbols/custom/error.svg</symbol>
- <symbol>symbols/custom/ConnectedPNG.png</symbol>
+ <symbol>$(SYMBOLS)/custom/error.svg</symbol>
+ <symbol>$(SYMBOLS)/custom/ConnectedPNG.png</symbol>
</symbols>
<x>3</x>
<y>29</y>
@@ -350,8 +351,8 @@
<name>MonitHealthy_24</name>
<pv_name>$(P):MonitHealthy</pv_name>
<symbols>
- <symbol>symbols/custom/error.svg</symbol>
- <symbol>symbols/custom/ConnectedPNG.png</symbol>
+ <symbol>$(SYMBOLS)/custom/error.svg</symbol>
+ <symbol>$(SYMBOLS)/custom/ConnectedPNG.png</symbol>
</symbols>
<x>3</x>
<y>29</y>
@@ -378,7 +379,7 @@
<name>Action Button</name>
<actions>
<action type="open_display">
- <file>ODH_Trend.bob</file>
+ <file>$(POPUPS)/ODH_Trend.bob</file>
<macros>
<P>$(LOC)</P>
<PLT>ODH_Trend_TS2.plt</PLT>
diff --git a/NON-APPROVED/odh/ODH_Main.bob b/NON-APPROVED/odh/ODH_Main.bob
index a1f87e4f912d9dc0814291dda2a6b254e8f1b44d..b300955a8a421b4eafeb0d18b3f86c324ad99969 100644
--- a/NON-APPROVED/odh/ODH_Main.bob
+++ b/NON-APPROVED/odh/ODH_Main.bob
@@ -2,6 +2,8 @@
<display version="2.0.0">
<name>ODH Main</name>
<macros>
+ <EMBEDDED_DISPLAYS>99-Shared/embedded_displays</EMBEDDED_DISPLAYS>
+ <POPUPS>99-Shared/popups</POPUPS>
<TS2_PATH>../TS2/pss</TS2_PATH>
</macros>
<width>645</width>
@@ -38,7 +40,7 @@
<name>PLC Button</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Diag.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Diag.bob</file>
<target>tab</target>
<description>PLC Diagnostic</description>
</action>
@@ -89,7 +91,7 @@
<name>Rack Button</name>
<actions>
<action type="open_display">
- <file>ODH_Expert_Racks.bob</file>
+ <file>$(POPUPS)/ODH_Expert_Racks.bob</file>
<target>standalone</target>
<description>Electrical Racks</description>
</action>
@@ -259,7 +261,7 @@ Healthy</text>
<P>HCB-ACH:ODH-O2iM</P>
<R>1</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>5</y>
<width>510</width>
@@ -271,7 +273,7 @@ Healthy</text>
<P>HCB-ACH:ODH-O2iM</P>
<R>2</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>37</y>
<width>510</width>
@@ -283,7 +285,7 @@ Healthy</text>
<P>HCB-ACH:ODH-O2iM</P>
<R>3</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>68</y>
<width>510</width>
@@ -295,7 +297,7 @@ Healthy</text>
<P>HCB-ACH:ODH-O2iM</P>
<R>4</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>99</y>
<width>510</width>
@@ -307,7 +309,7 @@ Healthy</text>
<P>HCB-ACH:ODH-O2iM</P>
<R>5</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>130</y>
<width>510</width>
@@ -319,7 +321,7 @@ Healthy</text>
<P>HCB-TCH:ODH-O2iM</P>
<R>6</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>161</y>
<width>510</width>
@@ -331,7 +333,7 @@ Healthy</text>
<P>HCB-TCH:ODH-O2iM</P>
<R>7</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>192</y>
<width>510</width>
@@ -343,7 +345,7 @@ Healthy</text>
<P>HCB-TCH:ODH-O2iM</P>
<R>8</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>223</y>
<width>510</width>
@@ -355,7 +357,7 @@ Healthy</text>
<P>HCB-TCH:ODH-O2iM</P>
<R>9</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>254</y>
<width>510</width>
@@ -367,7 +369,7 @@ Healthy</text>
<P>HCB-HPGS:ODH-O2iM</P>
<R>10</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>285</y>
<width>510</width>
@@ -379,7 +381,7 @@ Healthy</text>
<P>HCB-HPGS:ODH-O2iM</P>
<R>11</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>316</y>
<width>510</width>
@@ -391,7 +393,7 @@ Healthy</text>
<P>HCB-DogSh:ODH-O2iM</P>
<R>12</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>347</y>
<width>510</width>
@@ -565,7 +567,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>13</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -577,7 +579,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>14</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
@@ -589,7 +591,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>15</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>69</y>
<width>510</width>
@@ -601,7 +603,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>16</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>100</y>
<width>510</width>
@@ -613,7 +615,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>17</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>131</y>
<width>510</width>
@@ -625,7 +627,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>18</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>162</y>
<width>510</width>
@@ -637,7 +639,7 @@ $(pv_name)</tooltip>
<P>CXB-CXH:ODH-O2iM</P>
<R>19</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>193</y>
<width>510</width>
@@ -700,7 +702,7 @@ $(pv_name)</tooltip>
<P>CTLG-CS:ODH-O2iM</P>
<R>20</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -712,7 +714,7 @@ $(pv_name)</tooltip>
<P>CTLG-CS:ODH-O2iM</P>
<R>21</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>
@@ -724,7 +726,7 @@ $(pv_name)</tooltip>
<P>CTLG-CS:ODH-O2iM</P>
<R>22</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>69</y>
<width>510</width>
@@ -787,7 +789,7 @@ $(pv_name)</tooltip>
<P>KG-GTA:ODH-O2iM</P>
<R>1</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>6</y>
<width>510</width>
@@ -799,7 +801,7 @@ $(pv_name)</tooltip>
<P>KG-GTA:ODH-O2iM</P>
<R>2</R>
</macros>
- <file>ODH_Monit_Sub.bob</file>
+ <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
<x>10</x>
<y>38</y>
<width>510</width>