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

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index b7798d9d9..262c1c97a 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,40 +1,35 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <!--<multi_selector id="main_objects" 
-    label="Main object" 
-    icon=":icons/cut_shape.png" 
-    tooltip="Select an object solid"
-    type_choice="solid"
-    concealment="true"
-  />
-  <multi_selector id="tool_objects" 
-    label="Tool object" 
-    icon=":icons/cut_tool.png" 
-    tooltip="Select a tool solid"
-    type_choice="solid"
-    concealment="true" >
-	<validator id="PartSet_DifferentObjects"/>
-  </multi_selector>-->
-  <shape_selector id="main_object"
-    label="Main object"
-    icon=":icons/cut_shape.png"
-    tooltip="Select an object solid"
-    shape_types="solid shell"
-    concealment="true"
-  />
-  <shape_selector id="tool_object" 
-    label="Tool object" 
-    icon=":icons/cut_tool.png" 
-    tooltip="Select a tool solid"
-    shape_types="solid"
-    concealment="true" >
-	<validator id="PartSet_DifferentObjects"/>
-  </shape_selector>
-  <choice id="bool_type" 
-    label="Type" 
+  <module_choice id="bool_type"
+    widget_type="radiobuttons"
+    buttons_dir="horizontal"
+    label="Operation type"
     tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common"
+    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 solid objects"
+    type_choice="solids compsolids edges faces"
+    use_choice="false"
+    concealment="true">
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
+  </multi_selector>
+  <multi_selector id="tool_objects"
+    label="Tool objects"
+    icon=""
+    tooltip="Select a tool solid"
+    type_choice="solids compsolids edges faces"
+    use_choice="false"
+    concealment="true" >
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
+  </multi_selector>
+  <validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
 </source>