Multiple objects and tools for Boolean operations.

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

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index f356304b0ed84501ba5da677edb217b8ec00fa8e..76c854b460fbe63f847530c7833b75f33ac5f7a4 100644 (file)
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,22 +1,25 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <!--<multi_selector id="main_objects" 
-    label="Main object" 
-    icon=":icons/cut_shape.png" 
+  <multi_selector id="main_objects"
+    label="Main object"
+    icon=":icons/cut_shape.png"
     tooltip="Select an object solid"
     type_choice="Solids"
-    concealment="true"
-  />
+    concealment="true">
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
+  </multi_selector>
   <multi_selector id="tool_objects" 
     label="Tool object" 
     icon=":icons/cut_tool.png" 
     tooltip="Select a tool solid"
     type_choice="Solids"
     concealment="true" >
-       <validator id="PartSet_DifferentObjects"/>
-  </multi_selector>-->
-  <shape_selector id="main_object"
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
+  </multi_selector>
+  <!--<shape_selector id="main_object"
     label="Main object"
     icon=":icons/cut_shape.png"
     tooltip="Select an object solid"
@@ -30,7 +33,7 @@
     shape_types="solid"
     concealment="true" >
        <validator id="PartSet_DifferentObjects"/>
-  </shape_selector>
+  </shape_selector>-->
   <choice id="bool_type" 
     label="Type" 
     tooltip="Type of boolean operation"