X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fboolean_widget.xml;h=262c1c97a6b2dd27c1c8493856e499a475a53e79;hb=919584a7e5ee83c384873c2627b9865e8ba02272;hp=cdf755b6c21010fecaf50b1413579a93c2ceea84;hpb=42985955d89fa845790a7e38609f5b6838285147;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index cdf755b6c..262c1c97a 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,32 +1,35 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <choice id="bool_type"
+  <module_choice id="bool_type"
     widget_type="radiobuttons"
     buttons_dir="horizontal"
-    label="Operation type" 
+    label="Operation type"
     tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common"
-    icons_list=":icons/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png"
+    string_list="Cut Fuse Common Fill Smash"
+    use_in_title="true"
+    icons_list="icons/Features/bool_cut.png icons/Features/bool_fuse.png icons/Features/bool_common.png icons/Features/bool_fill.png icons/Features/bool_smash.png"
     default="0"
   />
   <multi_selector id="main_objects"
     label="Main objects"
     icon=""
-    tooltip="Select a solid objects"
-    type_choice="Solids"
+    tooltip="Select solid objects"
+    type_choice="solids compsolids edges faces"
+    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="" 
+  <multi_selector id="tool_objects"
+    label="Tool objects"
+    icon=""
     tooltip="Select a tool solid"
-    type_choice="Solids"
+    type_choice="solids compsolids edges faces"
+    use_choice="false"
     concealment="true" >
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
   </multi_selector>
   <validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
 </source>