Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / FeaturesPlugin / boolean_widget.xml

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index d0ee131a4da8e6ab35d40ae617214f60898fdfaa..9a6e83da90e1e76fd50c922146d840aaacaf55dc 100644 (file)
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,16 +1,24 @@
+<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 <source>
-  <selector id="main_object" 
+  <shape_selector id="main_object" 
     label="Main object" 
     icon=":icons/cut_shape.png" 
-    tooltip="Select an object to cut"
-    activate="true"
-    shape_types="solid,shell"
+    tooltip="Select an object solid"
+    shape_types="solid shell"
+    concealment="true"
   />
-  <selector id="tool_object" 
+  <shape_selector id="tool_object" 
     label="Tool object" 
     icon=":icons/cut_tool.png" 
-    tooltip="Select a tool"
-    activate="false"
+    tooltip="Select a tool solid"
     shape_types="solid"
+    concealment="true" >
+       <validator id="PartSet_DifferentObjects"/>
+  </shape_selector>
+  <choice id="bool_type" 
+    label="Type" 
+    tooltip="Type of boolean operation"
+    string_list="Cut Fuse Common"
   />
 </source>