X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolutioncut_widget.xml;h=12f2f247f45e509048e9dd951573275a38668bfa;hb=1e2eaa713f139d2617c80eba9ede62d4e9976bb7;hp=a42e01027b7a87e65256265e60334504840a979c;hpb=87b74a6fd4660ebfa71a40f0be84e44535f84798;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index a42e01027..12f2f247f 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -1,4 +1,23 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+<!--
+Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+See http:##www.salome-platform.org/ or
+email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+-->
 
 <source>
   <groupbox title="Revolution">
@@ -8,17 +27,19 @@
 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">
+      shape_types="wires faces shells">
+      <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>
+      type_choice="wires faces shells"
+      concealment="true">
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
+    </multi_selector>
     <shape_selector id="axis_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Axis"
                     tooltip="Select an edge for axis"
                     shape_types="edge"
@@ -26,14 +47,14 @@
       <validator id="GeomValidators_ShapeType" parameters="line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+      <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="10"
-            icon=":icons/angle_up.png"
+            icon="icons/Features/angle_up.png"
             tooltip="To angle">
           </doublevalue>
         </groupbox>
@@ -43,15 +64,15 @@
             label="Angle"
             step="1.0"
             default="0"
-            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">
+      <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"
@@ -60,13 +81,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; 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"
@@ -75,7 +96,7 @@
           </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>
@@ -84,11 +105,14 @@
   </groupbox>
   <multi_selector id="main_objects"
     label="Cut from:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Cut"
-    type_choice="Solids"
-    concealment="true">
+    type_choice="Objects"
+    use_choice="false"
+    concealment="true"
+    main_argument="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,sketch_selection,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>