From: mpv <mpv@opencascade.com>
Date: Wed, 9 Sep 2015 13:01:43 +0000 (+0300)
Subject: Update of pictures by ABA
X-Git-Tag: V_1.4.0_beta4~60
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=40cb766e78a86842f588a765162aa04e25c0d399;p=modules%2Fshaper.git

Update of pictures by ABA
---

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index 74284b8d5..4f59a4338 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -5,7 +5,7 @@
     <box id="AxisByPointsCase" title="By two points" icon=":icons/point.png">
       <shape_selector id="FirstPoint"
         label="First point"
-        icon=":icons/point.png"
+        icon=":icons/by_two_points_32x32.png"
         tooltip="Select a first point"
         shape_types="vertex">
         <validator id="GeomValidators_ConstructionComposite"/>
@@ -18,13 +18,13 @@
         shape_types="vertex">
         <validator id="GeomValidators_ConstructionComposite"/>
         <validator id="GeomValidators_ShapeType" parameters="vertex"/>
-        <validator id="GeomValidators_DifferentShapes"/>
+        <validator id="PartSet_DifferentShapes"/>
       </shape_selector>
     </box>
     <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon=":icons/circle.png">
       <shape_selector id="CylindricalFace"
         label="Main object" 
-        icon=":icons/circle.png" 
+        icon=":icons/cylindrical_face_32x32.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 a21ebedb1..dc01cc620 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -1,81 +1,74 @@
 <!-- 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_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>
+    <box id="BySizes" title="By sizes" icon=":icons/dimension_vert_32x32.png">
       <groupbox>
         <doublevalue
-          id="from_size"
+          id="to_size"
           label="Size"
           step="1.0"
-          default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="From size">
+          default="10"
+          icon=":icons/dimension_up.png"
+          tooltip="Size">
         </doublevalue>
       </groupbox>
       <groupbox>
         <doublevalue
-          id="to_size"
+          id="from_size"
           label="Size"
           step="1.0"
-          default="10"
-          icon=":icons/dimension_up.png"
-          tooltip="To size">
+          default="0"
+          icon=":icons/dimension_down.png"
+          tooltip="Size">
         </doublevalue>
       </groupbox>
     </box>
     <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>
-      <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="Bounding plane (select a planar face)"
+                        tooltip="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 for bounding plane">
+          icon=":icons/dimension_up.png"
+          tooltip="Offset">
         </doublevalue>
       </groupbox>
-      <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="Bounding plane (select a planar face)"
+                        tooltip="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 for bounding plane">
+          icon=":icons/dimension_down.png"
+          tooltip="Offset">
         </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 fbfb40f5f..c2a006dab 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -8,57 +8,59 @@
       tooltip="Create or edit a sketch">
     </sketch_launcher>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_vert_32x32.png">
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
+            min="0"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_down.png"
-            tooltip="From size">
+            default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="Size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
+            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="To size">
+            default="10"
+            icon=":icons/dimension_down.png"
+            tooltip="Size">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <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="Bounding plane (select a planar face)"
+                          tooltip="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" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue  id="to_offset"
+            label="Offset" min="0" step="1.0" default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
-        <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="Bounding plane (select a planar face)"
+                          tooltip="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" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue id="from_offset"
+            label="Offset" min="0" step="1.0" default="0"
+            icon=":icons/dimension_down.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
       </box>
@@ -70,7 +72,6 @@
     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 d1805d94f..90452e2ca 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -8,57 +8,59 @@
       tooltip="Create or edit a sketch">
     </sketch_launcher>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_vert_32x32.png">
         <groupbox>
           <doublevalue
-            id="from_size"
+            id="to_size"
             label="Size"
+            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="From size">
+            default="10"
+            icon=":icons/dimension_up.png"
+            tooltip="Size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="to_size"
+            id="from_size"
             label="Size"
+            min="0"
             step="1.0"
-            default="10"
-            icon=":icons/dimension_up.png"
-            tooltip="To size">
+            default="0"
+            icon=":icons/dimension_down.png"
+            tooltip="Size">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <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="Bounding plane (select a planar face)"
+                          tooltip="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" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue  id="to_offset"
+            label="Offset" min="0" step="1.0" default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
-        <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="Bounding plane (select a planar face)"
+                          tooltip="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" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue id="from_offset"
+            label="Offset" min="0" step="1.0" default="0"
+            icon=":icons/dimension_down.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
       </box>
@@ -70,7 +72,6 @@
     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 acece541a..d034c2659 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -1,94 +1,79 @@
 <!-- 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="from_angle"
+          id="to_angle"
           label="Angle"
           step="1.0"
-          default="0"
-          icon=":icons/angle_down.png"
-          tooltip="From angle">
+          default="360"
+          icon=":icons/angle_up.png"
+          tooltip="Angle">
         </doublevalue>
       </groupbox>
       <groupbox>
         <doublevalue
-          id="to_angle"
+          id="from_angle"
           label="Angle"
           step="1.0"
-          default="360"
-          icon=":icons/angle_up.png"
-          tooltip="To angle">
+          default="0"
+          icon=":icons/angle_down.png"
+          tooltip="Angle">
         </doublevalue>
       </groupbox>
     </box>
     <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"
+      <groupbox title="To">
+        <shape_selector id="to_object"
+                        icon=":icons/plane_inverted.png"
                         label="Plane face"
-                        tooltip="Bounding plane (select a planar face)"
+                        tooltip="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 for bounding plane">
+          icon=":icons/angle_up.png"
+          tooltip="Offset">
         </doublevalue>
       </groupbox>
-      <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="Bounding plane (select a planar face)"
+                        tooltip="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 for bounding plane">
+          icon=":icons/angle_down.png"
+          tooltip="Offset">
         </doublevalue>
       </groupbox>
     </box>
diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 6a9bc063e..189efa4db 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -7,74 +7,68 @@
       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="from_angle"
+            id="to_angle"
             label="Angle"
+            min="0"
             step="1.0"
-            default="10"
-            icon=":icons/angle_down.png"
-            tooltip="From angle">
+            default="0"
+            icon=":icons/angle_up.png"
+            tooltip="Angle">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
+            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/angle_up.png"
-            tooltip="To angle">
+            default="10"
+            icon=":icons/angle_down.png"
+            tooltip="Angle">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_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 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="Bounding plane (select a planar face)"
+                          tooltip="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"
-            step="1.0" default="0"
-            icon=":icons/angle_down.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue  id="to_offset" label="Offset"
+            min="0" step="1.0" default="0"
+            icon=":icons/angle_up.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
-        <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="Bounding plane (select a planar face)"
+                          tooltip="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"
-            step="1.0" default="0"
-            icon=":icons/angle_up.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue id="from_offset" label="Offset"
+            min="0" step="1.0" default="0"
+            icon=":icons/angle_down.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
       </box>
@@ -86,7 +80,6 @@
     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 d211d9b56..cbdcae1b2 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -7,74 +7,68 @@
       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="from_angle"
+            id="to_angle"
             label="Angle"
+            min="0"
             step="1.0"
-            default="0"
-            icon=":icons/angle_down.png"
-            tooltip="From angle">
+            default="10"
+            icon=":icons/angle_up.png"
+            tooltip="Angle">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
+            min="0"
             step="1.0"
-            default="10"
-            icon=":icons/angle_up.png"
-            tooltip="To angle">
+            default="0"
+            icon=":icons/angle_down.png"
+            tooltip="Angle">
           </doublevalue>
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_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 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="Bounding plane (select a planar face)"
+                          tooltip="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"
-            step="1.0" default="0"
-            icon=":icons/angle_down.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue  id="to_offset" label="Offset"
+            min="0" step="1.0" default="0"
+            icon=":icons/angle_up.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
-        <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="Bounding plane (select a planar face)"
+                          tooltip="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"
-            step="1.0" default="0"
-            icon=":icons/angle_up.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue id="from_offset" label="Offset"
+            min="0" step="1.0" default="0"
+            icon=":icons/angle_down.png"
+            tooltip="Offset">
           </doublevalue>
         </groupbox>
       </box>
