]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Update of pictures by ABA
authormpv <mpv@opencascade.com>
Wed, 9 Sep 2015 13:01:43 +0000 (16:01 +0300)
committermpv <mpv@opencascade.com>
Wed, 9 Sep 2015 13:01:43 +0000 (16:01 +0300)
81 files changed:
src/ConstructionPlugin/axis_widget.xml
src/FeaturesPlugin/extrusion_widget.xml
src/FeaturesPlugin/extrusioncut_widget.xml
src/FeaturesPlugin/extrusionfuse_widget.xml
src/FeaturesPlugin/revolution_widget.xml
src/FeaturesPlugin/revolutioncut_widget.xml
src/FeaturesPlugin/revolutionfuse_widget.xml
src/PartSet/PartSet_icons.qrc
src/PartSet/icons/activate.png
src/PartSet/icons/angle.png
src/PartSet/icons/angle_32x32.png [new file with mode: 0644]
src/PartSet/icons/angle_constr.png
src/PartSet/icons/angle_down.png
src/PartSet/icons/angle_up.png
src/PartSet/icons/angle_up_down_32x32.png
src/PartSet/icons/by_two_points_32x32.png [new file with mode: 0644]
src/PartSet/icons/color.png
src/PartSet/icons/cylindrical_face_32x32.png [new file with mode: 0644]
src/PartSet/icons/deactivate.png
src/PartSet/icons/dimension_down.png
src/PartSet/icons/dimension_down_32x32.png
src/PartSet/icons/dimension_up.png
src/PartSet/icons/dimension_v.png
src/PartSet/icons/dimension_v_32x32.png
src/PartSet/icons/dimension_vert_32x32.png [new file with mode: 0644]
src/PartSet/icons/edit.png
src/PartSet/icons/equal.png
src/PartSet/icons/extrusion_cut.png
src/PartSet/icons/extrusion_fuse.png
src/PartSet/icons/fillet.png
src/PartSet/icons/fixed.png
src/PartSet/icons/hand_point.png
src/PartSet/icons/horisontal.png
src/PartSet/icons/length.png
src/PartSet/icons/perpendicular.png
src/PartSet/icons/placement_from.png
src/PartSet/icons/placement_to.png
src/PartSet/icons/plane.png
src/PartSet/icons/plane_inverted.png
src/PartSet/icons/plane_inverted_32x32.png
src/PartSet/icons/revol_cut.png
src/PartSet/icons/revol_fuse.png
src/PartSet/icons/rotate.png
src/PartSet/icons/vertical.png
src/XGUI/pictures/arrow.png
src/XGUI/pictures/assembly.png
src/XGUI/pictures/box.png
src/XGUI/pictures/button_cancel.png
src/XGUI/pictures/button_help.png
src/XGUI/pictures/button_ok.png
src/XGUI/pictures/close.png
src/XGUI/pictures/constr_folder.png
src/XGUI/pictures/constr_object.png
src/XGUI/pictures/constr_object_modified.png
src/XGUI/pictures/copy.png
src/XGUI/pictures/delete.png
src/XGUI/pictures/eye_pencil.png
src/XGUI/pictures/eye_pencil_closed.png
src/XGUI/pictures/features.png
src/XGUI/pictures/module.png
src/XGUI/pictures/new.png
src/XGUI/pictures/open.png
src/XGUI/pictures/params_folder.png
src/XGUI/pictures/part_ico.png
src/XGUI/pictures/point_ico.png
src/XGUI/pictures/preferences.png
src/XGUI/pictures/properties.png
src/XGUI/pictures/rebuild.png
src/XGUI/pictures/redo.png
src/XGUI/pictures/rename_edit.png
src/XGUI/pictures/save.png
src/XGUI/pictures/shading.png
src/XGUI/pictures/undo.png
src/XGUI/pictures/view_prefs.png
src/XGUI/pictures/wireframe.png
src/XGUI/pictures/x_point.png
src/XGUI/pictures/x_size.png
src/XGUI/pictures/y_point.png
src/XGUI/pictures/y_size.png
src/XGUI/pictures/z_point.png
src/XGUI/pictures/z_size.png

