Sketcher: move icons to general subdirectory

src/Mod/Sketcher/Gui/Resources/Sketcher.qrc

@@ -1,19 +1,8 @@
 <RCC>
     <qresource>
-        <file>icons/Sketcher_EditSketch.svg</file>
-        <file>icons/Sketcher_LeaveSketch.svg</file>
-        <file>icons/Sketcher_MapSketch.svg</file>
-        <file>icons/Sketcher_MergeSketch.svg</file>
-        <file>icons/Sketcher_MirrorSketch.svg</file>
-        <file>icons/Sketcher_NewSketch.svg</file>
-        <file alias="icons/preferences-sketcher.svg">icons/Sketcher_NewSketch.svg</file>
-        <file>icons/Sketcher_ReorientSketch.svg</file>
         <file>icons/Sketcher_Sketch.svg</file>
-        <file>icons/Sketcher_SwitchVirtualSpace.svg</file>
-        <file>icons/Sketcher_ValidateSketch.svg</file>
-        <file>icons/Sketcher_ViewSection.svg</file>
-        <file>icons/Sketcher_ViewSketch.svg</file>
         <file>icons/SketcherWorkbench.svg</file>
+        <file alias="icons/preferences-sketcher.svg">icons/SketcherWorkbench.svg</file>
     </qresource>
     <qresource>
         <file>icons/constraints/Constraint_Block.svg</file>
@@ -101,6 +90,19 @@
         <file>icons/elements/Sketcher_Element_Point_StartingPoint.svg</file>
         <file>icons/elements/Sketcher_Element_SelectionTypeInvalid.svg</file>
     </qresource>
+    <qresource>
+        <file>icons/general/Sketcher_EditSketch.svg</file>
+        <file>icons/general/Sketcher_LeaveSketch.svg</file>
+        <file>icons/general/Sketcher_MapSketch.svg</file>
+        <file>icons/general/Sketcher_MergeSketch.svg</file>
+        <file>icons/general/Sketcher_MirrorSketch.svg</file>
+        <file>icons/general/Sketcher_NewSketch.svg</file>
+        <file>icons/general/Sketcher_ReorientSketch.svg</file>
+        <file>icons/general/Sketcher_SwitchVirtualSpace.svg</file>
+        <file>icons/general/Sketcher_ValidateSketch.svg</file>
+        <file>icons/general/Sketcher_ViewSection.svg</file>
+        <file>icons/general/Sketcher_ViewSketch.svg</file>
+    </qresource>
     <qresource>
         <file>icons/geometry/Sketcher_AlterFillet.svg</file>
         <file>icons/geometry/Sketcher_CarbonCopy.svg</file>

src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,123 +6,73 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_Sketch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3776"
-       id="linearGradient3782"
-       x1="33.052631"
-       y1="73.676765"
-       x2="23.483253"
+       gradientUnits="userSpaceOnUse"
        y2="19.131313"
-       gradientUnits="userSpaceOnUse" />
+       x2="23.483253"
+       y1="73.676765"
+       x1="33.052631"
+       id="linearGradient3782"
+       xlink:href="#linearGradient3776" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3776">
       <stop
-         style="stop-color:#cc0000;stop-opacity:1"
+         id="stop3778"
          offset="0"
-         id="stop3778" />
+         style="stop-color:#cc0000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3780"
          offset="1"
-         id="stop3780" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.990838"
-     inkscape:cx="-4.9094178"
-     inkscape:cy="23.134328"
-     inkscape:current-layer="g3360-3"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -133,7 +81,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
@@ -163,55 +111,37 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3360"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-       inkscape:export-xdpi="3.2478156"
-       inkscape:export-ydpi="3.2478156"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <g
-         id="g3360-3"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-ydpi="3.2478156"
-         transform="translate(-2.96179e-7,2.9614273e-6)">
+         transform="translate(-2.96179e-7,2.9614273e-6)"
+         id="g3360-3">
         <rect
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86403656000000240;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           y="1168.7546"
+           x="907.65808"
+           height="248.5629"
+           width="277.8056"
            id="rect3860-36"
-           width="277.8056"
-           height="248.5629"
-           x="907.65808"
-           y="1168.7546" />
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86403656000000240;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:5.89896058999999973;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="matrix(7.6396543,0,0,7.2375671,932.95299,913.31967)"
+           d="M 48.363636,33.272728 A 18.181818,18.181818 0 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z"
            id="path3862-7"
-           sodipodi:cx="30.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:rx="18.181818"
-           sodipodi:ry="18.181818"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           transform="matrix(7.6396543,0,0,7.2375671,932.95299,913.31967)" />
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:5.89896058999999973;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <rect
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134743000000014;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect3860-3"
-           width="277.8056"
-           height="248.5629"
+           y="1168.7546"
            x="907.65808"
-           y="1168.7546" />
+           height="248.5629"
+           width="277.8056"
+           id="rect3860-3"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134743000000014;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:1.96632027999999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="matrix(7.6396539,0,0,7.237567,932.95301,913.31967)"
+           d="M 48.363636,33.272728 A 18.181818,18.181818 0 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z"
            id="path3862-6"
-           sodipodi:cx="30.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:rx="18.181818"
-           sodipodi:ry="18.181818"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           transform="matrix(7.6396539,0,0,7.237567,932.95301,913.31967)" />
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:1.96632027999999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
     </g>
   </g>

src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg

@@ -6,7 +6,7 @@
     <circle cx="7" cy="41" r="5" />
     <circle cx="38" cy="38" r="5" />
   </g>
-  <g id="crosshair" style="stroke:#eeeeec;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;"> 
+  <g id="crosshair" style="stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;"> 
     <path d="m16,3v9m0,8v9m-13-13h9m8,0h9" />
   </g>
 </svg>

src/Mod/Sketcher/InitGui.py

@@ -44,6 +44,7 @@ class SketcherWorkbench ( Workbench ):
         import Sketcher
         Gui.addIconPath(":/icons/constraints")
         Gui.addIconPath(":/icons/elements")
+        Gui.addIconPath(":/icons/general")
         Gui.addIconPath(":/icons/geometry")
         # Gui.addIconPath(":/icons/obsolete")
         Gui.addIconPath(":/icons/pointers")