Improvement #615: Widgets position in Extrusion and Rotation features must be changed.

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

diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index c11aa4c19fa304c9e7577204c284d2ad03ea5d0f..acece541af68b535894311ab9c0820fba75a512a 100644 (file)
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -1,86 +1,97 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <multi_selector id="base"
-    label="Select a sketch face"
-    icon=":icons/sketch.png"
-    tooltip="Select a sketch face"
-    type_choice="Faces">
-    <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
-  </multi_selector>
-  <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>
   <toolbox id="CreationMethod">
-    <box id="ByOffsets" title="By offsets">
+    <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </multi_selector>
+      <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>
       <groupbox>
         <doublevalue
-          id="to_angle"
+          id="from_angle"
           label="Angle"
-          min="0"
           step="1.0"
-          default="360"
-          icon=":icons/angle_up.png"
-          tooltip="Angle">
+          default="0"
+          icon=":icons/angle_down.png"
+          tooltip="From angle">
         </doublevalue>
       </groupbox>
       <groupbox>
         <doublevalue
-          id="from_angle"
+          id="to_angle"
           label="Angle"
-          min="0"
           step="1.0"
-          default="0"
-          icon=":icons/angle_down.png"
-          tooltip="Angle">
+          default="360"
+          icon=":icons/angle_up.png"
+          tooltip="To angle">
         </doublevalue>
       </groupbox>
     </box>
-    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets">
-      <groupbox title="To">
-        <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
+    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </multi_selector>
+      <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>
+      <groupbox title="From">
+        <shape_selector id="from_object"
+                        icon=":icons/plane.png"
                         label="Plane face"
-                        tooltip="Select a planar face"
+                        tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
                         default="&lt;base sketch&gt;">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
         <doublevalue
-          id="to_angle"
-          label="Angle"
-          min="0"
+          id="from_offset"
+          label="Offset"
           step="1.0"
-          default="360"
-          icon=":icons/angle_up.png"
-          tooltip="Angle">
+          default="0"
+          icon=":icons/angle_down.png"
+          tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
-      <groupbox title="From">
-        <shape_selector id="from_object"
-                        icon=":icons/plane.png"
+      <groupbox title="To">
+        <shape_selector id="to_object"
+                        icon=":icons/plane_inverted.png"
                         label="Plane face"
-                        tooltip="Select a planar face"
+                        tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
                         default="&lt;base sketch&gt;">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
         <doublevalue
-          id="from_angle"
-          label="Angle"
-          min="0"
+          id="to_offset"
+          label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/angle_down.png"
-          tooltip="Angle">
+          icon=":icons/angle_up.png"
+          tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
     </box>
   </toolbox>
-  <validator id="GeomValidators_ZeroOffset" parameters="from_object,to_object,from_angle,to_angle"/>
+  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
 </source>
\ No newline at end of file