X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusion_widget.xml;h=9ed078fbb49ad7a06a12800ac4e284c11926a69d;hb=fb54db5e1466b16dfc029c4a7364a67a9a6a8c24;hp=b6425362b8456da6eec3e91492cd237b64447b27;hpb=58aebaaaea5ce694e6c718920c8e2dfe1bf00b55;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index b6425362b..9ed078fbb 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -2,53 +2,52 @@
 
 <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="vertex edge face">
+                   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>
+  <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"/>
+  </multi_selector>
+  <shape_selector id="direction_object"
+                  icon=":icons/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">
-      <composite_multi_selector id="base"
-        label="Select a sketch face"
-        icon=":icons/sketch.png"
-        tooltip="Select a sketch face"
-        type_choice="Faces">
-        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
-      </composite_multi_selector>
+    <box id="BySizes"
+         title="By sizes"
+         icon=":icons/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/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/dimension_down.png"
+                     tooltip="From size"/>
       </groupbox>
     </box>
-    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-      <composite_multi_selector id="base"
-        label="Select a sketch face"
-        icon=":icons/sketch.png"
-        tooltip="Select a sketch face"
-        type_choice="Faces">
-        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
-      </composite_multi_selector>
+    <box id="ByPlanesAndOffsets"
+         title="By bounding planes and offsets"
+         icon=":icons/plane_inverted_32x32.png">
       <groupbox title="From">
         <shape_selector id="from_object"
                         icon=":icons/plane.png"
@@ -58,14 +57,12 @@ Extrusion will be filled with them"
                         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/dimension_up_down.png"
+                     tooltip="Offset for &quot;from&quot; bounding plane"/>
       </groupbox>
       <groupbox title="To">
         <shape_selector id="to_object"
@@ -76,16 +73,15 @@ Extrusion will be filled with them"
                         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/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>