From: mpv <mpv@opencascade.com>
Date: Wed, 9 Sep 2015 13:43:25 +0000 (+0300)
Subject: Fix for regression caused by merging of new configuration files and the pictures
X-Git-Tag: V_1.4.0_beta4~52
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aee9184a4f80da0929ede36f14624881a48e675f;p=modules%2Fshaper.git

Fix for regression caused by merging of new configuration files and the pictures
---

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index bdb7a148f..b683cceed 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -2,10 +2,10 @@
 
 <source>
   <toolbox id="CreationMethod">
-    <box id="AxisByPointsCase" title="By two points" icon=":icons/point.png">
+    <box id="AxisByPointsCase" title="By two points" icon=":icons/by_two_points_32x32.png">
       <shape_selector id="FirstPoint"
         label="First point"
-        icon=":icons/by_two_points_32x32.png"
+        icon=":icons/point.png"
         tooltip="Select a first point"
         shape_types="vertex">
         <validator id="GeomValidators_ConstructionComposite"/>
@@ -21,10 +21,10 @@
         <validator id="GeomValidators_DifferentShapes"/>
       </shape_selector>
     </box>
-    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon=":icons/circle.png">
+    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon=":icons/cylindrical_face_32x32.png">
       <shape_selector id="CylindricalFace"
         label="Main object" 
-        icon=":icons/cylindrical_face_32x32.png" 
+        icon=":icons/circle.png" 
         tooltip="Select a cylindrical object"
         shape_types="face solid shell">
         <validator id="GeomValidators_Face" parameters="cylinder"/>
diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index dc01cc620..a21ebedb1 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -1,74 +1,81 @@
 <!-- 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>
   <toolbox id="CreationMethod">
-    <box id="BySizes" title="By sizes" icon=":icons/dimension_vert_32x32.png">
+    <box id="BySizes" title="By sizes" icon=":icons/dimension_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>
       <groupbox>
         <doublevalue
-          id="to_size"
+          id="from_size"
           label="Size"
           step="1.0"
-          default="10"
-          icon=":icons/dimension_up.png"
-          tooltip="Size">
+          default="0"
+          icon=":icons/dimension_down.png"
+          tooltip="From size">
         </doublevalue>
       </groupbox>
       <groupbox>
         <doublevalue
-          id="from_size"
+          id="to_size"
           label="Size"
           step="1.0"
-          default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="Size">
+          default="10"
+          icon=":icons/dimension_up.png"
+          tooltip="To size">
         </doublevalue>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-      <groupbox title="To">
-        <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.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>
+      <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_offset"
+          id="from_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/dimension_up.png"
-          tooltip="Offset">
+          icon=":icons/dimension_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_offset"
+          id="to_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="Offset">
+          icon=":icons/dimension_up.png"
+          tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
-    </box>    
+    </box>
   </toolbox>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index c2a006dab..fbfb40f5f 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -8,59 +8,57 @@
       tooltip="Create or edit a sketch">
     </sketch_launcher>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_vert_32x32.png">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
-            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Size">
+            default="10"
+            icon=":icons/dimension_down.png"
+            tooltip="From size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
-            min="0"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_down.png"
-            tooltip="Size">
+            default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="To size">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+        <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_offset"
-            label="Offset" min="0" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Offset">
+          <doublevalue id="from_offset"
+            label="Offset" step="1.0" default="0"
+            icon=":icons/dimension_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_offset"
-            label="Offset" min="0" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="Offset">
+          <doublevalue  id="to_offset"
+            label="Offset" step="1.0" default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
       </box>
@@ -72,6 +70,7 @@
     tooltip="Objects to Cut"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index 90452e2ca..d1805d94f 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -8,59 +8,57 @@
       tooltip="Create or edit a sketch">
     </sketch_launcher>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_vert_32x32.png">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
-            min="0"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_up.png"
-            tooltip="Size">
+            default="0"
+            icon=":icons/dimension_down.png"
+            tooltip="From size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
-            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="Size">
+            default="10"
+            icon=":icons/dimension_up.png"
+            tooltip="To size">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+        <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_offset"
-            label="Offset" min="0" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Offset">
+          <doublevalue id="from_offset"
+            label="Offset" step="1.0" default="0"
+            icon=":icons/dimension_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_offset"
-            label="Offset" min="0" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="Offset">
+          <doublevalue  id="to_offset"
+            label="Offset" step="1.0" default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
       </box>
@@ -72,6 +70,7 @@
     tooltip="Objects to Fuse"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index d034c2659..acece541a 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -1,79 +1,94 @@
 <!-- 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="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"
           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"
           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" icon=":icons/plane_inverted_32x32.png">
-      <groupbox title="To">
-        <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.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_offset"
+          id="from_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/angle_up.png"
-          tooltip="Offset">
+          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_offset"
+          id="to_offset"
           label="Offset"
           step="1.0"
           default="0"
-          icon=":icons/angle_down.png"
-          tooltip="Offset">
+          icon=":icons/angle_up.png"
+          tooltip="Offset for bounding plane">
         </doublevalue>
       </groupbox>
     </box>
diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 189efa4db..6a9bc063e 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -7,68 +7,74 @@
       icon=":icons/sketch.png"
       tooltip="Create or edit a sketch">
     </sketch_launcher>
-    <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="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>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
-            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/angle_up.png"
-            tooltip="Angle">
+            default="10"
+            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="10"
-            icon=":icons/angle_down.png"
-            tooltip="Angle">
+            default="0"
+            icon=":icons/angle_up.png"
+            tooltip="To angle">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.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>
+        <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;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset" label="Offset"
-            min="0" step="1.0" default="0"
-            icon=":icons/angle_up.png"
-            tooltip="Offset">
+          <doublevalue id="from_offset" label="Offset"
+            step="1.0" 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;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset" label="Offset"
-            min="0" step="1.0" default="0"
-            icon=":icons/angle_down.png"
-            tooltip="Offset">
+          <doublevalue  id="to_offset" label="Offset"
+            step="1.0" default="0"
+            icon=":icons/angle_up.png"
+            tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
       </box>
@@ -80,6 +86,7 @@
     tooltip="Objects to Cut"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
 </source>
diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index cbdcae1b2..d211d9b56 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -7,68 +7,74 @@
       icon=":icons/sketch.png"
       tooltip="Create or edit a sketch">
     </sketch_launcher>
-    <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="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>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
-            min="0"
             step="1.0"
-            default="10"
-            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="10"
+            icon=":icons/angle_up.png"
+            tooltip="To angle">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.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>
+        <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;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset" label="Offset"
-            min="0" step="1.0" default="0"
-            icon=":icons/angle_up.png"
-            tooltip="Offset">
+          <doublevalue id="from_offset" label="Offset"
+            step="1.0" 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;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset" label="Offset"
-            min="0" step="1.0" default="0"
-            icon=":icons/angle_down.png"
-            tooltip="Offset">
+          <doublevalue  id="to_offset" label="Offset"
+            step="1.0" default="0"
+            icon=":icons/angle_up.png"
+            tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
       </box>
@@ -80,6 +86,7 @@
     tooltip="Objects to Fuse"
     type_choice="Solids"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
 </source>