X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusion_widget.xml;h=a2ec80b160e22203e66b973dd696b3abbe2c45e3;hb=658fccce59f75b0cfa7c3f3d45f1ffb295ed24be;hp=6f0faf6104e04b91309f3cdb869f543a6fb7218a;hpb=514bc3ce714fa4b398b94f3293aa279b31725467;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 6f0faf610..a2ec80b16 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -2,83 +2,87 @@
 
 <source>
   <sketch_launcher id="sketch"
-    attribute_list_id="base"
-    label="Select: 1. Planar face of non-sketch object or a plane. Sketch creation will be started.
-2. An existing sketch face or contour. Extrusion will be filled with them. 3.A shape on existing result: wires/edge/vertices.
-Extrusion will be filled with them"
-    icon=":icons/sketch.png"
-    use_body="false"
-    tooltip="Create or edit a sketch"
-    shape_types="face objects">
+                   attribute_list_id="base"
+                   label="Select:&lt;br /&gt;
+1. Planar face of non-sketch object or a plane. Sketch creation will be started.&lt;br /&gt;
+2. An existing sketch face or contour. Extrusion will be filled by it.&lt;br /&gt;
+3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it."
+                   shape_types="faces objects">
+    <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
   </sketch_launcher>
-  <composite_multi_selector id="base"
-    label="Select a sketch face"
-    icon=":icons/sketch.png"
-    tooltip="Select a sketch face"
-    type_choice="Faces Objects">
-    <validator id="FeaturesPlugin_ValidatorExtrusionBase" parameters="Sketch"/>
-  </composite_multi_selector>
+  <multi_selector id="base"
+                  label="Base objects:"
+                  tooltip="Select a base objects"
+                  type_choice="faces objects"
+                  concealment="true">
+    <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
+  </multi_selector>
+  <shape_selector id="direction_object"
+                  icon="icons/Features/axis.png"
+                  label="Direction"
+                  tooltip="Select an edge for direction"
+                  shape_types="edge"
+                  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"
-          tooltip="To size">
-        </doublevalue>
+        <doublevalue id="to_size"
+                     label="Size"
+                     step="1.0"
+                     default="10"
+                     icon="icons/Features/dimension_up.png"
+                     tooltip="To size"/>
       </groupbox>
       <groupbox>
-        <doublevalue
-          id="from_size"
-          label="Size"
-          step="1.0"
-          default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="From size">
-        </doublevalue>
+        <doublevalue id="from_size"
+                     label="Size"
+                     step="1.0"
+                     default="0"
+                     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">
+    <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"
                         default="&lt;base sketch&gt;">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
-        <doublevalue
-          id="from_offset"
-          label="Offset"
-          step="1.0"
-          default="0"
-          icon=":icons/dimension_up_down.png"
-          tooltip="Offset for bounding plane">
-        </doublevalue>
+        <doublevalue id="from_offset"
+                     label="Offset"
+                     step="1.0"
+                     default="0"
+                     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"
                         default="&lt;base sketch&gt;">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
-        <doublevalue
-          id="to_offset"
-          label="Offset"
-          step="1.0"
-          default="0"
-          icon=":icons/dimension_up_down.png"
-          tooltip="Offset for bounding plane">
-        </doublevalue>
+        <doublevalue id="to_offset"
+                     label="Offset"
+                     step="1.0"
+                     default="0"
+                     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="base,direction_object"/>
 </source>