Skip to content
Snippets Groups Projects
Commit e9f4cbcc authored by Benjamin Bolling's avatar Benjamin Bolling
Browse files

target update from Johannes

parent 6a6c5075
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<name>Target</name> <name>Target</name>
<<<<<<< HEAD
<macros>
<ROOT>$(ROOT)</ROOT>
</macros>
<width>2370</width>
=======
<width>2350</width> <width>2350</width>
>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<height>1238</height> <height>1238</height>
<background_color> <background_color>
<color name="BACKGROUND" red="220" green="225" blue="221"> <color name="BACKGROUND" red="220" green="225" blue="221">
</color> </color>
</background_color> </background_color>
<widget type="rectangle" version="2.0.0"> <widget type="rectangle" version="2.0.0">
<<<<<<< HEAD
<name>Rectangle_39</name>
=======
<name>Rectangle_40</name> <name>Rectangle_40</name>
<class></class> <class></class>
>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<width>200</width> <width>200</width>
<height>1238</height> <height>1238</height>
<line_width>0</line_width> <line_width>0</line_width>
...@@ -23,14 +34,58 @@ ...@@ -23,14 +34,58 @@
<tabs> <tabs>
<tab> <tab>
<name>Overview</name> <name>Overview</name>
<<<<<<< HEAD
<file></file>
=======
<file>collectedOPIs_01_targ_overview.bob</file> <file>collectedOPIs_01_targ_overview.bob</file>
>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<macros> <macros>
</macros> </macros>
<group_name></group_name> <group_name></group_name>
</tab> </tab>
<tab> <tab>
<<<<<<< HEAD
<name>THCCS</name>
<file>collectedOPIs_01_thccs.bob</file>
<macros>
</macros>
<group_name></group_name>
</tab>
<tab>
<name>TSSMS</name>
<file></file>
<macros>
</macros>
<group_name></group_name>
</tab>
<tab>
<name>Target Wheel System</name>
<file></file>
<macros>
</macros>
<group_name></group_name>
</tab>
<tab>
<name>Target Monitoring System</name>
<file></file>
<macros>
</macros>
<group_name></group_name>
</tab>
<tab>
<name>RGTCS</name>
<file></file>
<macros>
</macros>
<group_name></group_name>
</tab>
<tab>
<name>NBPI-NBOA CS</name>
<file></file>
=======
<name>Helium Cooling Control</name> <name>Helium Cooling Control</name>
<file>../../target-systems/thccs/thccs.bob</file> <file>../../target-systems/thccs/thccs.bob</file>
>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<macros> <macros>
</macros> </macros>
<group_name></group_name> <group_name></group_name>
...@@ -49,6 +104,8 @@ ...@@ -49,6 +104,8 @@
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201"> <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color> </color>
</deselected_color> </deselected_color>
<<<<<<< HEAD
=======
</widget> </widget>
<widget type="action_button" version="3.0.0"> <widget type="action_button" version="3.0.0">
<name>DetachButton</name> <name>DetachButton</name>
...@@ -84,5 +141,6 @@ ...@@ -84,5 +141,6 @@
<width>185</width> <width>185</width>
<height>40</height> <height>40</height>
<tooltip>$(actions)</tooltip> <tooltip>$(actions)</tooltip>
>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
</widget> </widget>
</display> </display>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment