X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusioncut_widget.xml;h=1f894d22344227ac2f139042c2a8434e87bcd6ee;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=fbfb40f5f22f5b2776175ce32a850b6e27f407f5;hpb=aee9184a4f80da0929ede36f14624881a48e675f;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index fbfb40f5f..1f894d223 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -3,30 +3,48 @@
 <source>
   <groupbox title="Extrusion">
     <sketch_launcher id="sketch"
-      label="Sketch"
-      icon=":icons/sketch.png"
-      tooltip="Create or edit a sketch">
+      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="face objects">
     </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_ValidatorCompositeLauncher" parameters="face,shell"/>
+    </composite_multi_selector>
+    <shape_selector id="direction_object"
+                    icon=":icons/axis.png"
+                    label="Direction"
+                    tooltip="Select an edge for direction"
+                    shape_types="edge"
+                    default="">
+      <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">
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_down.png"
-            tooltip="From size">
+            default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="To size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="To size">
+            default="10"
+            icon=":icons/dimension_down.png"
+            tooltip="From size">
           </doublevalue>
         </groupbox>
       </box>
@@ -42,7 +60,7 @@
           </shape_selector>
           <doublevalue id="from_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
+            icon=":icons/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
@@ -57,14 +75,14 @@
           </shape_selector>
           <doublevalue  id="to_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
+            icon=":icons/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
       </box>
     </toolbox>
   </groupbox>
-  <multi_selector id="boolean_objects"
+  <multi_selector id="main_objects"
     label="Cut from:"
     icon=":icons/cut_shape.png"
     tooltip="Objects to Cut"
@@ -72,5 +90,6 @@
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
-  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,sketch_selection,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"/>
 </source>