X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fboolean_widget.xml;h=3d1a0ac58cd00c5d4598a13e4a680901c1ef4e9c;hb=5f2dd854a118fb9dffec8658d1d234e6587c539f;hp=e1443e531c8ff456970a73001450b6e18f90a8bd;hpb=36c83ebade90867a88f2e1c1b0989625e6d6a505;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index e1443e531..3d1a0ac58 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>
-  <!--<shape_selector id="main_object" 
-    label="Main object" 
-    icon=":icons/cut_shape.png" 
-    tooltip="Select an object solid"
-    shape_types="solid shell"
-    concealment="true"
-  />-->
-  <multi_selector id="main_objects" 
-    label="Main object" 
-    icon=":icons/cut_shape.png" 
-    tooltip="Select an object solid"
-    type_choice="Solids"
-    concealment="true"
+  <module_choice id="bool_type"
+    widget_type="radiobuttons"
+    buttons_dir="horizontal"
+    label="Operation type" 
+    tooltip="Type of boolean operation"
+    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="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 id="main_objects"
+    label="Main objects"
+    icon=""
+    tooltip="Select solid objects"
+    type_choice="Solids Objects"
+    use_choice="false"
+    concealment="true">
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="FeaturesPlugin_BooleanSelection"/>
   </multi_selector>
-  <!--<shape_selector id="tool_object" 
-    label="Tool object" 
-    icon=":icons/cut_tool.png" 
+  <multi_selector id="tool_objects"
+    label="Tool objects"
+    icon=""
     tooltip="Select a tool solid"
-    shape_types="solid"
+    type_choice="Solids Objects"
+    use_choice="false"
     concealment="true" >
-	<validator id="PartSet_DifferentObjects"/>
-  </shape_selector>-->
-  <choice id="bool_type" 
-    label="Type" 
-    tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common"
-    default="0"
-  />
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="FeaturesPlugin_BooleanSelection"/>
+  </multi_selector>
+  <validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
 </source>