26451: Import Result with Groups

[modules/shaper.git] / src / FeaturesPlugin / extrusion_widget.xml

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index dcb41eb2dc1b497fc421346979d05594885eb9cc..4a566d21e1c5be69d6ea92747957fead1b0e22d3 100644 (file)
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -1,15 +1,35 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <sketch_launcher id="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="vertices edges wires faces shells solids compsolids compounds">
+3. An existing result shape of kind: wires/edges/vertices. Extrusion will be filled by it."
+                  shape_types="Vertices Edges Faces|Wires"
+                  type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png"
+                  default_type = "2"
+                  use_choice="true">
     <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
   </sketch_launcher>
+  <multi_selector id="base"
+                  label="Base objects:"
+                  tooltip="Select a base objects"
+                  shape_types="Vertices Edges Faces|Wires"
+                  type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png"
+                  default_type = "2"
+                  use_choice="true"
+                  concealment="true">
+    <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
+  </multi_selector>
+  <shape_selector id="direction_object"
+                  icon="icons/Features/axis.png"
+                  label="Direction"
+                  tooltip="Select an edge for direction"
+                  shape_types="edge"
+                  geometrical_selection="true"
+                  default="&lt;base normal&gt;">
+    <validator id="GeomValidators_ShapeType" parameters="empty,line"/>
+  </shape_selector>
   <toolbox id="CreationMethod">
     <box id="BySizes"
          title="By sizes"
@@ -32,16 +52,17 @@
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets"
-         title="By bounding planes and offsets"
+         title="By bounding faces and offsets"
          icon="icons/Features/plane_inverted_32x32.png">
       <groupbox title="From">
         <shape_selector id="from_object"
                         icon="icons/Features/plane.png"
-                        label="Plane face"
-                        tooltip="Bounding plane (select a planar face)"
+                        label="From face"
+                        tooltip="From face"
                         shape_types="face"
+                        geometrical_selection="true"
                         default="&lt;base sketch&gt;">
-          <validator id="GeomValidators_Face" parameters="plane"/>
+          <validator id="FeaturesPlugin_ValidatorExtrusionBoundary"/>
         </shape_selector>
         <doublevalue id="from_offset"
                      label="Offset"
@@ -53,11 +74,12 @@
       <groupbox title="To">
         <shape_selector id="to_object"
                         icon="icons/Features/plane_inverted.png"
-                        label="Plane face"
-                        tooltip="Bounding plane (select a planar face)"
+                        label="To face"
+                        tooltip="To face"
                         shape_types="face"
+                        geometrical_selection="true"
                         default="&lt;base sketch&gt;">
-          <validator id="GeomValidators_Face" parameters="plane"/>
+          <validator id="FeaturesPlugin_ValidatorExtrusionBoundary"/>
         </shape_selector>
         <doublevalue id="to_offset"
                      label="Offset"
@@ -68,21 +90,7 @@
       </groupbox>
     </box>
   </toolbox>
-  <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="direction_object"
-                  icon="icons/Features/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>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,base,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
   <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>