X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusion_widget.xml;h=25a388dffb92d64cedcd05360f487b82eb82a568;hb=8f060aedd5949990421a96e3b4086f43efa13d24;hp=350cac0220da192b355c1dba2cd6d97e4ae324dd;hpb=ca03465754f3815ede43f8686305fe39b6703a9c;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 350cac022..25a388dff 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -7,33 +7,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="faces objects">
-    <validator id="FeaturesPlugin_ValidatorCompositeLauncherE" parameters="Sketch"/>
+                   shape_types="vertices edges wires faces shells solids compsolids compounds">
+    <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
   </sketch_launcher>
-  <composite_multi_selector id="base"
-                            label="Base objects:"
-                            tooltip="Select a base objects"
-                            type_choice="faces objects">
-    <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
-  </composite_multi_selector>
+  <multi_selector id="base"
+                  label="Base objects:"
+                  tooltip="Select a base objects"
+                  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">
+         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"/>
       </groupbox>
       <groupbox>
@@ -41,16 +42,16 @@
                      label="Size"
                      step="1.0"
                      default="0"
-                     icon=":icons/dimension_down.png"
+                     icon="icons/Features/dimension_down.png"
                      tooltip="From size"/>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets"
          title="By bounding planes and offsets"
-         icon=":icons/plane_inverted_32x32.png">
+         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"
@@ -61,12 +62,12 @@
                      label="Offset"
                      step="1.0"
                      default="0"
-                     icon=":icons/dimension_up_down.png"
+                     icon="icons/Features/dimension_up_down.png"
                      tooltip="Offset for &quot;from&quot; bounding plane"/>
       </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"
@@ -77,11 +78,11 @@
                      label="Offset"
                      step="1.0"
                      default="0"
-                     icon=":icons/dimension_up_down.png"
+                     icon="icons/Features/dimension_up_down.png"
                      tooltip="Offset for &quot;to&quot; bounding plane"/>
       </groupbox>
     </box>
   </toolbox>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,base,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
-  <validator id="FeaturesPlugin_ValidatorCanBeEmpty" parameters="CreationMethod,BySizes,base,to_object,from_object,direction_object"/>
+  <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
 </source>