X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolutionfuse_widget.xml;h=633b1ca2a1c8ae0f23c434a5dc9b5e50d98a0029;hb=658fccce59f75b0cfa7c3f3d45f1ffb295ed24be;hp=00f1496ad8498cdc4987f7b99708173b891bbd48;hpb=fea939dc45bd225f272f4343a4c806adbc44fb4e;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index 00f1496ad..633b1ca2a 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -9,31 +9,32 @@
 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">
+      <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>
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
+    </multi_selector>
+    <shape_selector id="axis_object"
+                    icon="icons/Features/axis.png"
+                    label="Axis"
+                    tooltip="Select an edge for axis"
+                    shape_types="edge"
+                    default="">
+      <validator id="GeomValidators_ShapeType" parameters="line"/>
+    </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
-        <shape_selector id="axis_object"
-                        icon=":icons/axis.png"
-                        label="Axis"
-                        tooltip="Select an edge for axis"
-                        shape_types="edge"
-                        default="">
-          <validator id="GeomValidators_ShapeType" parameters="line"/>
-        </shape_selector>
+      <box id="ByAngles" title="By angles" icon="icons/Features/angle_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_angle"
             label="Angle"
             step="1.0"
             default="0"
-            icon=":icons/angle_up.png"
+            icon="icons/Features/angle_up.png"
             tooltip="To angle">
           </doublevalue>
         </groupbox>
@@ -43,23 +44,15 @@
             label="Angle"
             step="1.0"
             default="10"
-            icon=":icons/angle_down.png"
+            icon="icons/Features/angle_down.png"
             tooltip="From angle">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon=":icons/plane_inverted_32x32.png">
-        <shape_selector id="axis_object"
-                        icon=":icons/axis.png"
-                        label="Axis"
-                        tooltip="Select an edge for axis"
-                        shape_types="edge"
-                        default="">
-          <validator id="GeomValidators_ShapeType" parameters="line"/>
-        </shape_selector>
+      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" 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"
@@ -68,13 +61,13 @@
           </shape_selector>
           <doublevalue id="from_offset" label="Angle"
             step="1.0" default="0"
-            icon=":icons/angle_up_down.png"
+            icon="icons/Features/angle_up_down.png"
             tooltip="Angle for &quot;from&quot; 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"
@@ -83,16 +76,16 @@
           </shape_selector>
           <doublevalue  id="to_offset" label="Angle"
             step="1.0" default="0"
-            icon=":icons/angle_up_down.png"
+            icon="icons/Features/angle_up_down.png"
             tooltip="Angle for &quot;to&quot; bounding plane">
           </doublevalue>
         </groupbox>
       </box>
     </toolbox>
   </groupbox>
-  <multi_selector id="boolean_objects"
+  <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"
     concealment="true">