From 54a7ee1f3f38f0aa1c67af6edd1f6440c8c78a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@esss.se>
Date: Tue, 21 Jan 2020 14:43:12 +0100
Subject: [PATCH] Enable is instantenious -> Moved out of Apply
---
.../vac_ctrl_mks946_937b_comb_chan.bob | 48 +++++++++----------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
index 7a6f5621..f751fbe9 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
@@ -45,7 +45,7 @@
<width>120</width>
<height>25</height>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
<background_color>
@@ -64,7 +64,7 @@
<width>120</width>
<height>25</height>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
<background_color>
@@ -83,7 +83,7 @@
<width>120</width>
<height>25</height>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
<background_color>
@@ -97,12 +97,12 @@
<widget type="label" version="2.0.0">
<name>Enable</name>
<text>Enable</text>
- <x>550</x>
+ <x>680</x>
<y>50</y>
<width>120</width>
<height>25</height>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
<background_color>
@@ -259,11 +259,27 @@
</action>
</actions>
<pv_name>$(DEVICENAME):CC1:CommitS</pv_name>
- <x>700</x>
+ <x>550</x>
<y>85</y>
<height>25</height>
<tooltip>Apply configuration settings</tooltip>
</widget>
+ <widget type="combo" version="2.0.0">
+ <name>CC1 EnableS</name>
+ <pv_name>$(DEVICENAME):CC1:EnableS</pv_name>
+ <x>680</x>
+ <y>85</y>
+ <width>120</width>
+ <height>25</height>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="PRIMARY" red="0" green="148" blue="202">
+ </color>
+ </background_color>
+ </widget>
<widget type="led" version="2.0.0">
<name>CC2 EnabledR</name>
<pv_name>${DEVICENAME}:CC2:Enabled-RB</pv_name>
@@ -393,31 +409,15 @@
</action>
</actions>
<pv_name>$(DEVICENAME):CC2:CommitS</pv_name>
- <x>700</x>
+ <x>550</x>
<y>120</y>
<height>25</height>
<tooltip>Apply configuration settings</tooltip>
</widget>
- <widget type="combo" version="2.0.0">
- <name>CC1 EnableS</name>
- <pv_name>$(DEVICENAME):CC1:EnableS</pv_name>
- <x>550</x>
- <y>85</y>
- <width>120</width>
- <height>25</height>
- <foreground_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <background_color>
- <color name="PRIMARY" red="0" green="148" blue="202">
- </color>
- </background_color>
- </widget>
<widget type="combo" version="2.0.0">
<name>CC2 EnableS</name>
<pv_name>$(DEVICENAME):CC2:EnableS</pv_name>
- <x>550</x>
+ <x>680</x>
<y>120</y>
<width>120</width>
<height>25</height>
--
GitLab