X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fboolean_widget.xml;h=99d5ca6995b05d063fb70a3544c92911d2f159c2;hb=5c7800057bef826f4dfcd151a05b18ca5c69a08a;hp=8fc0925caf92ddcaa47fbb9ff07a5abfaf2a4230;hpb=a10325fa2dc6f2df9d4d1429cbe1036cc86648db;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 8fc0925ca..99d5ca699 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,29 +1,36 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
+  <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=":icons/cut_shape.png"
-    tooltip="Select a solid objects"
-    type_choice="Solids"
+    icon=""
+    tooltip="Select solid objects"
+    type_choice="Solids Objects"
+    use_choice="false"
     concealment="true">
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <!--<validator id="GeomValidators_ShapeType" parameters="empty,edge,face,solid"/>-->
+    <validator id="GeomValidators_BooleanSelection"/>
   </multi_selector>
-  <multi_selector id="tool_objects" 
-    label="Tool object" 
-    icon=":icons/cut_tool.png" 
+  <multi_selector id="tool_objects"
+    label="Tool objects"
+    icon=""
     tooltip="Select a tool solid"
-    type_choice="Solids"
+    type_choice="Solids Objects"
+    use_choice="false"
     concealment="true" >
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <!--<validator id="GeomValidators_ShapeType" parameters="empty,edge,face,solid"/>-->
+    <validator id="GeomValidators_BooleanSelection"/>
   </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>