X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2Fboolean_widget.xml;h=8e6543d09ffcf4873e03000d86115cd26e2e5856;hb=2413ba5e387ebc030eb89aaad917991844ae518d;hp=040124714edbacb11d3476633954099f10dbac0d;hpb=1f245a12321ab8aaa9e54050b0eedc2ab1bd650e;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 040124714..8e6543d09 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,40 +1,32 @@
 <!-- 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="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"
+    icons_list=":icons/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png"
+    default="0"
   />
+  <multi_selector id="main_objects"
+    label="Main objects"
+    icon=""
+    tooltip="Select a solid objects"
+    type_choice="Solids"
+    concealment="true">
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+  </multi_selector>
   <multi_selector id="tool_objects" 
     label="Tool object" 
-    icon=":icons/cut_tool.png" 
+    icon="" 
     tooltip="Select a tool solid"
     type_choice="Solids"
     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" 
-    tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common"
-    default="0"
-  />
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+  </multi_selector>
+  <validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
 </source>