Merge branch 'master' of newgeom:newgeom

diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index c65485e76cf116e60479afadbaee3702860f6aa5..53d339a23a71308ab48aa25a50330c5b19fb8743 100644 (file)
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -20,5 +20,10 @@
      <file>icons/hand_point.png</file>
      <file>icons/dimension_v.png</file>
      <file>icons/radius.png</file>
+     <file>icons/perpendicular.png</file>
+     <file>icons/parallel.png</file>
+     <file>icons/length.png</file>
+     <file>icons/distance.png</file>
+     <file>icons/radius_constr.png</file>
  </qresource>
  </RCC>

diff --git a/src/PartSet/icons/distance.png b/src/PartSet/icons/distance.png
new file mode 100644 (file)
index 0000000..3d6d740
Binary files /dev/null and b/src/PartSet/icons/distance.png differ

diff --git a/src/PartSet/icons/length.png b/src/PartSet/icons/length.png
new file mode 100644 (file)
index 0000000..41b0b8c
Binary files /dev/null and b/src/PartSet/icons/length.png differ

diff --git a/src/PartSet/icons/parallel.png b/src/PartSet/icons/parallel.png
new file mode 100644 (file)
index 0000000..ef1f899
Binary files /dev/null and b/src/PartSet/icons/parallel.png differ

diff --git a/src/PartSet/icons/perpendicular.png b/src/PartSet/icons/perpendicular.png
new file mode 100644 (file)
index 0000000..8e71d45
Binary files /dev/null and b/src/PartSet/icons/perpendicular.png differ

diff --git a/src/PartSet/icons/radius_constr.png b/src/PartSet/icons/radius_constr.png
new file mode 100644 (file)
index 0000000..81b38f8
Binary files /dev/null and b/src/PartSet/icons/radius_constr.png differ

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index c40bcaffb5ec0e1aff04dc9f539af562e9f4d021..422db10583b24042a633af761c41b5f5e7538872 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -28,7 +28,7 @@
     <group id="Constraints">
       <feature id="SketchConstraintCoincidence" title="Coincident" tooltip="Create constraint for the coincidence of two points" internal="1"/>
 
-      <feature id="SketchConstraintDistance" title="Distance" tooltip="Create constraint for the distance from a point to an object">
+      <feature id="SketchConstraintDistance" title="Distance" tooltip="Create constraint for the distance from a point to an object" icon=":icons/distance.png">
         <label title="Select objects for distance difinition. Following objects can be accepted: point, line end point, line, center of circle or arc."/>
         <feature_or_attribute_selector id="ConstraintEntityA" label="First object" tooltip="Select point, line end point, line, center of circle or arc.">
           <validator id="SketchPlugin_ResultPointValidator"/>
@@ -44,7 +44,7 @@
         <validator id="PartSet_DistanceValidator"/>
       </feature>
       
-      <feature id="SketchConstraintLength" title="Length" tooltip="Create constraint for the given length of a line segment">
+      <feature id="SketchConstraintLength" title="Length" tooltip="Create constraint for the given length of a line segment" icon=":icons/length.png">
         <label title="Select a line on which to calculate lenght" tooltip="Select a line on which to calculate lenght"/>
         <feature_selector id="ConstraintEntityA" label="Line" tooltip="Select an line in the viewer">
           <validator id="SketchPlugin_ResultLineValidator"/>
@@ -54,7 +54,7 @@
         <validator id="PartSet_LengthValidator"/> 
       </feature>
       
-      <feature id="SketchConstraintRadius" title="Radius" tooltip="Create constraint for the given radius of a circle or an arc">
+      <feature id="SketchConstraintRadius" title="Radius" tooltip="Create constraint for the given radius of a circle or an arc" icon=":icons/radius_constr.png">
         <label title="Select a circle or an arc on which to calculate radius" tooltip="Select a circle or an arc on which to calculate radius"/>
         <feature_selector id="ConstraintEntityA" label="Circle or Arc" tooltip="Select a circle or an arc in the viewer">
           <validator id="SketchPlugin_ResultArcValidator"/>
@@ -64,7 +64,7 @@
         <validator id="PartSet_RadiusValidator"/>
       </feature>
       
-      <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines">
+      <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines" icon=":icons/parallel.png">
         <feature_selector id="ConstraintEntityA" label="First line" tooltip="Select an line in the viewer">
           <validator id="SketchPlugin_ResultLineValidator"/>
         </feature_selector>
@@ -75,7 +75,7 @@
         <validator id="PartSet_ParallelValidator"/>
       </feature>
       
-      <feature id="SketchConstraintPerpendicular" title="Perpendicular" tooltip="Create constraint defining two perpendicular lines">
+      <feature id="SketchConstraintPerpendicular" title="Perpendicular" tooltip="Create constraint defining two perpendicular lines" icon=":icons/perpendicular.png">
         <feature_selector id="ConstraintEntityA" label="First line" tooltip="Select an line in the viewer">
           <validator id="SketchPlugin_ResultLineValidator"/>
         </feature_selector>