Fix for the issue #3076 ExportToGEOM: Fatal error SWIG director method error

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

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 8fc0925caf92ddcaa47fbb9ff07a5abfaf2a4230..dca9d22a906ef1ca8133c66aba4441940638d82a 100644 (file)
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,29 +1,24 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <multi_selector id="main_objects"
     label="Main objects"
-    icon=":icons/cut_shape.png"
-    tooltip="Select a solid objects"
-    type_choice="Solids"
+    icon=""
+    tooltip="Select objects"
+    shape_types="vertices edges wires faces shells solids compsolids compounds"
+    use_choice="false"
     concealment="true">
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
   </multi_selector>
-  <multi_selector id="tool_objects" 
-    label="Tool object" 
-    icon=":icons/cut_tool.png" 
-    tooltip="Select a tool solid"
-    type_choice="Solids"
+  <multi_selector id="tool_objects"
+    label="Tool objects"
+    icon=""
+    tooltip="Select tools"
+    shape_types="vertices edges wires faces shells solids compsolids compounds"
+    use_choice="false"
     concealment="true" >
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
   </multi_selector>
-  <choice id="bool_type" 
-    label="Type" 
-    tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common"
-    default="0"
-  />
-  <validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
+  <validator id="FeaturesPlugin_ValidatorBooleanArguments" parameters="main_objects,tool_objects"/>
+  <validator id="GeomValidators_NotSelfIntersected" parameters="main_objects,tool_objects"/>
 </source>