X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolution_widget.xml;h=3d71c3d844b90a41682dbd5bfe7227b35f8abf25;hb=0325db75534c99a962d6c03f2619e1fcc04491b6;hp=c6c50d62cb5b62dc71e7256aaa84c986861a18dc;hpb=d44671b5418920fef3264b53af7e62a8f8cb2bb7;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index c6c50d62c..3d71c3d84 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_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>
   <sketch_launcher id="sketch"
@@ -7,17 +26,18 @@
 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">
+                   shape_types="vertices edges wires faces shells compounds">
     <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
   </sketch_launcher>
-  <composite_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"/>
-  </composite_multi_selector>
+  <multi_selector id="base"
+                  label="Base objects:"
+                  tooltip="Select a base objects"
+                  type_choice="vertices edges wires faces shells compounds"
+                  concealment="true">
+    <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
+  </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"
@@ -27,13 +47,13 @@
   <toolbox id="CreationMethod">
     <box id="ByAngles"
          title="By angles"
-         icon=":icons/angle_up_down_32x32.png">
+         icon="icons/Features/angle_up_down_32x32.png">
       <groupbox>
         <doublevalue id="to_angle"
                      label="Angle"
                      step="1.0"
                      default="360"
-                     icon=":icons/angle_up.png"
+                     icon="icons/Features/angle_up.png"
                      tooltip="To angle"/>
       </groupbox>
       <groupbox>
@@ -41,16 +61,16 @@
                      label="Angle"
                      step="1.0"
                      default="0"
-                     icon=":icons/angle_down.png"
+                     icon="icons/Features/angle_down.png"
                      tooltip="From angle"/>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets"
          title="By bounding planes and angles"
-         icon=":icons/plane_inverted_32x32.png">
+         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"
@@ -61,12 +81,12 @@
                      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"/>
       </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"
@@ -77,11 +97,11 @@
                      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"/>
       </groupbox>
     </box>
   </toolbox>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,base,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
-  <validator id="FeaturesPlugin_ValidatorCanBeEmpty" parameters="CreationMethod,ByAngles,base,to_object,from_object"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>