From 99e62fd41487801497afe929e0a54e94f95f2ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu> Date: Tue, 20 Oct 2020 16:05:26 +0200 Subject: [PATCH] Fixed tooltip formatting --- .../COMMON/Faceplate/interlock_leds.bob | 12 ---------- .../DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob | 22 ------------------- .../vpp-vpdp/Faceplate/vac-vpdp-popup.bob | 21 ------------------ .../vacuum/vpt/Faceplate/vac-vpt-popup.bob | 22 ------------------- 4 files changed, 77 deletions(-) diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob index c6c9ea25..dbc2727d 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob @@ -21,9 +21,6 @@ <color name="Button Grey" red="180" green="180" blue="180"> </color> </foreground_color> - <actions> - </actions> - <tooltip>$(pv_name)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>LED Tripped</name> @@ -41,9 +38,6 @@ <color name="Button Grey" red="180" green="180" blue="180"> </color> </foreground_color> - <actions> - </actions> - <tooltip>$(pv_name)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>LED Bypassed</name> @@ -61,9 +55,6 @@ <color name="Button Grey" red="180" green="180" blue="180"> </color> </foreground_color> - <actions> - </actions> - <tooltip>$(pv_name)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>LED Disabled</name> @@ -81,8 +72,5 @@ <color name="Button Grey" red="180" green="180" blue="180"> </color> </foreground_color> - <actions> - </actions> - <tooltip>$(pv_name)</tooltip> </widget> </display> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob index 53c6db29..548913d7 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob @@ -37,7 +37,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -225,7 +224,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -283,7 +281,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -308,7 +305,6 @@ </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>ErrorMsg</name> @@ -366,7 +362,6 @@ </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>WarningMsg</name> @@ -451,8 +446,6 @@ </line_color> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>StoppedR</name> @@ -473,7 +466,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label StoppedR</name> @@ -520,7 +512,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label ValidR</name> @@ -567,7 +558,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label InvalidCommandR</name> @@ -614,7 +604,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AcceleratingR</name> @@ -661,7 +650,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label HWErrorR</name> @@ -708,7 +696,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label StartDQ-RB</name> @@ -755,7 +742,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label OnManualStartR</name> @@ -802,7 +788,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label OnAutoStartR</name> @@ -849,7 +834,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AtNominalSpdR</name> @@ -895,8 +879,6 @@ $(pv_value)</tooltip> </line_color> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label Interlocks</name> @@ -999,7 +981,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label ITLckTrigR</name> @@ -1059,8 +1040,6 @@ $(pv_value)</tooltip> </line_color> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>AutoStartDisStR</name> @@ -1081,7 +1060,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AutoStartDisStR</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob index 153e3f44..1e97ee4a 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob @@ -32,7 +32,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -188,7 +187,6 @@ </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>ErrorMsg</name> @@ -246,7 +244,6 @@ </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>WarningMsg</name> @@ -331,8 +328,6 @@ </points> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>StoppedR</name> @@ -353,7 +348,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label StoppedR</name> @@ -400,7 +394,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label ValidR</name> @@ -447,7 +440,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label InvalidCommandR</name> @@ -494,7 +486,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AcceleratingR</name> @@ -541,7 +532,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label LocalControlR</name> @@ -588,7 +578,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label StartDQ-RB</name> @@ -635,7 +624,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label OnManualStartR</name> @@ -682,7 +670,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label OnAutoStartR</name> @@ -729,7 +716,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AtNominalSpdR</name> @@ -776,7 +762,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label PumpDisconnectedR</name> @@ -822,8 +807,6 @@ $(pv_value)</tooltip> </points> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label Interlocks</name> @@ -926,7 +909,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label ITLckTrigR</name> @@ -986,8 +968,6 @@ $(pv_value)</tooltip> </points> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>AutoStartDisStR</name> @@ -1008,7 +988,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AutoStartDisStR</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob index d1ad44d3..ab809edf 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob @@ -37,7 +37,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -225,7 +224,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -283,7 +281,6 @@ <wrap_words>false</wrap_words> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> <border_color> <color name="Blue" red="0" green="128" blue="255"> </color> @@ -308,7 +305,6 @@ </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>ErrorMsg</name> @@ -366,7 +362,6 @@ </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>WarningMsg</name> @@ -451,8 +446,6 @@ </points> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>StoppedR</name> @@ -473,7 +466,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label StoppedR</name> @@ -520,7 +512,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label ValidR</name> @@ -567,7 +558,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label InvalidCommandR</name> @@ -614,7 +604,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AcceleratingR</name> @@ -661,7 +650,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label HWErrorR</name> @@ -708,7 +696,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label StartDQ-RB</name> @@ -755,7 +742,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label OnManualStartR</name> @@ -802,7 +788,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label OnAutoStartR</name> @@ -849,7 +834,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AtNominalSpdR</name> @@ -895,8 +879,6 @@ $(pv_value)</tooltip> </points> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label Interlocks</name> @@ -999,7 +981,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label ITLckTrigR</name> @@ -1059,8 +1040,6 @@ $(pv_value)</tooltip> </points> <actions> </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> </widget> <widget type="led" version="2.0.0"> <name>AutoStartDisStR</name> @@ -1081,7 +1060,6 @@ $(pv_value)</tooltip> </foreground_color> <actions> </actions> - <tooltip>$(pv_name) / $(pv_value)</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Label AutoStartDisStR</name> -- GitLab