From 5dec3a3168f45ea4aa926fed6831f38cfd6cb7e1 Mon Sep 17 00:00:00 2001
From: Xiaoqiang Wang <xiaoqiangwang@gmail.com>
Date: Wed, 15 Mar 2023 12:03:53 +0100
Subject: [PATCH] split ES2 cameras to a submenu

---
 X_X04SA_ES2_cameras.json  | 70 +++++++++++++++++++++++++++++++++++++++
 X_X04SA_ES2_top_menu.json | 47 ++++----------------------
 2 files changed, 76 insertions(+), 41 deletions(-)
 create mode 100644 X_X04SA_ES2_cameras.json

diff --git a/X_X04SA_ES2_cameras.json b/X_X04SA_ES2_cameras.json
new file mode 100644
index 0000000..dff4d2c
--- /dev/null
+++ b/X_X04SA_ES2_cameras.json
@@ -0,0 +1,70 @@
+{
+    "menu-title": {
+        "text": "PD Cameras",
+        "style": "color: black;background-color: #7300ff006b00;"
+    },
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Sample Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SAMCAM:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-SAMCAM:image1:"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Position Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-POSCAM:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Position Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-POSCAM:image1:"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "SCD Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SCDCAM:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "SCD Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-SCDCAM:image1:"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Optical Table Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-OT1CAM:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Optical Table Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-OT1CAM:image1:"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "X-ray Eye Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-XEYE:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "X-ray Eye Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-XEYE:image1:"
+        }
+    ]
+}
diff --git a/X_X04SA_ES2_top_menu.json b/X_X04SA_ES2_top_menu.json
index 430f39e..c74256f 100644
--- a/X_X04SA_ES2_top_menu.json
+++ b/X_X04SA_ES2_top_menu.json
@@ -13,6 +13,11 @@
             "text": "User Motors",
             "file": "X_X04SA_ES2_userMotors.json"
         },
+        {
+            "type": "menu",
+            "text": "Cameras",
+            "file": "X_X04SA_ES2_cameras.json"
+        },
         {
             "type": "cmd",
             "text": "LCAD",
@@ -48,52 +53,12 @@
             "text": "Sample Spinner",
             "command": "caqtdm -x -attach -noMsg -dg +300+100 -macro P=X04SA-ES2-,M=SM:ROX,T1=PD,T2=Spinner X_X04SA_spinner_small.ui"
         },
-        {
-            "type": "cmd",
-            "text": "Sample Camera",
-            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SAMCAM:,R=cam1: prosilica.ui"
-        },
-        {
-            "type": "cmd",
-            "text": "Sample Viewer",
-            "command": "QtAD --simple --prefix=X04SA-ES2-SAMCAM:image1:"
-        },
-        {
-            "type": "cmd",
-            "text": "Beam Position Camera",
-            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-POSCAM:,R=cam1: prosilica.ui"
-        },
-        {
-            "type": "cmd",
-            "text": "Beam Position Viewer",
-            "command": "QtAD --simple --prefix=X04SA-ES2-POSCAM:image1:"
-        },
-        {
-            "type": "cmd",
-            "text": "SCD Camera",
-            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SCDCAM:,R=cam1: prosilica.ui"
-        },
-        {
-            "type": "cmd",
-            "text": "SCD Viewer",
-            "command": "QtAD --simple --prefix=X04SA-ES2-SCDCAM:image1:"
-        },
-        {
-            "type": "cmd",
-            "text": "Optical Table Camera",
-            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-OT1CAM:,R=cam1: prosilica.ui"
-        },
-        {
-            "type": "cmd",
-            "text": "Optical Table Viewer",
-            "command": "QtAD --simple --prefix=X04SA-ES2-OT1CAM:image1:"
-        },
         {
             "type": "separator"
         },
         {
             "type": "cmd",
-            "text": "X-ray Eye",
+            "text": "X-ray Eye Lens",
             "command": "caqtdm -dg +20+80 -x -attach -noMsg -macro ES=ES2 X_X04SA_ES2_xRayEye.ui"
         },
         {