Merge branch 'master' of newgeom:newgeom

diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index 63e9b6e5e49f22dc03e871a8a354e5c2f5ac0dfd..d0985d40c5d7573a235bb9a03823ae65bdd2bda7 100644 (file)
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -26,5 +26,6 @@
      <file>icons/distance.png</file>
      <file>icons/radius_constr.png</file>
      <file>icons/shape_group.png</file>
+     <file>icons/fixed.png</file>
  </qresource>
  </RCC>

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

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 9bcc261fda21d6bf68b8adb8fc9024938d390f6c..9e212a4fabc9cd972e63e994dd1d87c288cc8685 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -93,7 +93,7 @@
         <validator id="PartSet_PerpendicularValidator"/>
       </feature>
 
-      <feature id="SketchConstraintRigid" title="Rigid" tooltip="Create constraint defining fixed object" icon="">
+      <feature id="SketchConstraintRigid" title="Fixed" tooltip="Create constraint defining fixed object" icon=":icons/fixed.png">
         <feature_selector id="ConstraintEntityA" label="Object" tooltip="Select any object in the viewer">
           <validator id="SketchPlugin_ResultPoint"/>
           <validator id="SketchPlugin_ResultLine"/>