X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusionfuse_widget.xml;h=2a438fa6f9ffe76950187c38d2818138409609af;hb=919584a7e5ee83c384873c2627b9865e8ba02272;hp=1d1d19fc6df245752eee9bf290684257fc829093;hpb=87b74a6fd4660ebfa71a40f0be84e44535f84798;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index 1d1d19fc6..2a438fa6f 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -8,32 +8,34 @@
 1. Planar face of non-sketch object or a plane. Sketch creation will be started.<br />
 2. An existing sketch face or contour. Extrusion will be filled by it.<br />
 3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it."
-      shape_types="face objects">
+      shape_types="vertices edges wires faces shells compounds">
+      <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
     </sketch_launcher>
-    <composite_multi_selector id="base"
+    <multi_selector id="base"
       label="Select a sketch face"
-      icon=":icons/sketch.png"
+      icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
-      type_choice="Faces Objects">
-      <validator id="FeaturesPlugin_ValidatorExtrusionBase" parameters="Sketch"/>
-    </composite_multi_selector>
+      type_choice="vertices edges wires faces shells compounds"
+      concealment="true">
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
+    </multi_selector>
     <shape_selector id="direction_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Direction"
                     tooltip="Select an edge for direction"
                     shape_types="edge"
-                    default="">
+                    default="&lt;base normal&gt;">
       <validator id="GeomValidators_ShapeType" parameters="empty,line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+      <box id="BySizes" title="By sizes" icon="icons/Features/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
             label="Size"
             step="1.0"
             default="10"
-            icon=":icons/dimension_up.png"
+            icon="icons/Features/dimension_up.png"
             tooltip="To size">
           </doublevalue>
         </groupbox>
@@ -43,15 +45,15 @@
             label="Size"
             step="1.0"
             default="0"
-            icon=":icons/dimension_down.png"
+            icon="icons/Features/dimension_down.png"
             tooltip="From size">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon="icons/Features/plane_inverted_32x32.png">
         <groupbox title="From">
           <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+                          icon="icons/Features/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -60,13 +62,13 @@
           </shape_selector>
           <doublevalue id="from_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">
           <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+                          icon="icons/Features/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -75,7 +77,7 @@
           </shape_selector>
           <doublevalue  id="to_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
@@ -84,11 +86,13 @@
   </groupbox>
   <multi_selector id="main_objects"
     label="Fuse with:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
-    type_choice="Solids"
+    type_choice="Solids Compsolids"
+    use_choice="false"
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,sketch_selection,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
 </source>