index 74284b8d5d8c0f7febd0e09b9324a42cc96aaf15..4f59a43380b96269bfd4cd6ddbebcf489a2a7471 100644 (file)
@@ -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"/>
         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"/>
index a21ebedb1771a62e6ac0cbbc49d511a56d389bfd..dc01cc62065bba5f96b2952f863e164fadf4b449 100644 (file)
@@ -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>
index fbfb40f5f22f5b2776175ce32a850b6e27f407f5..c2a006dabfcfe061e97577c98194e72e2f0f0332 100755 (executable)
@@ -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>
index d1805d94fca0452a2d619ee6745073637bfca7b9..90452e2ca7ecc440f2689ad8575f59edb04588c0 100644 (file)
@@ -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>
index acece541af68b535894311ab9c0820fba75a512a..d034c265942a5802a4776bc3b034b7e3ecc39dd1 100644 (file)
@@ -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>
index 6a9bc063e149c4c293e761f50340c3b1382fef1b..189efa4dbb6c80c90ef9e46772c31e6ce4e6ad4b 100644 (file)
@@ -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>
index d211d9b5665faced9ebd795afd84d7b511376a21..cbdcae1b2ac3401a00e6a8ee2def938488c697d2 100644 (file)
@@ -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>
index 8b287c6f80e01c1be25bbbb7ffbc1866cf983701..7bcc40afc6a184cd5cd9828edcaf22c04719dde8 100644 (file)
@@ -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>
index f82917927bcb5c36b85115d7da7dc3630e088ff7..26b66a3abc4ee70fcda174bc656ab1b47c9d7bc8 100644 (file)
Binary files a/src/PartSet/icons/activate.png and b/src/PartSet/icons/activate.png differ
index b64d5148fc8e3376d68d762c2c35332539f6be5f..e401acd67fd22b2edacd3b53e3dc9c6c8a0c1469 100644 (file)
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 (file)
index 0000000..b4035ef
Binary files /dev/null and b/src/PartSet/icons/angle_32x32.png differ
index 0c2fa7b141f0b3a7e92c5069587ee917bb41d64d..e0c46dfa317490ac1fb0c7df309d942e3e7d3e00 100644 (file)
Binary files a/src/PartSet/icons/angle_constr.png and b/src/PartSet/icons/angle_constr.png differ
index b36410ff2fd63aab5f967180f822d35b84c3e164..688699c1181814102cedbd155d953951eb629155 100644 (file)
Binary files a/src/PartSet/icons/angle_down.png and b/src/PartSet/icons/angle_down.png differ
index 231fb6fd319db353afd6cb06313f3550703c8f0a..c1d24428374fda87ce325223f7aaf47d62d520df 100644 (file)
Binary files a/src/PartSet/icons/angle_up.png and b/src/PartSet/icons/angle_up.png differ
index aeba35ef2d1e1c2898ea444e26ff1439d153d36d..25cb0e556537ea8c046e492a7008a34ca54940d8 100644 (file)
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 (file)
index 0000000..5f20fb8
Binary files /dev/null and b/src/PartSet/icons/by_two_points_32x32.png differ
index 41b0b8ce043f76933c303edb1048aabd68098fa5..0d437997758a52fa75d103d883329a60589b276b 100644 (file)
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 (file)
index 0000000..e820101
Binary files /dev/null and b/src/PartSet/icons/cylindrical_face_32x32.png differ
index 1b1c71aaab5fc2c7286a760425375636253e8067..dcbb468009319de8e36d1f0c23a639d046e2c665 100644 (file)
Binary files a/src/PartSet/icons/deactivate.png and b/src/PartSet/icons/deactivate.png differ
index 6ec114918a1415cb21af6b6ac57451d1a48bbaa9..de5682c711ded6ef5763bc76332740d2fdebb43d 100644 (file)
Binary files a/src/PartSet/icons/dimension_down.png and b/src/PartSet/icons/dimension_down.png differ
index 92be6549443b8825206e10f3c064aa7b830f73f8..2e56be4d3e15c3a98718273b6a3784ac69faa942 100644 (file)
Binary files a/src/PartSet/icons/dimension_down_32x32.png and b/src/PartSet/icons/dimension_down_32x32.png differ
index 44ce168c9cafcf8323186f9929d5857aab4102c0..bbd7b145695da71656957462af76afa91eab6555 100644 (file)
Binary files a/src/PartSet/icons/dimension_up.png and b/src/PartSet/icons/dimension_up.png differ
index 9ad33110b0a250958466805cb8650acf393b6d0f..15e26af4313c0a134b25b792ee7ba0ba65eb6b17 100644 (file)
Binary files a/src/PartSet/icons/dimension_v.png and b/src/PartSet/icons/dimension_v.png differ
index 8b5bf2bd55f3b89e7007bcbdaa0aa2fdfa94e549..a378dd635b0d675e9f33a6116554ad1005af2bc7 100644 (file)
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 (file)
index 0000000..b081893
Binary files /dev/null and b/src/PartSet/icons/dimension_vert_32x32.png differ
index 43a31742074f2e6de3ef29126e3129afc34bdd60..64202ba8a963181c23069b3f18266a6dc9d44205 100644 (file)
Binary files a/src/PartSet/icons/edit.png and b/src/PartSet/icons/edit.png differ
index 281b82307343c00adbd07f21b35e217ac0694020..e8873c0a40859d715e2d0126e92650b0504d8e94 100644 (file)
Binary files a/src/PartSet/icons/equal.png and b/src/PartSet/icons/equal.png differ
index 86e45167a3419d7094d3a63b31783af1acdd2951..3599f6d6df548feb6477b68958f19114af29f36e 100644 (file)
Binary files a/src/PartSet/icons/extrusion_cut.png and b/src/PartSet/icons/extrusion_cut.png differ
index 40dcad6067ad47a13d63b31b44d8df0dcb0f6bb0..b7cdb38be9f6cb56f6ed5d0325b728c3b05f8484 100644 (file)
Binary files a/src/PartSet/icons/extrusion_fuse.png and b/src/PartSet/icons/extrusion_fuse.png differ
index dfb0be042a31afc4734c38d020fed80670097cf9..c3e77fe2bf7f07f57162b6629a7d319f43372120 100644 (file)
Binary files a/src/PartSet/icons/fillet.png and b/src/PartSet/icons/fillet.png differ
index 9e28f362ecb41108c2fae4568871f4eaaa9fb32b..d5085325d296b00107312c66feac259e22bcbd55 100644 (file)
Binary files a/src/PartSet/icons/fixed.png and b/src/PartSet/icons/fixed.png differ
index 31c4813b0caf051de8a06e894c1484f26de950e2..09c9e13190e3da6dc0ab3bc23f3defef1c06b843 100644 (file)
Binary files a/src/PartSet/icons/hand_point.png and b/src/PartSet/icons/hand_point.png differ
index 5189d3ff8f15dc768b9c23534286a30e0d8a848d..63ea87d02f9834a91f3082d75b665ab139e82633 100644 (file)
Binary files a/src/PartSet/icons/horisontal.png and b/src/PartSet/icons/horisontal.png differ
index 77bc8df1ad3139fc4293aef6ebd40349276d3015..8bdb113d5f7026eaf57d3e2320c67a2ec9346a3b 100644 (file)
Binary files a/src/PartSet/icons/length.png and b/src/PartSet/icons/length.png differ
index 20ec9956a2b647ca5b58dacfa73712c2b69f5d0c..1fb695c6a37c182b53552d4a4799fe46302bbc99 100644 (file)
Binary files a/src/PartSet/icons/perpendicular.png and b/src/PartSet/icons/perpendicular.png differ
index 66706f04b3291750c104807c01335f1a1ed4e566..3ccfd6682439f6a58dc165a56bbed9d86de313a4 100755 (executable)
Binary files a/src/PartSet/icons/placement_from.png and b/src/PartSet/icons/placement_from.png differ
index 3e715e18f9c29a817d863ea303c43e53f9947d3b..0faa8c3f5d87885f27031ea62b5772a6cfa16405 100755 (executable)
Binary files a/src/PartSet/icons/placement_to.png and b/src/PartSet/icons/placement_to.png differ
index ff0a998621a5b6583128f383ca8b188ff7f1285d..1da328269e926fdcbc68da3f782a8508732600c7 100644 (file)
Binary files a/src/PartSet/icons/plane.png and b/src/PartSet/icons/plane.png differ
index 60f9b53f30a0ca5f81605079a8ff2e298bb50fce..38577cb93efcd99dfd02ef98079fea4686110da5 100644 (file)
Binary files a/src/PartSet/icons/plane_inverted.png and b/src/PartSet/icons/plane_inverted.png differ
index 57fe92c4c2ea789904127442955cfb1c0311f7b9..49f81f8e9b126bf6f81590621c8181ada16341c0 100644 (file)
Binary files a/src/PartSet/icons/plane_inverted_32x32.png and b/src/PartSet/icons/plane_inverted_32x32.png differ
index 6f858295939dcee50d3ba3508d304fdfb631e163..a3c0d0e3d6148a6e8f80b2ef9d1f100eedd820a2 100644 (file)
Binary files a/src/PartSet/icons/revol_cut.png and b/src/PartSet/icons/revol_cut.png differ
index 014050784636901e8ddfc49ef760a7b50b2a06b0..4bdeb4e68c622ee87c601977bd93f0e1504cfd3a 100644 (file)
Binary files a/src/PartSet/icons/revol_fuse.png and b/src/PartSet/icons/revol_fuse.png differ
index 1c71e19035a8db118b962f00d434f086fa33cc30..fd51d76f1db4a50de3309684e1b5b61aeca0c3bc 100644 (file)
Binary files a/src/PartSet/icons/rotate.png and b/src/PartSet/icons/rotate.png differ
index 0b1e39a27dda580b5d4e7d61aa84a256b600967b..430386c98c773958a0553444af5b0bf0146e4a56 100644 (file)
Binary files a/src/PartSet/icons/vertical.png and b/src/PartSet/icons/vertical.png differ
index 47cc73d9b02a2e0f9949f9a7380a84ff743aa818..4607a5d239cfd61a3b3013528e51846741fddaec 100644 (file)
Binary files a/src/XGUI/pictures/arrow.png and b/src/XGUI/pictures/arrow.png differ
index 1b1c71aaab5fc2c7286a760425375636253e8067..ab585468c72e11ca2bb66208c418fd1d528acdeb 100644 (file)
Binary files a/src/XGUI/pictures/assembly.png and b/src/XGUI/pictures/assembly.png differ
index 08909e78dd4b8ac6d96f070942731d2e0024280e..104a1edde755dae03a8348b40b4667b0e70d860c 100644 (file)
Binary files a/src/XGUI/pictures/box.png and b/src/XGUI/pictures/box.png differ
index e2db55f22d6752e10a57f07e286081ebebacfea5..9af30a263bde0663be5846fcc348b5c830ab8dfe 100644 (file)
Binary files a/src/XGUI/pictures/button_cancel.png and b/src/XGUI/pictures/button_cancel.png differ
index 91a4d590f8e67827d3b18d2cee2086ca3c070c1b..1de7061667dda0a865ae032ddb1216c3ece02392 100644 (file)
Binary files a/src/XGUI/pictures/button_help.png and b/src/XGUI/pictures/button_help.png differ
index 5b0f6a6174f67879d89b8c970d88734cd6f9f844..ec32fd477fe57a73abdcbe41eb4bcd4f2482ba8a 100644 (file)
Binary files a/src/XGUI/pictures/button_ok.png and b/src/XGUI/pictures/button_ok.png differ
index 3868c161df8e4dff9d6db073905c4a5e54441a50..c8fb7c63ec58792874fa898d0aa361ef0159b3fb 100644 (file)
Binary files a/src/XGUI/pictures/close.png and b/src/XGUI/pictures/close.png differ
index f82b60a9ea4b995041416ba2739607afa371ab40..818c55b9c45a73713944a2329e2b5f200cea026c 100644 (file)
Binary files a/src/XGUI/pictures/constr_folder.png and b/src/XGUI/pictures/constr_folder.png differ
index dd6dc98512fec7057f560779fc6f852efbb99c47..1c38bf1acb9d9885fef1cf21f6fc22c78abb52d3 100644 (file)
Binary files a/src/XGUI/pictures/constr_object.png and b/src/XGUI/pictures/constr_object.png differ
index 966a6c9676806de163001eb45b3e9aadfcc3d4a4..9dbd300f53d32ba2228ca1fbd0a53d2c7adcfda5 100644 (file)
Binary files a/src/XGUI/pictures/constr_object_modified.png and b/src/XGUI/pictures/constr_object_modified.png differ
index 12968bf76c909fc6c281f6765b94b94a382ad44f..f244be72c826cafd1824c379fce92811a64fbcd4 100644 (file)
Binary files a/src/XGUI/pictures/copy.png and b/src/XGUI/pictures/copy.png differ
index 6c6452718ed23f8db5812a67c516004bf61a8e61..4fb4073b21c1f2134880dead42d02337917a8e22 100644 (file)
Binary files a/src/XGUI/pictures/delete.png and b/src/XGUI/pictures/delete.png differ
index 53562dba0a712f9c5b5ea487d2838f82dcb6707c..03b8698caea3fdce792809cf065ace05e4c9bf01 100644 (file)
Binary files a/src/XGUI/pictures/eye_pencil.png and b/src/XGUI/pictures/eye_pencil.png differ
index 72931efab3b172089109d3dff29b833853013f30..3992a7e4658138b917dedc51f6b137ae415a24d7 100644 (file)
Binary files a/src/XGUI/pictures/eye_pencil_closed.png and b/src/XGUI/pictures/eye_pencil_closed.png differ
index eed2b5f2e873390a3beeafa23e75ca0bce23c5f6..e0236ada985a8fd4e257a23035ac55366da6dafc 100644 (file)
Binary files a/src/XGUI/pictures/features.png and b/src/XGUI/pictures/features.png differ
index e44a0418805bd4d468a6e26bd3e95c6f3616cd8b..3ab15da11635b36f8d2b1539ecd33c39a4567215 100644 (file)
Binary files a/src/XGUI/pictures/module.png and b/src/XGUI/pictures/module.png differ
index 2321ace5b8f00f8fe5fde8bbee482174676627d0..ed25fb5eb7e4e7c244f7ec5862a532eff0684a34 100644 (file)
Binary files a/src/XGUI/pictures/new.png and b/src/XGUI/pictures/new.png differ
index ef7e8d4e5742e44a8c449eb831f281317c7ce45e..2358e5fae9e48a5a0f9588cb6d7de0fc7c51a5d5 100644 (file)
Binary files a/src/XGUI/pictures/open.png and b/src/XGUI/pictures/open.png differ
index 15cae7fdc0bbb616cdc134bd8e0ec317765319ab..153e73e3d243f644b9af51dbe72a0d7f7baabcbc 100644 (file)
Binary files a/src/XGUI/pictures/params_folder.png and b/src/XGUI/pictures/params_folder.png differ
index 72434e8033bab7e2f9b929d2e38a784f4ff8680e..8de064a26993c29947b328e220d674a2c1f84bc4 100644 (file)
Binary files a/src/XGUI/pictures/part_ico.png and b/src/XGUI/pictures/part_ico.png differ
index 889c9b77e9af2f7170424b8f2059b3362df20ac4..db942cb3f867e492305976905284dcff11ae3cbd 100644 (file)
Binary files a/src/XGUI/pictures/point_ico.png and b/src/XGUI/pictures/point_ico.png differ
index a5f3308a90a2e21ff79c454a32e24b4fc1156ba7..1a08c56619df723b98ab07fdb1e51f62933ef646 100644 (file)
Binary files a/src/XGUI/pictures/preferences.png and b/src/XGUI/pictures/preferences.png differ
index 62b3bae74174829424cbdef5c4148086d3099448..55bf741081e0b630e3cd8a8d5aeb9bec2a88cd9d 100644 (file)
Binary files a/src/XGUI/pictures/properties.png and b/src/XGUI/pictures/properties.png differ
index 8d4bb27ee7c75a45ca56b6c7013516ebeeb98094..b25f93fa2f10d4d003297db78e9711689357f472 100644 (file)
Binary files a/src/XGUI/pictures/rebuild.png and b/src/XGUI/pictures/rebuild.png differ
index e60913e19ffc665f512f7d72d48a001ad598704a..e3af2c7ee7fe3e4b51a793b369955d2e6ad2e006 100644 (file)
Binary files a/src/XGUI/pictures/redo.png and b/src/XGUI/pictures/redo.png differ
index 2ba69c3283c8393510b27a140881888a6b738783..d09c05e0a6d53940ffceb2d1c72fd5175b547e13 100644 (file)
Binary files a/src/XGUI/pictures/rename_edit.png and b/src/XGUI/pictures/rename_edit.png differ
index a4de2859055b4fb38ed1e60d5c64d2a29f601536..9f0df9c83445c0434c21bdc7ef35199a3ac6e508 100644 (file)
Binary files a/src/XGUI/pictures/save.png and b/src/XGUI/pictures/save.png differ
index 25ce6c649ca893612cfbb1f20a99cee8eaf8fa81..0387772b2e2c262d3e28f8f20a447c89e2a0a55a 100644 (file)
Binary files a/src/XGUI/pictures/shading.png and b/src/XGUI/pictures/shading.png differ
index d69af82cebe067c3e386f16b453b0052c9276f91..169e937889e65e7f8ab819aaf3164a494430be43 100644 (file)
Binary files a/src/XGUI/pictures/undo.png and b/src/XGUI/pictures/undo.png differ
index 9c11769f3ba35403ac644feb7f72c625f5f5eb5a..c0400a957ffb49682a3625ad41d1f8cb1e40944e 100644 (file)
Binary files a/src/XGUI/pictures/view_prefs.png and b/src/XGUI/pictures/view_prefs.png differ
index 5cd73bd2fda580096b57f3edbe0bb7d21d68b0d5..7818b5dcce4afe8022efae641e389a6021b9ed6b 100644 (file)
Binary files a/src/XGUI/pictures/wireframe.png and b/src/XGUI/pictures/wireframe.png differ
index 792304879c9c8865157ef8940bcfc0c9b161fed3..b28412fe6450376a15bf118eb785b787e28bf787 100644 (file)
Binary files a/src/XGUI/pictures/x_point.png and b/src/XGUI/pictures/x_point.png differ
index d52ed576973a6baf9fd23a068bc5015b8c4c67c3..8f292c79ea75a6a99b29fbe22cb44cacb17279d6 100644 (file)
Binary files a/src/XGUI/pictures/x_size.png and b/src/XGUI/pictures/x_size.png differ
index bdba52b88559795b99ad1fc6bd66fc2494e29b32..56fe17f318f483f5964c5cff8f117de3595983f3 100644 (file)
Binary files a/src/XGUI/pictures/y_point.png and b/src/XGUI/pictures/y_point.png differ
index 44752d4e2ff74da3245a780b4671e6e450f29c8b..80c294c1cb45ad0c2a42ac2672a74b796ce5fd77 100644 (file)
Binary files a/src/XGUI/pictures/y_size.png and b/src/XGUI/pictures/y_size.png differ
index 5bc553d2f0e24ee40b68218cfb2f8ae1cc497b99..e3315a0deca911417fc995c62da2b0d73347c366 100644 (file)
Binary files a/src/XGUI/pictures/z_point.png and b/src/XGUI/pictures/z_point.png differ
index 9a3b480ebe81c58918eb9c08f92c8e89fdaa3ae1..69d673502c71530f1a8a63c2eb4b7871a8e297a2 100644 (file)
Binary files a/src/XGUI/pictures/z_size.png and b/src/XGUI/pictures/z_size.png differ