X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fboolean_widget.xml;h=8fc0925caf92ddcaa47fbb9ff07a5abfaf2a4230;hb=6239c1880d74ea741d49e06ab9d24b1d9e63a0dc;hp=b7798d9d91cf0f4890d1c6af39b41e958a1411bb;hpb=87db694c19f51ae773e27f6b61770225d0b4727c;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index b7798d9d9..8fc0925ca 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,40 +1,29 @@
 <!-- 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"
+  <multi_selector id="main_objects"
+    label="Main objects"
     icon=":icons/cut_shape.png"
-    tooltip="Select an object solid"
-    shape_types="solid shell"
-    concealment="true"
-  />
-  <shape_selector id="tool_object" 
+    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" 
     tooltip="Select a tool solid"
-    shape_types="solid"
+    type_choice="Solids"
     concealment="true" >
-	<validator id="PartSet_DifferentObjects"/>
-  </shape_selector>
+    <validator id="PartSet_DifferentObjects"/>
+    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+  </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"/>
 </source>