From 07acbe990e12c3cb7165327661d7b29cba34f792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= <anders.sandstroem@psi.ch>
Date: Mon, 24 Feb 2025 16:53:44 +0100
Subject: [PATCH] Cleanup panels

---
 qt/ecmc_plugin_safety_main.ui | 30 ++++++++++----
 qt/sim_motion_safety_box.ui   | 74 +++++++++++++++++++++++++++++++----
 2 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/qt/ecmc_plugin_safety_main.ui b/qt/ecmc_plugin_safety_main.ui
index 94e3009..18a815b 100644
--- a/qt/ecmc_plugin_safety_main.ui
+++ b/qt/ecmc_plugin_safety_main.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>315</width>
-    <height>123</height>
+    <height>150</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>20</y>
+     <y>45</y>
      <width>30</width>
      <height>30</height>
     </rect>
@@ -44,7 +44,7 @@
    <property name="geometry">
     <rect>
      <x>55</x>
-     <y>22</y>
+     <y>47</y>
      <width>251</width>
      <height>26</height>
     </rect>
@@ -60,7 +60,7 @@
    <property name="geometry">
     <rect>
      <x>55</x>
-     <y>50</y>
+     <y>75</y>
      <width>246</width>
      <height>28</height>
     </rect>
@@ -76,7 +76,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>45</y>
+     <y>75</y>
      <width>30</width>
      <height>30</height>
     </rect>
@@ -103,7 +103,7 @@
    <property name="geometry">
     <rect>
      <x>55</x>
-     <y>80</y>
+     <y>105</y>
      <width>206</width>
      <height>28</height>
     </rect>
@@ -119,7 +119,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>75</y>
+     <y>105</y>
      <width>30</width>
      <height>30</height>
     </rect>
@@ -142,6 +142,22 @@
     </color>
    </property>
   </widget>
+  <widget class="caLabel" name="calabel">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>10</y>
+     <width>221</width>
+     <height>28</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>SS1 group: $(SAFETY_GRP=)</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+   </property>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/qt/sim_motion_safety_box.ui b/qt/sim_motion_safety_box.ui
index 9a551fb..fe2a81c 100644
--- a/qt/sim_motion_safety_box.ui
+++ b/qt/sim_motion_safety_box.ui
@@ -18,24 +18,41 @@
     <rect>
      <x>55</x>
      <y>40</y>
-     <width>41</width>
-     <height>151</height>
+     <width>40</width>
+     <height>70</height>
     </rect>
    </property>
    <property name="channel" stdset="0">
     <string notr="true">$(IOC):m$(M_ID=0)s$(BI_S_ID)-One</string>
    </property>
    <property name="endBit">
-    <number>1</number>
+    <number>0</number>
+   </property>
+   <property name="foreground" stdset="0">
+    <color>
+     <red>78</red>
+     <green>154</green>
+     <blue>6</blue>
+    </color>
+   </property>
+   <property name="background" stdset="0">
+    <color>
+     <red>255</red>
+     <green>0</green>
+     <blue>0</blue>
+    </color>
+   </property>
+   <property name="fontScaleMode" stdset="0">
+    <enum>EPushButton::None</enum>
    </property>
   </widget>
   <widget class="caByte" name="cabyte">
    <property name="geometry">
     <rect>
      <x>55</x>
-     <y>205</y>
-     <width>41</width>
-     <height>71</height>
+     <y>200</y>
+     <width>40</width>
+     <height>70</height>
     </rect>
    </property>
    <property name="channel" stdset="0">
@@ -44,12 +61,19 @@
    <property name="endBit">
     <number>0</number>
    </property>
+   <property name="foreground" stdset="0">
+    <color>
+     <red>78</red>
+     <green>154</green>
+     <blue>6</blue>
+    </color>
+   </property>
   </widget>
   <widget class="caLabel" name="calabel">
    <property name="geometry">
     <rect>
      <x>125</x>
-     <y>70</y>
+     <y>65</y>
      <width>171</width>
      <height>28</height>
     </rect>
@@ -119,6 +143,42 @@
     <string>Simulation of motion safety box</string>
    </property>
   </widget>
+  <widget class="caByteController" name="cabytecontroller_2">
+   <property name="geometry">
+    <rect>
+     <x>55</x>
+     <y>120</y>
+     <width>40</width>
+     <height>70</height>
+    </rect>
+   </property>
+   <property name="channel" stdset="0">
+    <string notr="true">$(IOC):m$(M_ID=0)s$(BI_S_ID)-One</string>
+   </property>
+   <property name="startBit">
+    <number>1</number>
+   </property>
+   <property name="endBit">
+    <number>1</number>
+   </property>
+   <property name="foreground" stdset="0">
+    <color>
+     <red>78</red>
+     <green>154</green>
+     <blue>6</blue>
+    </color>
+   </property>
+   <property name="background" stdset="0">
+    <color>
+     <red>255</red>
+     <green>0</green>
+     <blue>0</blue>
+    </color>
+   </property>
+   <property name="fontScaleMode" stdset="0">
+    <enum>EPushButton::None</enum>
+   </property>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>