@@ -86,7 +80,6 @@
     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>
diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index 8b287c6f8..7bcc40afc 100644
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -1,6 +1,7 @@
  <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
      <file>icons/angle.png</file>
+     <file>icons/angle_32x32.png</file>
      <file>icons/angle_up.png</file>
      <file>icons/angle_down.png</file>
      <file>icons/arc.png</file>
@@ -66,5 +67,8 @@
      <file>icons/angle_up_32x32.png</file>
      <file>icons/angle_up_down_32x32.png</file>
      <file>icons/dimension_up_down_32x32.png</file>
+     <file>icons/by_two_points_32x32.png</file>
+     <file>icons/cylindrical_face_32x32.png</file>
+     <file>icons/dimension_vert_32x32.png</file>
  </qresource>
  </RCC>
diff --git a/src/PartSet/icons/activate.png b/src/PartSet/icons/activate.png
index f82917927..26b66a3ab 100644
Binary files a/src/PartSet/icons/activate.png and b/src/PartSet/icons/activate.png differ
diff --git a/src/PartSet/icons/angle.png b/src/PartSet/icons/angle.png
index b64d5148f..e401acd67 100644
Binary files a/src/PartSet/icons/angle.png and b/src/PartSet/icons/angle.png differ
diff --git a/src/PartSet/icons/angle_32x32.png b/src/PartSet/icons/angle_32x32.png
new file mode 100644
index 000000000..b4035ef58
Binary files /dev/null and b/src/PartSet/icons/angle_32x32.png differ
diff --git a/src/PartSet/icons/angle_constr.png b/src/PartSet/icons/angle_constr.png
index 0c2fa7b14..e0c46dfa3 100644
Binary files a/src/PartSet/icons/angle_constr.png and b/src/PartSet/icons/angle_constr.png differ
diff --git a/src/PartSet/icons/angle_down.png b/src/PartSet/icons/angle_down.png
index b36410ff2..688699c11 100644
Binary files a/src/PartSet/icons/angle_down.png and b/src/PartSet/icons/angle_down.png differ
diff --git a/src/PartSet/icons/angle_up.png b/src/PartSet/icons/angle_up.png
index 231fb6fd3..c1d244283 100644
Binary files a/src/PartSet/icons/angle_up.png and b/src/PartSet/icons/angle_up.png differ
diff --git a/src/PartSet/icons/angle_up_down_32x32.png b/src/PartSet/icons/angle_up_down_32x32.png
index aeba35ef2..25cb0e556 100644
Binary files a/src/PartSet/icons/angle_up_down_32x32.png and b/src/PartSet/icons/angle_up_down_32x32.png differ
diff --git a/src/PartSet/icons/by_two_points_32x32.png b/src/PartSet/icons/by_two_points_32x32.png
new file mode 100644
index 000000000..5f20fb8b7
Binary files /dev/null and b/src/PartSet/icons/by_two_points_32x32.png differ
diff --git a/src/PartSet/icons/color.png b/src/PartSet/icons/color.png
index 41b0b8ce0..0d4379977 100644
Binary files a/src/PartSet/icons/color.png and b/src/PartSet/icons/color.png differ
diff --git a/src/PartSet/icons/cylindrical_face_32x32.png b/src/PartSet/icons/cylindrical_face_32x32.png
new file mode 100644
index 000000000..e82010154
Binary files /dev/null and b/src/PartSet/icons/cylindrical_face_32x32.png differ
diff --git a/src/PartSet/icons/deactivate.png b/src/PartSet/icons/deactivate.png
index 1b1c71aaa..dcbb46800 100644
Binary files a/src/PartSet/icons/deactivate.png and b/src/PartSet/icons/deactivate.png differ
diff --git a/src/PartSet/icons/dimension_down.png b/src/PartSet/icons/dimension_down.png
index 6ec114918..de5682c71 100644
Binary files a/src/PartSet/icons/dimension_down.png and b/src/PartSet/icons/dimension_down.png differ
diff --git a/src/PartSet/icons/dimension_down_32x32.png b/src/PartSet/icons/dimension_down_32x32.png
index 92be65494..2e56be4d3 100644
Binary files a/src/PartSet/icons/dimension_down_32x32.png and b/src/PartSet/icons/dimension_down_32x32.png differ
diff --git a/src/PartSet/icons/dimension_up.png b/src/PartSet/icons/dimension_up.png
index 44ce168c9..bbd7b1456 100644
Binary files a/src/PartSet/icons/dimension_up.png and b/src/PartSet/icons/dimension_up.png differ
diff --git a/src/PartSet/icons/dimension_v.png b/src/PartSet/icons/dimension_v.png
index 9ad33110b..15e26af43 100644
Binary files a/src/PartSet/icons/dimension_v.png and b/src/PartSet/icons/dimension_v.png differ
diff --git a/src/PartSet/icons/dimension_v_32x32.png b/src/PartSet/icons/dimension_v_32x32.png
index 8b5bf2bd5..a378dd635 100644
Binary files a/src/PartSet/icons/dimension_v_32x32.png and b/src/PartSet/icons/dimension_v_32x32.png differ
diff --git a/src/PartSet/icons/dimension_vert_32x32.png b/src/PartSet/icons/dimension_vert_32x32.png
new file mode 100644
index 000000000..b081893cd
Binary files /dev/null and b/src/PartSet/icons/dimension_vert_32x32.png differ
diff --git a/src/PartSet/icons/edit.png b/src/PartSet/icons/edit.png
index 43a317420..64202ba8a 100644
Binary files a/src/PartSet/icons/edit.png and b/src/PartSet/icons/edit.png differ
diff --git a/src/PartSet/icons/equal.png b/src/PartSet/icons/equal.png
index 281b82307..e8873c0a4 100644
Binary files a/src/PartSet/icons/equal.png and b/src/PartSet/icons/equal.png differ
diff --git a/src/PartSet/icons/extrusion_cut.png b/src/PartSet/icons/extrusion_cut.png
index 86e45167a..3599f6d6d 100644
Binary files a/src/PartSet/icons/extrusion_cut.png and b/src/PartSet/icons/extrusion_cut.png differ
diff --git a/src/PartSet/icons/extrusion_fuse.png b/src/PartSet/icons/extrusion_fuse.png
index 40dcad606..b7cdb38be 100644
Binary files a/src/PartSet/icons/extrusion_fuse.png and b/src/PartSet/icons/extrusion_fuse.png differ
diff --git a/src/PartSet/icons/fillet.png b/src/PartSet/icons/fillet.png
index dfb0be042..c3e77fe2b 100644
Binary files a/src/PartSet/icons/fillet.png and b/src/PartSet/icons/fillet.png differ
diff --git a/src/PartSet/icons/fixed.png b/src/PartSet/icons/fixed.png
index 9e28f362e..d5085325d 100644
Binary files a/src/PartSet/icons/fixed.png and b/src/PartSet/icons/fixed.png differ
diff --git a/src/PartSet/icons/hand_point.png b/src/PartSet/icons/hand_point.png
index 31c4813b0..09c9e1319 100644
Binary files a/src/PartSet/icons/hand_point.png and b/src/PartSet/icons/hand_point.png differ
diff --git a/src/PartSet/icons/horisontal.png b/src/PartSet/icons/horisontal.png
index 5189d3ff8..63ea87d02 100644
Binary files a/src/PartSet/icons/horisontal.png and b/src/PartSet/icons/horisontal.png differ
diff --git a/src/PartSet/icons/length.png b/src/PartSet/icons/length.png
index 77bc8df1a..8bdb113d5 100644
Binary files a/src/PartSet/icons/length.png and b/src/PartSet/icons/length.png differ
diff --git a/src/PartSet/icons/perpendicular.png b/src/PartSet/icons/perpendicular.png
index 20ec9956a..1fb695c6a 100644
Binary files a/src/PartSet/icons/perpendicular.png and b/src/PartSet/icons/perpendicular.png differ
diff --git a/src/PartSet/icons/placement_from.png b/src/PartSet/icons/placement_from.png
index 66706f04b..3ccfd6682 100755
Binary files a/src/PartSet/icons/placement_from.png and b/src/PartSet/icons/placement_from.png differ
diff --git a/src/PartSet/icons/placement_to.png b/src/PartSet/icons/placement_to.png
index 3e715e18f..0faa8c3f5 100755
Binary files a/src/PartSet/icons/placement_to.png and b/src/PartSet/icons/placement_to.png differ
diff --git a/src/PartSet/icons/plane.png b/src/PartSet/icons/plane.png
index ff0a99862..1da328269 100644
Binary files a/src/PartSet/icons/plane.png and b/src/PartSet/icons/plane.png differ
diff --git a/src/PartSet/icons/plane_inverted.png b/src/PartSet/icons/plane_inverted.png
index 60f9b53f3..38577cb93 100644
Binary files a/src/PartSet/icons/plane_inverted.png and b/src/PartSet/icons/plane_inverted.png differ
diff --git a/src/PartSet/icons/plane_inverted_32x32.png b/src/PartSet/icons/plane_inverted_32x32.png
index 57fe92c4c..49f81f8e9 100644
Binary files a/src/PartSet/icons/plane_inverted_32x32.png and b/src/PartSet/icons/plane_inverted_32x32.png differ
diff --git a/src/PartSet/icons/revol_cut.png b/src/PartSet/icons/revol_cut.png
index 6f8582959..a3c0d0e3d 100644
Binary files a/src/PartSet/icons/revol_cut.png and b/src/PartSet/icons/revol_cut.png differ
diff --git a/src/PartSet/icons/revol_fuse.png b/src/PartSet/icons/revol_fuse.png
index 014050784..4bdeb4e68 100644
Binary files a/src/PartSet/icons/revol_fuse.png and b/src/PartSet/icons/revol_fuse.png differ
diff --git a/src/PartSet/icons/rotate.png b/src/PartSet/icons/rotate.png
index 1c71e1903..fd51d76f1 100644
Binary files a/src/PartSet/icons/rotate.png and b/src/PartSet/icons/rotate.png differ
diff --git a/src/PartSet/icons/vertical.png b/src/PartSet/icons/vertical.png
index 0b1e39a27..430386c98 100644
Binary files a/src/PartSet/icons/vertical.png and b/src/PartSet/icons/vertical.png differ
diff --git a/src/XGUI/pictures/arrow.png b/src/XGUI/pictures/arrow.png
index 47cc73d9b..4607a5d23 100644
Binary files a/src/XGUI/pictures/arrow.png and b/src/XGUI/pictures/arrow.png differ
diff --git a/src/XGUI/pictures/assembly.png b/src/XGUI/pictures/assembly.png
index 1b1c71aaa..ab585468c 100644
Binary files a/src/XGUI/pictures/assembly.png and b/src/XGUI/pictures/assembly.png differ
diff --git a/src/XGUI/pictures/box.png b/src/XGUI/pictures/box.png
index 08909e78d..104a1edde 100644
Binary files a/src/XGUI/pictures/box.png and b/src/XGUI/pictures/box.png differ
diff --git a/src/XGUI/pictures/button_cancel.png b/src/XGUI/pictures/button_cancel.png
index e2db55f22..9af30a263 100644
Binary files a/src/XGUI/pictures/button_cancel.png and b/src/XGUI/pictures/button_cancel.png differ
diff --git a/src/XGUI/pictures/button_help.png b/src/XGUI/pictures/button_help.png
index 91a4d590f..1de706166 100644
Binary files a/src/XGUI/pictures/button_help.png and b/src/XGUI/pictures/button_help.png differ
diff --git a/src/XGUI/pictures/button_ok.png b/src/XGUI/pictures/button_ok.png
index 5b0f6a617..ec32fd477 100644
Binary files a/src/XGUI/pictures/button_ok.png and b/src/XGUI/pictures/button_ok.png differ
diff --git a/src/XGUI/pictures/close.png b/src/XGUI/pictures/close.png
index 3868c161d..c8fb7c63e 100644
Binary files a/src/XGUI/pictures/close.png and b/src/XGUI/pictures/close.png differ
diff --git a/src/XGUI/pictures/constr_folder.png b/src/XGUI/pictures/constr_folder.png
index f82b60a9e..818c55b9c 100644
Binary files a/src/XGUI/pictures/constr_folder.png and b/src/XGUI/pictures/constr_folder.png differ
diff --git a/src/XGUI/pictures/constr_object.png b/src/XGUI/pictures/constr_object.png
index dd6dc9851..1c38bf1ac 100644
Binary files a/src/XGUI/pictures/constr_object.png and b/src/XGUI/pictures/constr_object.png differ
diff --git a/src/XGUI/pictures/constr_object_modified.png b/src/XGUI/pictures/constr_object_modified.png
index 966a6c967..9dbd300f5 100644
Binary files a/src/XGUI/pictures/constr_object_modified.png and b/src/XGUI/pictures/constr_object_modified.png differ
diff --git a/src/XGUI/pictures/copy.png b/src/XGUI/pictures/copy.png
index 12968bf76..f244be72c 100644
Binary files a/src/XGUI/pictures/copy.png and b/src/XGUI/pictures/copy.png differ
diff --git a/src/XGUI/pictures/delete.png b/src/XGUI/pictures/delete.png
index 6c6452718..4fb4073b2 100644
Binary files a/src/XGUI/pictures/delete.png and b/src/XGUI/pictures/delete.png differ
diff --git a/src/XGUI/pictures/eye_pencil.png b/src/XGUI/pictures/eye_pencil.png
index 53562dba0..03b8698ca 100644
Binary files a/src/XGUI/pictures/eye_pencil.png and b/src/XGUI/pictures/eye_pencil.png differ
diff --git a/src/XGUI/pictures/eye_pencil_closed.png b/src/XGUI/pictures/eye_pencil_closed.png
index 72931efab..3992a7e46 100644
Binary files a/src/XGUI/pictures/eye_pencil_closed.png and b/src/XGUI/pictures/eye_pencil_closed.png differ
diff --git a/src/XGUI/pictures/features.png b/src/XGUI/pictures/features.png
index eed2b5f2e..e0236ada9 100644
Binary files a/src/XGUI/pictures/features.png and b/src/XGUI/pictures/features.png differ
diff --git a/src/XGUI/pictures/module.png b/src/XGUI/pictures/module.png
index e44a04188..3ab15da11 100644
Binary files a/src/XGUI/pictures/module.png and b/src/XGUI/pictures/module.png differ
diff --git a/src/XGUI/pictures/new.png b/src/XGUI/pictures/new.png
index 2321ace5b..ed25fb5eb 100644
Binary files a/src/XGUI/pictures/new.png and b/src/XGUI/pictures/new.png differ
diff --git a/src/XGUI/pictures/open.png b/src/XGUI/pictures/open.png
index ef7e8d4e5..2358e5fae 100644
Binary files a/src/XGUI/pictures/open.png and b/src/XGUI/pictures/open.png differ
diff --git a/src/XGUI/pictures/params_folder.png b/src/XGUI/pictures/params_folder.png
index 15cae7fdc..153e73e3d 100644
Binary files a/src/XGUI/pictures/params_folder.png and b/src/XGUI/pictures/params_folder.png differ
diff --git a/src/XGUI/pictures/part_ico.png b/src/XGUI/pictures/part_ico.png
index 72434e803..8de064a26 100644
Binary files a/src/XGUI/pictures/part_ico.png and b/src/XGUI/pictures/part_ico.png differ
diff --git a/src/XGUI/pictures/point_ico.png b/src/XGUI/pictures/point_ico.png
index 889c9b77e..db942cb3f 100644
Binary files a/src/XGUI/pictures/point_ico.png and b/src/XGUI/pictures/point_ico.png differ
diff --git a/src/XGUI/pictures/preferences.png b/src/XGUI/pictures/preferences.png
index a5f3308a9..1a08c5661 100644
Binary files a/src/XGUI/pictures/preferences.png and b/src/XGUI/pictures/preferences.png differ
diff --git a/src/XGUI/pictures/properties.png b/src/XGUI/pictures/properties.png
index 62b3bae74..55bf74108 100644
Binary files a/src/XGUI/pictures/properties.png and b/src/XGUI/pictures/properties.png differ
diff --git a/src/XGUI/pictures/rebuild.png b/src/XGUI/pictures/rebuild.png
index 8d4bb27ee..b25f93fa2 100644
Binary files a/src/XGUI/pictures/rebuild.png and b/src/XGUI/pictures/rebuild.png differ
diff --git a/src/XGUI/pictures/redo.png b/src/XGUI/pictures/redo.png
index e60913e19..e3af2c7ee 100644
Binary files a/src/XGUI/pictures/redo.png and b/src/XGUI/pictures/redo.png differ
diff --git a/src/XGUI/pictures/rename_edit.png b/src/XGUI/pictures/rename_edit.png
index 2ba69c328..d09c05e0a 100644
Binary files a/src/XGUI/pictures/rename_edit.png and b/src/XGUI/pictures/rename_edit.png differ
diff --git a/src/XGUI/pictures/save.png b/src/XGUI/pictures/save.png
index a4de28590..9f0df9c83 100644
Binary files a/src/XGUI/pictures/save.png and b/src/XGUI/pictures/save.png differ
diff --git a/src/XGUI/pictures/shading.png b/src/XGUI/pictures/shading.png
index 25ce6c649..0387772b2 100644
Binary files a/src/XGUI/pictures/shading.png and b/src/XGUI/pictures/shading.png differ
diff --git a/src/XGUI/pictures/undo.png b/src/XGUI/pictures/undo.png
index d69af82ce..169e93788 100644
Binary files a/src/XGUI/pictures/undo.png and b/src/XGUI/pictures/undo.png differ
diff --git a/src/XGUI/pictures/view_prefs.png b/src/XGUI/pictures/view_prefs.png
index 9c11769f3..c0400a957 100644
Binary files a/src/XGUI/pictures/view_prefs.png and b/src/XGUI/pictures/view_prefs.png differ
diff --git a/src/XGUI/pictures/wireframe.png b/src/XGUI/pictures/wireframe.png
index 5cd73bd2f..7818b5dcc 100644
Binary files a/src/XGUI/pictures/wireframe.png and b/src/XGUI/pictures/wireframe.png differ
diff --git a/src/XGUI/pictures/x_point.png b/src/XGUI/pictures/x_point.png
index 792304879..b28412fe6 100644
Binary files a/src/XGUI/pictures/x_point.png and b/src/XGUI/pictures/x_point.png differ
diff --git a/src/XGUI/pictures/x_size.png b/src/XGUI/pictures/x_size.png
index d52ed5769..8f292c79e 100644
Binary files a/src/XGUI/pictures/x_size.png and b/src/XGUI/pictures/x_size.png differ
diff --git a/src/XGUI/pictures/y_point.png b/src/XGUI/pictures/y_point.png
index bdba52b88..56fe17f31 100644
Binary files a/src/XGUI/pictures/y_point.png and b/src/XGUI/pictures/y_point.png differ
diff --git a/src/XGUI/pictures/y_size.png b/src/XGUI/pictures/y_size.png
index 44752d4e2..80c294c1c 100644
Binary files a/src/XGUI/pictures/y_size.png and b/src/XGUI/pictures/y_size.png differ
diff --git a/src/XGUI/pictures/z_point.png b/src/XGUI/pictures/z_point.png
index 5bc553d2f..e3315a0de 100644
Binary files a/src/XGUI/pictures/z_point.png and b/src/XGUI/pictures/z_point.png differ
diff --git a/src/XGUI/pictures/z_size.png b/src/XGUI/pictures/z_size.png
index 9a3b480eb..69d673502 100644
Binary files a/src/XGUI/pictures/z_size.png and b/src/XGUI/pictures/z_size.png differ