diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2009-01-10 22:21:59 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2009-01-10 22:21:59 +0000 |
| commit | 43e79a060f82609db18b84c7db1c60f638e2ac8c (patch) | |
| tree | 7207ebfa250a6817ca6e020225049af2902cb732 | |
| parent | Fixes rendering of feImage (using bitmaps) by preventing the error "Unable to... (diff) | |
| download | inkscape-43e79a060f82609db18b84c7db1c60f638e2ac8c.tar.gz inkscape-43e79a060f82609db18b84c7db1c60f638e2ac8c.zip | |
Added a new toolbar with snapping controls
(bzr r7107)
| -rw-r--r-- | share/icons/icons.svg | 310 | ||||
| -rw-r--r-- | share/keys/default.xml | 4 | ||||
| -rw-r--r-- | share/keys/inkscape.xml | 4 | ||||
| -rw-r--r-- | src/desktop.cpp | 8 | ||||
| -rw-r--r-- | src/desktop.h | 2 | ||||
| -rw-r--r-- | src/ink-action.cpp | 7 | ||||
| -rw-r--r-- | src/ink-action.h | 4 | ||||
| -rw-r--r-- | src/interface.cpp | 32 | ||||
| -rw-r--r-- | src/menus-skeleton.h | 2 | ||||
| -rw-r--r-- | src/preferences-skeleton.h | 5 | ||||
| -rw-r--r-- | src/sp-shape.cpp | 10 | ||||
| -rw-r--r-- | src/verbs.cpp | 14 | ||||
| -rw-r--r-- | src/verbs.h | 2 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 14 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.h | 2 | ||||
| -rw-r--r-- | src/widgets/select-toolbar.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 440 | ||||
| -rw-r--r-- | src/widgets/toolbox.h | 5 |
18 files changed, 726 insertions, 143 deletions
diff --git a/share/icons/icons.svg b/share/icons/icons.svg index 527bcb991..297e9aa1d 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 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" inkscape:version="0.46+devel" sodipodi:docname="icons.svg" height="1000.0000pt" width="1000.0000pt" sodipodi:version="0.32" id="svg1" inkscape:output_extension="org.inkscape.output.svg.inkscape"> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 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" inkscape:version="0.46+devel" sodipodi:docname="my-icons.svg" height="1000.0000pt" width="1000.0000pt" sodipodi:version="0.32" id="svg1" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs3"> +<inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 625 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1250 : 625 : 1" inkscape:persp3d-origin="625 : 416.6667 : 1" id="perspective8072" /> <linearGradient inkscape:collect="always" id="linearGradient7836"> <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop7838" /> <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop7840" /> @@ -646,9 +647,65 @@ <radialGradient inkscape:collect="always" xlink:href="#linearGradient7828" id="radialGradient7834" cx="375.0941" cy="137.9821" fx="375.0941" fy="137.9821" r="1.111868" gradientUnits="userSpaceOnUse" /> <radialGradient inkscape:collect="always" xlink:href="#linearGradient7836" id="radialGradient7842" cx="375.0941" cy="137.9821" fx="375.0941" fy="137.9821" r="1.111868" gradientUnits="userSpaceOnUse" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5663" id="linearGradient5376" gradientUnits="userSpaceOnUse" x1="872" y1="66" x2="865.5" y2="57.5" gradientTransform="translate(20,0)" /> +<inkscape:perspective id="perspective5387" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective8878" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective8878-9" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective8909" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective8909-3" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective8950" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective8996" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective9031" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective9053" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective9075" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective9105" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective9127" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective5445" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6244" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6266" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6288" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6318" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6339" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6361" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6383" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6405" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6427" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6449" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6471" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6493" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6517" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6540" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6561" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6228" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6254" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6282" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6304" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6344" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6366" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6390" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6412" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6412-4" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6452" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<linearGradient inkscape:collect="always" xlink:href="#linearGradient2485-9" id="linearGradient4005-8" x1="61.44776" y1="236.4112" x2="64.5183" y2="240.354" gradientUnits="userSpaceOnUse" /> +<linearGradient id="linearGradient2485-9"> +<stop id="stop2486-3" offset="0.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000" /> +<stop id="stop2487-1" offset="1.0000000" style="stop-color:#aaaaaa;stop-opacity:1.0000000;" /> +</linearGradient> +<linearGradient inkscape:collect="always" xlink:href="#linearGradient3480-8" id="linearGradient4080-4" x1="59" y1="235.1341" x2="62.5" y2="239.4902" gradientUnits="userSpaceOnUse" /> +<linearGradient id="linearGradient3480-8"> +<stop id="stop3482-9" offset="0.0000000" style="stop-color:#646464;stop-opacity:1.0000000;" /> +<stop id="stop3484-6" offset="1.0000000" style="stop-color:#000000;stop-opacity:1.0000000;" /> +</linearGradient> +<linearGradient gradientTransform="matrix(1.743698,0,0,1.75,717.0189,-377.6785)" y2="240.354" x2="64.5183" y1="236.4112" x1="61.44776" gradientUnits="userSpaceOnUse" id="linearGradient6465" xlink:href="#linearGradient2485-9" inkscape:collect="always" /> +<linearGradient gradientTransform="matrix(1.743698,0,0,1.75,717.0189,-377.6785)" y2="239.4902" x2="62.5" y1="235.1341" x1="59" gradientUnits="userSpaceOnUse" id="linearGradient6467" xlink:href="#linearGradient3480-8" inkscape:collect="always" /> +<inkscape:perspective id="perspective6508" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6557" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6589" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6611" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6654" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> +<inkscape:perspective id="perspective6676" inkscape:persp3d-origin="0.5 : 0.3333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> </defs> -<sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="svg1" inkscape:grid-bbox="true" inkscape:pageopacity="1.0000000" pagecolor="#e8e8e4" snaptoguides="true" showguides="true" inkscape:window-y="0" inkscape:window-x="0" inkscape:window-height="1000" inkscape:window-width="1225" inkscape:cy="1039.679" inkscape:cx="203.3736" inkscape:zoom="5.492948" gridtolerance="6" snaptogrid="false" showgrid="true" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="8" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="true" objecttolerance="11" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:bbox-nodes="true" inkscape:bbox-paths="true" inkscape:snap-global="true"> -<inkscape:grid type="xygrid" id="grid9252" originx="0px" originy="0px" spacingx="0.5px" spacingy="0.5px" empspacing="2" visible="true" enabled="false" /> +<sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="svg1" inkscape:grid-bbox="true" inkscape:pageopacity="1.0000000" pagecolor="#e8e8e4" snaptoguides="true" showguides="true" inkscape:window-y="24" inkscape:window-x="0" inkscape:window-height="1129" inkscape:window-width="1920" inkscape:cy="1176.017" inkscape:cx="722.4667" inkscape:zoom="3.884101" gridtolerance="6" snaptogrid="false" showgrid="false" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="8" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="false" objecttolerance="11" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:bbox-nodes="true" inkscape:bbox-paths="true" inkscape:snap-global="true" inkscape:snap-center="true" inkscape:snap-midpoints="true" inkscape:snap-intersection-paths="true" inkscape:object-paths="true"> +<inkscape:grid type="xygrid" id="grid9252" originx="0px" originy="0px" spacingx="0.5px" spacingy="0.5px" empspacing="2" visible="true" enabled="true" /> <sodipodi:guide orientation="0,1" position="630.08101,968.02815" id="guide4946" /> <sodipodi:guide orientation="0,1" position="618.47896,943.93157" id="guide4948" /> </sodipodi:namedview> @@ -670,7 +727,7 @@ http://www.inkscape.org/</dc:description> <dc:title>Inkscape Developers</dc:title> </cc:Agent> </dc:rights> -<dc:title>Icon Sheet</dc:title> +<dc:title /> </cc:Work> <cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" /> @@ -778,14 +835,14 @@ http://www.inkscape.org/</dc:description> </g> <g id="draw_arc" transform="translate(340,-4.960901)"> <rect y="150" x="110" height="24" width="24" id="rect3417" style="color:#000000;fill:none;stroke:none;stroke-width:1.0000001;marker:none;display:inline" /> -<path transform="matrix(0.795464,0,0,0.798577,24.99896,32.67435)" d="M 134,162 C 134,168.624 128.624,174 122,174 115.376,174 110,168.624 110,162 110,155.376 115.376,150 122,150 128.624,150 134,155.376 134,162 z" sodipodi:ry="12" sodipodi:rx="12" sodipodi:cy="162" sodipodi:cx="122" id="draw_arc1" style="color:#000000;fill:none;stroke:url(#linearGradient6574);stroke-width:1.2546769;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> -<path transform="matrix(0.707159,0,0,0.70714,35.77206,47.44802)" d="M 134,162 C 134,168.624 128.624,174 122,174 115.376,174 110,168.624 110,162 110,155.376 115.376,150 122,150 128.624,150 134,155.376 134,162 z" sodipodi:ry="12" sodipodi:rx="12" sodipodi:cy="162" sodipodi:cx="122" id="path5905" style="color:#000000;fill:url(#linearGradient5907);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5915);stroke-width:1.4141293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.795464,0,0,0.798577,24.99896,32.67435)" d="m 134,162 c 0,6.624 -5.376,12 -12,12 -6.624,0 -12,-5.376 -12,-12 0,-6.624 5.376,-12 12,-12 6.624,0 12,5.376 12,12 z" sodipodi:ry="12" sodipodi:rx="12" sodipodi:cy="162" sodipodi:cx="122" id="draw_arc1" style="color:#000000;fill:none;stroke:url(#linearGradient6574);stroke-width:1.2546769;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.707159,0,0,0.70714,35.77206,47.44802)" d="m 134,162 c 0,6.624 -5.376,12 -12,12 -6.624,0 -12,-5.376 -12,-12 0,-6.624 5.376,-12 12,-12 6.624,0 12,5.376 12,12 z" sodipodi:ry="12" sodipodi:rx="12" sodipodi:cy="162" sodipodi:cx="122" id="path5905" style="color:#000000;fill:url(#linearGradient5907);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5915);stroke-width:1.4141293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> </g> <g id="draw_star" transform="matrix(1.004126,0,0,0.991974,339.5462,0.936124)"> <path sodipodi:nodetypes="cccccc" id="path6584" d="M 122.024,189.9035 114.2846,189.9035 112.0734,182.2929 118.1543,177.4004 124.2353,182.2929 122.024,189.9035 z" style="color:#000000;fill:url(#linearGradient6605);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6607);stroke-width:1.0019727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" /> <path sodipodi:nodetypes="cccccc" id="star" d="M 122.8187,190.9423 113.4891,190.9423 110.8234,182.0013 118.1539,176.2535 125.4844,182.0013 122.8187,190.9423 z" style="color:#000000;fill:none;stroke:url(#linearGradient6582);stroke-width:1.0019715;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" /> -<path transform="matrix(1.486562,-0.0413145,0.0397842,1.466787,-36.46434,-92.69225)" d="M 109.1123,194.2458 105.6247,196.4529 105.6061,200.5801 102.4293,197.9452 98.49833,199.2029 100.0226,195.3674 97.61175,192.0174 101.7305,192.2818 104.1715,188.9538 105.1928,192.9527 109.1123,194.2458 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path2669" style="color:#000000;fill:#fffbc5;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> -<path transform="matrix(1.106952,-0.0266214,0.028269,1.152858,4.878699,-33.10438)" d="M 108.9792,194.2505 105.5454,196.2514 105.5605,200.4549 102.5964,197.8076 98.60329,199.1208 100.2051,195.4837 97.72221,192.0919 101.6763,192.4914 104.1349,189.0819 104.9768,192.9659 108.9792,194.2505 z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path6609" style="color:#000000;fill:url(#linearGradient6636);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6625);stroke-width:0.8866972;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> +<path transform="matrix(1.486562,-0.0413145,0.0397842,1.466787,-36.46434,-92.69225)" d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 3.9195,1.2931 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path2669" style="color:#000000;fill:#fffbc5;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> +<path transform="matrix(1.106952,-0.0266214,0.028269,1.152858,4.878699,-33.10438)" d="m 108.9792,194.2505 -3.4338,2.0009 0.015,4.2035 -2.9641,-2.6473 -3.99311,1.3132 1.60181,-3.6371 -2.48289,-3.3918 3.95409,0.3995 2.4586,-3.4095 0.8419,3.884 4.0024,1.2846 z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path6609" style="color:#000000;fill:url(#linearGradient6636);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6625);stroke-width:0.8866972;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> <rect y="174.4641" x="109.9999" height="24.19418" width="23.90138" id="rect3610" style="color:#000000;fill:none;stroke:none;stroke-width:1.0000001;marker:none;display:inline" /> </g> <g id="draw_spiral" inkscape:label="#draw_arc" transform="translate(365,55.03909)"> @@ -793,9 +850,9 @@ http://www.inkscape.org/</dc:description> <rect y="150" x="85" height="24" width="24" id="rect4211" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" /> </g> <g id="draw_zoom" transform="translate(280,-64.96091)"> -<path transform="matrix(1.087654,0,0,1.087684,-16.16957,-14.33312)" d="M 186,159 C 186,162.864 182.864,166 179,166 175.136,166 172,162.864 172,159 172,155.136 175.136,152 179,152 182.864,152 186,155.136 186,159 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path4199" style="color:#000000;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:0.8704858;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(1.087654,0,0,1.087684,-16.16957,-14.33312)" d="m 186,159 c 0,3.864 -3.136,7 -7,7 -3.864,0 -7,-3.136 -7,-7 0,-3.864 3.136,-7 7,-7 3.864,0 7,3.136 7,7 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path4199" style="color:#000000;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:0.8704858;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <rect y="150" x="170" height="24" width="24" id="rect4242" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" /> -<path transform="matrix(1.075061,0,0,1.075185,-14.43475,-12.95411)" d="M 186,159 C 186,162.864 182.864,166 179,166 175.136,166 172,162.864 172,159 172,155.136 175.136,152 179,152 182.864,152 186,155.136 186,159 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path4272" style="color:#000000;fill:url(#linearGradient5536);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9301261;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(1.075061,0,0,1.075185,-14.43475,-12.95411)" d="m 186,159 c 0,3.864 -3.136,7 -7,7 -3.864,0 -7,-3.136 -7,-7 0,-3.864 3.136,-7 7,-7 3.864,0 7,3.136 7,7 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path4272" style="color:#000000;fill:url(#linearGradient5536);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9301261;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <path style="fill:url(#linearGradient5524);fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 172,160 C 177,159 176,154 181,153 179,151 175.5,151.8333 174,153 172.5,154.1667 171,158 172,160 z" id="path5507" sodipodi:nodetypes="cczc" /> <g transform="matrix(-0.707107,0.707107,-0.732853,-0.732853,338.9611,194.4488)" id="g4696"> <path style="fill:url(#linearGradient4723);fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 85.625,124.8009 C 87.29167,123.8009 88.95833,123.8009 90.625,124.8009 L 90.24628,115.9591 C 88.89722,115.3058 87.62782,115.4979 86.07962,115.9591 L 85.625,124.8009 z" id="path4701" sodipodi:nodetypes="ccccc" /> @@ -902,10 +959,10 @@ http://www.inkscape.org/</dc:description> </g> <g id="zoom_in" transform="matrix(1,0,0,0.997925,495,-162.4833)"> <g id="g5796"> -<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#000000;stroke-width:0.9403349;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.2651297;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path4220" sodipodi:cx="179" sodipodi:cy="159" sodipodi:rx="7" sodipodi:ry="7" d="M 186,159 C 186,162.864 182.864,166 179,166 175.136,166 172,162.864 172,159 172,155.136 175.136,152 179,152 182.864,152 186,155.136 186,159 z" transform="matrix(1.00786,0,0,1.007983,-167.1731,96.0569)" /> +<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#000000;stroke-width:0.9403349;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.2651297;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path4220" sodipodi:cx="179" sodipodi:cy="159" sodipodi:rx="7" sodipodi:ry="7" d="m 186,159 c 0,3.864 -3.136,7 -7,7 -3.864,0 -7,-3.136 -7,-7 0,-3.864 3.136,-7 7,-7 3.864,0 7,3.136 7,7 z" transform="matrix(1.00786,0,0,1.007983,-167.1731,96.0569)" /> <rect style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" id="rect10601" width="16" height="16" x="5.0273" y="248.029" /> <path style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 18.03125,259 16,261.0312 19,264.0312 21.03125,262 18.03125,259 z" id="path10605" /> -<path sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient5855);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9931717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path10607" sodipodi:cx="179" sodipodi:cy="159" sodipodi:rx="7" sodipodi:ry="7" d="M 186,159 C 186,162.864 182.864,166 179,166 175.136,166 172,162.864 172,159 172,155.136 175.136,152 179,152 182.864,152 186,155.136 186,159 z" transform="matrix(1.00786,0,0,1.007983,-167.8785,95.25998)" /> +<path sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient5855);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9931717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path10607" sodipodi:cx="179" sodipodi:cy="159" sodipodi:rx="7" sodipodi:ry="7" d="m 186,159 c 0,3.864 -3.136,7 -7,7 -3.864,0 -7,-3.136 -7,-7 0,-3.864 3.136,-7 7,-7 3.864,0 7,3.136 7,7 z" transform="matrix(1.00786,0,0,1.007983,-167.8785,95.25998)" /> </g> <path sodipodi:nodetypes="ccccccccccccc" id="path10609" d="M 11,251.0208 13,251.0208 13.0273,254.0208 16.0273,254.0498 16,256.0436 13,256.0145 13.0273,259.0208 11.0273,259.0208 11,256.0145 7.9727,256.0145 8,254.0208 11.0273,254.0208 11,251.0208 z" style="fill:url(#linearGradient4088);fill-opacity:1;fill-rule:evenodd;stroke:none" /> </g> @@ -1130,8 +1187,8 @@ http://www.inkscape.org/</dc:description> <use x="0" y="0" xlink:href="#use8594" id="use8596" transform="translate(14,-5.001575e-6)" width="1250" height="1250" /> <g transform="matrix(1,0,0,1.008019,335.3152,51.42912)" id="g10379" /> <g id="g10421"> -<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient5819);stroke-width:1.3730356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path10763" sodipodi:cx="105.5" sodipodi:cy="210.5" sodipodi:rx="5.5" sodipodi:ry="5.5" d="M 111,210.5 C 111,213.536 108.536,216 105.5,216 102.464,216 100,213.536 100,210.5 100,207.464 102.464,205 105.5,205 108.536,205 111,207.464 111,210.5 z" transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)" /> -<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient5821);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5823);stroke-width:1.8262242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path10409" sodipodi:cx="105.5" sodipodi:cy="210.5" sodipodi:rx="5.5" sodipodi:ry="5.5" d="M 111,210.5 C 111,213.536 108.536,216 105.5,216 102.464,216 100,213.536 100,210.5 100,207.464 102.464,205 105.5,205 108.536,205 111,207.464 111,210.5 z" transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)" /> +<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient5819);stroke-width:1.3730356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path10763" sodipodi:cx="105.5" sodipodi:cy="210.5" sodipodi:rx="5.5" sodipodi:ry="5.5" d="m 111,210.5 c 0,3.036 -2.464,5.5 -5.5,5.5 -3.036,0 -5.5,-2.464 -5.5,-5.5 0,-3.036 2.464,-5.5 5.5,-5.5 3.036,0 5.5,2.464 5.5,5.5 z" transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)" /> +<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient5821);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5823);stroke-width:1.8262242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path10409" sodipodi:cx="105.5" sodipodi:cy="210.5" sodipodi:rx="5.5" sodipodi:ry="5.5" d="m 111,210.5 c 0,3.036 -2.464,5.5 -5.5,5.5 -3.036,0 -5.5,-2.464 -5.5,-5.5 0,-3.036 2.464,-5.5 5.5,-5.5 3.036,0 5.5,2.464 5.5,5.5 z" transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)" /> </g> </g> <g id="edit_duplicate" transform="translate(50.0399,-119.9404)"> @@ -1235,7 +1292,7 @@ http://www.inkscape.org/</dc:description> </g> <g id="selection_break" transform="translate(-79.87527,15.9917)" style="fill:#8ab3df;fill-opacity:0.5882353;stroke:#0000ff;stroke-opacity:1"> <path style="color:#000000;fill:#99b6d4;fill-opacity:0.7;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" d="M 235.5312,230.5312 235.5312,240.5 245.625,240.5 245.625,236.5312 C 245.4547,236.5472 245.2994,236.5625 245.125,236.5625 242.0805,236.5625 239.5937,234.0852 239.5937,231.0312 239.5937,230.8642 239.6105,230.6945 239.625,230.5312 L 235.5312,230.5312 z" transform="translate(79.87527,-15.9917)" id="rect10834" /> -<path transform="matrix(1.103062,0,0,1.10649,-36.96118,-22.90202)" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" sodipodi:ry="5" sodipodi:rx="5" sodipodi:cy="215" sodipodi:cx="328" id="path5724" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(1.103062,0,0,1.10649,-36.96118,-22.90202)" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" sodipodi:ry="5" sodipodi:rx="5" sodipodi:cy="215" sodipodi:cx="328" id="path5724" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> </g> <g id="selection_combine" transform="translate(-79.87527,-3.958721)"> <path id="rect10868" style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" d="M 315.4161,214.5498 325.5,214.5498 325.5,224.4978 315.4161,224.4978 315.4161,214.5498 z M 330.5,215.0325 C 330.5,218.0864 328.0291,220.5649 324.9847,220.5649 321.9402,220.5649 319.4694,218.0864 319.4694,215.0325 319.4694,211.9785 321.9402,209.5 324.9847,209.5 328.0291,209.5 330.5,211.9785 330.5,215.0325 z" /> @@ -1244,7 +1301,7 @@ http://www.inkscape.org/</dc:description> <path style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" d="M 225.0625,150.5 C 222.1834,150.5 219.9048,152.7389 219.6562,155.5625 L 215.5,155.5625 215.5,165.5 225.5937,165.5 225.5937,161.4687 C 228.379,161.1903 230.5937,158.898 230.5937,156.0312 230.5937,152.9773 228.107,150.5 225.0625,150.5 z" transform="translate(99.91614,59)" id="rect10877" /> </g> <g id="difference" transform="translate(-79.87527,-103.961)" inkscape:label="#difference"> -<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#c80000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0;marker:none;display:inline" id="path10888" sodipodi:cx="229.5" sodipodi:cy="155.5" sodipodi:rx="5.5" sodipodi:ry="5.5" d="M 235,155.5 C 235,158.536 232.536,161 229.5,161 226.464,161 224,158.536 224,155.5 224,152.464 226.464,150 229.5,150 232.536,150 235,152.464 235,155.5 z" transform="translate(95.41614,59.5)" /> +<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#c80000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0;marker:none;display:inline" id="path10888" sodipodi:cx="229.5" sodipodi:cy="155.5" sodipodi:rx="5.5" sodipodi:ry="5.5" d="m 235,155.5 c 0,3.036 -2.464,5.5 -5.5,5.5 -3.036,0 -5.5,-2.464 -5.5,-5.5 0,-3.036 2.464,-5.5 5.5,-5.5 3.036,0 5.5,2.464 5.5,5.5 z" transform="translate(95.41614,59.5)" /> <path style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" d="M 220.5,155.5625 220.5,165.5 230.5937,165.5 230.5937,161.375 C 230.3877,161.3984 230.2123,161.5 230,161.5 226.964,161.5 224.5,159.036 224.5,156 224.5,155.8435 224.5809,155.7157 224.5937,155.5625 L 220.5,155.5625 z" transform="translate(94.91614,59)" id="rect10884" /> </g> <g id="delete_object" transform="translate(-79.87527,156)" inkscape:label="#delete_object"> @@ -1370,7 +1427,7 @@ http://www.inkscape.org/</dc:description> <path style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9999991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" d="M 117.5025,304.5 111.5025,304.5 111.5025,310.5" id="path14327" sodipodi:nodetypes="ccc" /> <path style="color:#000000;fill:url(#linearGradient14343);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" d="M 120.5025,301.5 111.5025,301.5 111.5025,304.5 117.5025,304.5" id="path14331" sodipodi:nodetypes="cccc" /> <rect transform="translate(40.00246,0)" y="300" x="70" height="16" width="16" id="rect14256" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" /> -<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient14389);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5632);stroke-width:0.9999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.9942363;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path14381" sodipodi:cx="82.5" sodipodi:cy="309.5" sodipodi:rx="3.5" sodipodi:ry="3.5" d="M 86,309.5 C 86,311.432 84.432,313 82.5,313 80.568,313 79,311.432 79,309.5 79,307.568 80.568,306 82.5,306 84.432,306 86,307.568 86,309.5 z" transform="translate(39.50246,0.5)" /> +<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient14389);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5632);stroke-width:0.9999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.9942363;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path14381" sodipodi:cx="82.5" sodipodi:cy="309.5" sodipodi:rx="3.5" sodipodi:ry="3.5" d="m 86,309.5 c 0,1.932 -1.568,3.5 -3.5,3.5 -1.932,0 -3.5,-1.568 -3.5,-3.5 0,-1.932 1.568,-3.5 3.5,-3.5 1.932,0 3.5,1.568 3.5,3.5 z" transform="translate(39.50246,0.5)" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 116.5025,315.5 119.5025,312.5" id="path14391" sodipodi:nodetypes="cc" /> </g> <path sodipodi:nodetypes="cc" id="path14405" d="M 121.5025,300.5 110.5025,311.5" style="fill:none;stroke:#c80000;stroke-width:0.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -1492,18 +1549,18 @@ http://www.inkscape.org/</dc:description> </g> <g id="selection_bitmap" transform="matrix(-1,0,0,1,321.0144,75.92699)" inkscape:label="#selection_bitmap"> <path style="color:#000000;fill:url(#linearGradient11197);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11286);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" d="M 250.4841,75.57301 C 255.0144,74.05375 254.0144,72.55375 254.5144,71.55375 L 258.5144,71.55375 C 258.7644,72.29084 259.8455,74.26817 261.0144,74.52793 L 265.5144,75.52793 265.5144,84.57301 251.5144,84.55375 250.5144,83.55375 250.4841,75.57301 z" id="rect11168" sodipodi:nodetypes="cccsccccc" /> -<path transform="matrix(0.938759,0,0,0.938488,13.33429,5.86879)" d="M 262,78.5 C 262,80.432 260.432,82 258.5,82 256.568,82 255,80.432 255,78.5 255,76.568 256.568,75 258.5,75 260.432,75 262,76.568 262,78.5 z" sodipodi:ry="3.5" sodipodi:rx="3.5" sodipodi:cy="78.5" sodipodi:cx="258.5" id="path11178" style="color:#000000;fill:url(#linearGradient6187);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.3620667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.938759,0,0,0.938488,13.33429,5.86879)" d="m 262,78.5 c 0,1.932 -1.568,3.5 -3.5,3.5 -1.932,0 -3.5,-1.568 -3.5,-3.5 0,-1.932 1.568,-3.5 3.5,-3.5 1.932,0 3.5,1.568 3.5,3.5 z" sodipodi:ry="3.5" sodipodi:rx="3.5" sodipodi:cy="78.5" sodipodi:cx="258.5" id="path11178" style="color:#000000;fill:url(#linearGradient6187);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.3620667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <rect style="color:#000000;fill:url(#linearGradient11210);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11294);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect11199" width="4" height="9" x="261.5144" y="75.57301" /> <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11302);stroke-width:0.9999997px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" d="M 254.4841,71.58841 254.4841,69.57299 258.4841,69.57299 258.4841,71.58841 254.4841,71.58841 z" id="path11225" /> <path style="fill:none;stroke:#b1b1b1;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" d="M 258.9841,75.32301 C 257.9841,74.32301 254.4841,74.32301 253.4841,75.32301" id="path11254" sodipodi:nodetypes="cc" /> -<path sodipodi:type="arc" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.747;marker:none;display:inline" id="path3614" sodipodi:cx="64" sodipodi:cy="135" sodipodi:rx="1" sodipodi:ry="1" d="M 65,135 C 65,135.552 64.552,136 64,136 63.448,136 63,135.552 63,135 63,134.448 63.448,134 64,134 64.552,134 65,134.448 65,135 z" transform="matrix(-1,0,0,1,321.0144,-55.92699)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#ffffff;fill-opacity:0.4472574;fill-rule:evenodd;stroke:none;stroke-width:0.747;marker:none;display:inline" id="path4498" sodipodi:cx="64" sodipodi:cy="135" sodipodi:rx="1" sodipodi:ry="1" d="M 65,135 C 65,135.552 64.552,136 64,136 63.448,136 63,135.552 63,135 63,134.448 63.448,134 64,134 64.552,134 65,134.448 65,135 z" transform="matrix(-1.5,0,0,1.5,351.5144,-122.927)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.747;marker:none;display:inline" id="path3614" sodipodi:cx="64" sodipodi:cy="135" sodipodi:rx="1" sodipodi:ry="1" d="m 65,135 c 0,0.552 -0.448,1 -1,1 -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 z" transform="matrix(-1,0,0,1,321.0144,-55.92699)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#ffffff;fill-opacity:0.4472574;fill-rule:evenodd;stroke:none;stroke-width:0.747;marker:none;display:inline" id="path4498" sodipodi:cx="64" sodipodi:cy="135" sodipodi:rx="1" sodipodi:ry="1" d="m 65,135 c 0,0.552 -0.448,1 -1,1 -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 z" transform="matrix(-1.5,0,0,1.5,351.5144,-122.927)" /> </g> <g id="file_vacuum" transform="translate(-254.959,-4.930791)" inkscape:label="#file_vacuum"> <path sodipodi:nodetypes="cssc" id="path11319" d="M 268.5,100 C 267.5,100 265.5,100.3049 265.5,98 265.5,95 269.1283,95.5 271.5,95.5 274.5,95.5 274.5,93 274.5,93" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> -<path transform="matrix(0.119829,0,0,0.105878,237.4457,94.48869)" d="M 280,97.5 C 280,101.088 277.2,104 273.75,104 270.3,104 267.5,101.088 267.5,97.5 267.5,93.912 270.3,91 273.75,91 277.2,91 280,93.912 280,97.5 z" sodipodi:ry="6.5" sodipodi:rx="6.25" sodipodi:cy="97.5" sodipodi:cx="273.75" id="path11327" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8.8780499;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.119829,0,0,0.105878,237.4457,94.48869)" d="m 280,97.5 c 0,3.588 -2.8,6.5 -6.25,6.5 -3.45,0 -6.25,-2.912 -6.25,-6.5 0,-3.588 2.8,-6.5 6.25,-6.5 3.45,0 6.25,2.912 6.25,6.5 z" sodipodi:ry="6.5" sodipodi:rx="6.25" sodipodi:cy="97.5" sodipodi:cx="273.75" id="path11327" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8.8780499;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <path sodipodi:nodetypes="ccccs" id="rect11314" d="M 270,98.98237 C 277.036,95.04595 279.5,99.48237 279.5,99.48237 L 279.5,104.4824 268.5,104.5 C 268.5,104.5 265.5,101.5 270,98.98237 z" style="color:#000000;fill:url(#linearGradient11335);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11359);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" /> -<path transform="matrix(0.401393,0,0,0.385965,168.1187,65.35082)" d="M 280,97.5 C 280,101.088 277.2,104 273.75,104 270.3,104 267.5,101.088 267.5,97.5 267.5,93.912 270.3,91 273.75,91 277.2,91 280,93.912 280,97.5 z" sodipodi:ry="6.5" sodipodi:rx="6.25" sodipodi:cy="97.5" sodipodi:cx="273.75" id="path11312" style="color:#000000;fill:url(#radialGradient11343);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.5406296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.401393,0,0,0.385965,168.1187,65.35082)" d="m 280,97.5 c 0,3.588 -2.8,6.5 -6.25,6.5 -3.45,0 -6.25,-2.912 -6.25,-6.5 0,-3.588 2.8,-6.5 6.25,-6.5 3.45,0 6.25,2.912 6.25,6.5 z" sodipodi:ry="6.5" sodipodi:rx="6.25" sodipodi:cy="97.5" sodipodi:cx="273.75" id="path11312" style="color:#000000;fill:url(#radialGradient11343);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.5406296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <rect y="90.46992" x="270.455" height="2.034293" width="8.089884" id="rect11317" style="color:#000000;fill:#646464;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11367);stroke-width:0.9999993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 273.459,91.43079 275.459,91.43079" id="path5624" /> </g> @@ -1535,7 +1592,7 @@ http://www.inkscape.org/</dc:description> <use x="0" y="0" xlink:href="#rect6425" id="use5610" transform="translate(4,4)" width="1250" height="1250" /> <use x="0" y="0" xlink:href="#rect6425" id="use5608" transform="translate(2,2)" width="1250" height="1250" /> <path style="color:#000000;fill:url(#linearGradient5766);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5768);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" d="M 273.5,21.543 278.5,21.543 278.5,31.543 270.5,31.543 270.5,24.543 273.5,21.543 z" id="rect6425" sodipodi:nodetypes="cccccc" /> -<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient5612);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5620);stroke-width:0.7119799;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path6398" sodipodi:cx="281" sodipodi:cy="23" sodipodi:rx="3" sodipodi:ry="3" d="M 284,23 C 284,24.656 282.656,26 281,26 279.344,26 278,24.656 278,23 278,21.344 279.344,20 281,20 282.656,20 284,21.344 284,23 z" transform="matrix(1.331759,0,0,1.327869,-92.69296,-5.997991)" /> +<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient5612);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5620);stroke-width:0.7119799;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path6398" sodipodi:cx="281" sodipodi:cy="23" sodipodi:rx="3" sodipodi:ry="3" d="m 284,23 c 0,1.656 -1.344,3 -3,3 -1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 1.656,0 3,1.344 3,3 z" transform="matrix(1.331759,0,0,1.327869,-92.69296,-5.997991)" /> <path style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;display:inline" d="M 281,22 282,21 282,25 281,25 281,22 z" id="rect4108" sodipodi:nodetypes="ccccc" /> <path style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;display:inline" d="M 280,23.9955 282,23.9955 282,24.9955 279,24.9955 280,23.9955 z" id="rect4110" sodipodi:nodetypes="ccccc" /> <path style="fill:none;stroke:#646464;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" d="M 270.5,24.543 273.5,24.543 273.5,21.543 270.5,24.543 z" id="path4704" /> @@ -2115,13 +2172,13 @@ http://www.inkscape.org/</dc:description> <path id="path14606" d="M 1057.695,626.25 1082.252,623.882" style="fill:none;stroke:#000000;stroke-width:4.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> <path id="path3585" d="M 1097.34,615.4889 1113.937,601.5946" style="fill:none;stroke:#000000;stroke-width:4.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> <path id="path3587" d="M 1097.34,632.5749 1115.827,654.5025" style="fill:none;stroke:#000000;stroke-width:4.125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15576" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807036,304.9623,206.775)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15574" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807036,270.4753,278.716)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15578" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807035,316.828,283.148)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15580" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807035,339.8194,239.9834)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15588" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807036,385.4323,235.551)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15590" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807036,414.1713,206.775)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15592" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="M 333,215 C 333,217.76 330.76,220 328,220 325.24,220 323,217.76 323,215 323,212.24 325.24,210 328,210 330.76,210 333,212.24 333,215 z" transform="matrix(2.158934,0,0,1.807036,414.1713,273.92)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15576" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807036,304.9623,206.775)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15574" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807036,270.4753,278.716)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15578" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807035,316.828,283.148)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15580" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807035,339.8194,239.9834)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15588" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807036,385.4323,235.551)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15590" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807036,414.1713,206.775)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#99b7d5;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.8193182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="use15592" sodipodi:cx="328" sodipodi:cy="215" sodipodi:rx="5" sodipodi:ry="5" d="m 333,215 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" transform="matrix(2.158934,0,0,1.807036,414.1713,273.92)" /> <use transform="matrix(1.957219,0,0,1.633125,337.4381,267.7929)" style="fill:#8ab3df;fill-opacity:0.5882353;stroke:#0000ff;stroke-opacity:1" x="0" y="0" xlink:href="#path5724" id="use15554" width="1250" height="1250" /> </g> <g id="text_remove_kerns" transform="translate(-723.8811,270.0361)"> @@ -2227,9 +2284,9 @@ http://www.inkscape.org/</dc:description> </g> </g> <g style="display:inline" id="sticky_zoom" transform="matrix(0.483821,0,0,0.485303,-11.07167,649.3515)"> -<path transform="matrix(1.125571,0,0,1.125565,-22.76161,-20.24985)" d="M 186,159 C 186,162.864 182.864,166 179,166 175.136,166 172,162.864 172,159 172,155.136 175.136,152 179,152 182.864,152 186,155.136 186,159 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path5056" style="color:#000000;fill:none;stroke:#9e9e9e;stroke-width:1.7359509;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.7081545;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(1.125571,0,0,1.125565,-22.76161,-20.24985)" d="m 186,159 c 0,3.864 -3.136,7 -7,7 -3.864,0 -7,-3.136 -7,-7 0,-3.864 3.136,-7 7,-7 3.864,0 7,3.136 7,7 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path5056" style="color:#000000;fill:none;stroke:#9e9e9e;stroke-width:1.7359509;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.7081545;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <rect y="150" x="170" height="24" width="24" id="rect5058" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" /> -<path transform="matrix(1.075061,0,0,1.075185,-14.43475,-12.95411)" d="M 186,159 C 186,162.864 182.864,166 179,166 175.136,166 172,162.864 172,159 172,155.136 175.136,152 179,152 182.864,152 186,155.136 186,159 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path5060" style="color:#000000;fill:url(#linearGradient8492);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4819);stroke-width:1.4338813;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(1.075061,0,0,1.075185,-14.43475,-12.95411)" d="m 186,159 c 0,3.864 -3.136,7 -7,7 -3.864,0 -7,-3.136 -7,-7 0,-3.864 3.136,-7 7,-7 3.864,0 7,3.136 7,7 z" sodipodi:ry="7" sodipodi:rx="7" sodipodi:cy="159" sodipodi:cx="179" id="path5060" style="color:#000000;fill:url(#linearGradient8492);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4819);stroke-width:1.4338813;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="arc" /> <path style="fill:url(#linearGradient8494);fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 172,160 C 177,159 176,154 181,153 179,151 175.5,151.8333 174,153 172.5,154.1667 171,158 172,160 z" id="path5062" sodipodi:nodetypes="cczc" /> <g transform="matrix(-0.707107,0.707107,-0.732853,-0.732853,338.9611,194.4488)" id="g5066"> <path style="fill:url(#linearGradient8496);fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 85.625,124.8009 C 87.29167,123.8009 88.95833,123.8009 90.625,124.8009 L 90.24628,115.9591 C 88.89722,115.3058 87.62782,115.4979 86.07962,115.9591 L 85.625,124.8009 z" id="path5068" sodipodi:nodetypes="ccccc" /> @@ -2241,8 +2298,8 @@ http://www.inkscape.org/</dc:description> <rect style="color:#000000;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:0.83269;marker:none;display:inline" id="rect6472" width="14.52438" height="18.61259" x="707.1481" y="235.935" /> <g id="g1661" transform="translate(0,-0.9)"> <path id="path4926" style="color:#000000;fill:url(#linearGradient12592);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.1019087;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" d="M 718.3596,243.1986 C 719.3773,243.9521 720.2979,245.1034 721.151,246.7745 719.3176,250.3658 717.7991,251.8726 715.049,251.8726 712.299,251.8726 709.4688,249.9998 707.853,246.6911 709.6864,243.0997 713.2961,241.3385 716.1602,242.0819 M 711.7759,242.388 710.7364,238.3101 M 709.2185,244.2435 707.6685,241.7133 M 714.9275,241.9355 715.0423,237.208 M 717.4674,242.559 718.9969,238.7706 M 719.616,244.0748 721.2305,242.135" sodipodi:nodetypes="ccscscccccccccc" /> -<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient12519);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" id="path5671" sodipodi:cx="63.5" sodipodi:cy="714" sodipodi:rx="3.5" sodipodi:ry="4" d="M 67,714 C 67,716.208 65.432,718 63.5,718 61.568,718 60,716.208 60,714 60,711.792 61.568,710 63.5,710 65.432,710 67,711.792 67,714 z" transform="matrix(0.842506,0,0,0.954024,661.2863,-434.5226)" /> -<path sodipodi:type="arc" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" id="path12489" sodipodi:cx="63.5" sodipodi:cy="714" sodipodi:rx="3.5" sodipodi:ry="4" d="M 67,714 C 67,716.208 65.432,718 63.5,718 61.568,718 60,716.208 60,714 60,711.792 61.568,710 63.5,710 65.432,710 67,711.792 67,714 z" transform="matrix(0.269046,0,0,0.308688,696.6634,24.57494)" /> +<path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient12519);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" id="path5671" sodipodi:cx="63.5" sodipodi:cy="714" sodipodi:rx="3.5" sodipodi:ry="4" d="m 67,714 c 0,2.208 -1.568,4 -3.5,4 -1.932,0 -3.5,-1.792 -3.5,-4 0,-2.208 1.568,-4 3.5,-4 1.932,0 3.5,1.792 3.5,4 z" transform="matrix(0.842506,0,0,0.954024,661.2863,-434.5226)" /> +<path sodipodi:type="arc" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" id="path12489" sodipodi:cx="63.5" sodipodi:cy="714" sodipodi:rx="3.5" sodipodi:ry="4" d="m 67,714 c 0,2.208 -1.568,4 -3.5,4 -1.932,0 -3.5,-1.792 -3.5,-4 0,-2.208 1.568,-4 3.5,-4 1.932,0 3.5,1.792 3.5,4 z" transform="matrix(0.269046,0,0,0.308688,696.6634,24.57494)" /> </g> </g> <g style="display:inline" transform="matrix(0.823787,0,0,0.645052,-548.5396,589.8035)" id="hidden" inkscape:label="#hidden"> @@ -2421,8 +2478,8 @@ http://www.inkscape.org/</dc:description> <rect y="235.935" x="707.1481" height="18.61259" width="14.52438" id="rect5208" style="color:#000000;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:0.83269;marker:none;display:inline" /> <g transform="translate(0,-0.9)" id="g5210"> <path sodipodi:nodetypes="ccscscccccccccc" d="M 718.3596,243.1986 C 719.3773,243.9521 720.2979,245.1034 721.151,246.7745 719.3176,250.3658 717.7991,251.8726 715.049,251.8726 712.299,251.8726 709.4688,249.9998 707.853,246.6911 709.6864,243.0997 713.2961,241.3385 716.1602,242.0819 M 711.7759,242.388 710.7364,238.3101 M 709.2185,244.2435 707.6685,241.7133 M 714.9275,241.9355 715.0423,237.208 M 717.4674,242.559 718.9969,238.7706 M 719.616,244.0748 721.2305,242.135" style="color:#000000;fill:url(#linearGradient5218);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.1019087;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path5212" /> -<path transform="matrix(0.842506,0,0,0.954024,661.2863,-434.5226)" d="M 67,714 C 67,716.208 65.432,718 63.5,718 61.568,718 60,716.208 60,714 60,711.792 61.568,710 63.5,710 65.432,710 67,711.792 67,714 z" sodipodi:ry="4" sodipodi:rx="3.5" sodipodi:cy="714" sodipodi:cx="63.5" id="path5214" style="color:#000000;fill:url(#linearGradient5220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" sodipodi:type="arc" /> -<path transform="matrix(0.269046,0,0,0.308688,696.6634,24.57494)" d="M 67,714 C 67,716.208 65.432,718 63.5,718 61.568,718 60,716.208 60,714 60,711.792 61.568,710 63.5,710 65.432,710 67,711.792 67,714 z" sodipodi:ry="4" sodipodi:rx="3.5" sodipodi:cy="714" sodipodi:cx="63.5" id="path5216" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.842506,0,0,0.954024,661.2863,-434.5226)" d="m 67,714 c 0,2.208 -1.568,4 -3.5,4 -1.932,0 -3.5,-1.792 -3.5,-4 0,-2.208 1.568,-4 3.5,-4 1.932,0 3.5,1.792 3.5,4 z" sodipodi:ry="4" sodipodi:rx="3.5" sodipodi:cy="714" sodipodi:cx="63.5" id="path5214" style="color:#000000;fill:url(#linearGradient5220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" sodipodi:type="arc" /> +<path transform="matrix(0.269046,0,0,0.308688,696.6634,24.57494)" d="m 67,714 c 0,2.208 -1.568,4 -3.5,4 -1.932,0 -3.5,-1.792 -3.5,-4 0,-2.208 1.568,-4 3.5,-4 1.932,0 3.5,1.792 3.5,4 z" sodipodi:ry="4" sodipodi:rx="3.5" sodipodi:cy="714" sodipodi:cx="63.5" id="path5216" style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0247481;marker:none;display:inline" sodipodi:type="arc" /> </g> </g> </g> @@ -2588,7 +2645,7 @@ http://www.inkscape.org/</dc:description> <path id="path30990" d="M 13.0063,24.4482 30.4465,15.9086 C 31.4092,15.4372 31.0551,10.9526 28.9338,6.62049 26.8126,2.28834 23.7236,-0.25897 22.7609,0.212415 L 5.32066,8.75199" style="fill:url(#linearGradient3352);fill-opacity:1;stroke:#000000;stroke-width:1.28;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="ccscc" /> <path style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" d="M 459.326,449.367 469.844,444.248 C 471.078,444.895 471.386,445.263 472.077,446.761" id="path4825" sodipodi:nodetypes="ccc" transform="matrix(1.28,0,0,1.28,-578.362,-566.08)" /> <path style="fill:none;stroke:#000000;stroke-width:1.28;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 15.3452,14.3489 C 13.4479,-3.0346 8.35128,-2.74598 9.06756,6.76043" id="path31979" sodipodi:nodetypes="cs" /> -<path sodipodi:type="arc" style="fill:#c8c8c8;fill-opacity:1;stroke:#2e3436;stroke-width:1.138871;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path31981" sodipodi:cx="12.875" sodipodi:cy="14.875" sodipodi:rx="1.3125" sodipodi:ry="1.3125" d="M 14.1875,14.875 C 14.1875,15.5995 13.5995,16.1875 12.875,16.1875 12.1505,16.1875 11.5625,15.5995 11.5625,14.875 11.5625,14.1505 12.1505,13.5625 12.875,13.5625 13.5995,13.5625 14.1875,14.1505 14.1875,14.875 z" transform="matrix(1.12392,0,0,1.12392,0.83338,-2.58525)" /> +<path sodipodi:type="arc" style="fill:#c8c8c8;fill-opacity:1;stroke:#2e3436;stroke-width:1.138871;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path31981" sodipodi:cx="12.875" sodipodi:cy="14.875" sodipodi:rx="1.3125" sodipodi:ry="1.3125" d="m 14.1875,14.875 c 0,0.7245 -0.588,1.3125 -1.3125,1.3125 -0.7245,0 -1.3125,-0.588 -1.3125,-1.3125 0,-0.7245 0.588,-1.3125 1.3125,-1.3125 0.7245,0 1.3125,0.588 1.3125,1.3125 z" transform="matrix(1.12392,0,0,1.12392,0.83338,-2.58525)" /> <path style="color:#000000;fill:url(#radialGradient4365);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;" d="M 456.281,449.062 C 456.213,449.07 456.154,449.096 456.094,449.125 455.133,449.59 455.637,452.694 457.25,456.062 458.238,458.125 459.43,459.799 460.406,460.688 460.405,460.698 460.407,460.708 460.406,460.719 460.337,461.549 459.647,462.428 459.378,463.219 449.286,463.539 450.416,467.696 460.031,467.742 478.573,467.83 478.246,463.266 462.875,463.188 462.602,462.532 462.317,461.864 462.094,461.188 462.821,460.45 462.262,457.533 460.75,454.375 459.238,451.217 457.308,448.951 456.281,449.062 z" transform="matrix(1.28,0,0,1.28,-578.362,-566.08)" id="path22088" sodipodi:nodetypes="csscscsccsc" /> </g> <g transform="matrix(1.004126,0,0,0.991974,389.2193,2.457537)" id="star_flat"> @@ -2596,8 +2653,8 @@ http://www.inkscape.org/</dc:description> <path style="color:#000000;fill:none;stroke:url(#linearGradient8398);stroke-width:1.0019715;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" d="M 122.8187,190.9423 113.4891,190.9423 110.8234,182.0013 118.1539,176.2535 125.4844,182.0013 122.8187,190.9423 z" id="path8386" sodipodi:nodetypes="cccccc" /> </g> <g id="star_angled" transform="matrix(1.004126,0,0,0.991974,403.7394,-2.10701)"> -<path transform="matrix(1.486562,-0.0413145,0.0397842,1.466787,-36.46434,-92.69225)" d="M 109.1123,194.2458 105.6247,196.4529 105.6061,200.5801 102.4293,197.9452 98.49833,199.2029 100.0226,195.3674 97.61175,192.0174 101.7305,192.2818 104.1715,188.9538 105.1928,192.9527 109.1123,194.2458 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8412" style="color:#000000;fill:#fffbc5;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8424);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> -<path transform="matrix(1.106952,-0.0266214,0.028269,1.152858,4.878699,-33.10438)" d="M 108.9792,194.2505 105.5454,196.2514 105.5605,200.4549 102.5964,197.8076 98.60329,199.1208 100.2051,195.4837 97.72221,192.0919 101.6763,192.4914 104.1349,189.0819 104.9768,192.9659 108.9792,194.2505 z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8414" style="color:#000000;fill:url(#linearGradient8426);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8428);stroke-width:0.8866972;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> +<path transform="matrix(1.486562,-0.0413145,0.0397842,1.466787,-36.46434,-92.69225)" d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 3.9195,1.2931 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8412" style="color:#000000;fill:#fffbc5;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8424);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> +<path transform="matrix(1.106952,-0.0266214,0.028269,1.152858,4.878699,-33.10438)" d="m 108.9792,194.2505 -3.4338,2.0009 0.015,4.2035 -2.9641,-2.6473 -3.99311,1.3132 1.60181,-3.6371 -2.48289,-3.3918 3.95409,0.3995 2.4586,-3.4095 0.8419,3.884 4.0024,1.2846 z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8414" style="color:#000000;fill:url(#linearGradient8426);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8428);stroke-width:0.8866972;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" sodipodi:type="star" /> </g> <g transform="matrix(0.941445,0,0,1.002693,-125.0319,-1.597622)" id="trace_background" style="display:inline" inkscape:label="#g9319"> <rect style="fill:url(#linearGradient9331);fill-opacity:1;stroke:none" id="rect9329" width="11.68417" height="10.97046" x="-703.2083" y="303.7795" transform="scale(-1,1)" /> @@ -2614,7 +2671,7 @@ http://www.inkscape.org/</dc:description> </g> <g transform="translate(340,-5)" id="g4303"> <rect style="color:#000000;fill:none;stroke:none;stroke-width:1.0000001;marker:none;display:inline" id="rect4336" width="24" height="24" x="110" y="150" /> -<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient5389);stroke-width:1.2546769;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path4338" sodipodi:cx="122" sodipodi:cy="162" sodipodi:rx="12" sodipodi:ry="12" d="M 134,162 C 134,168.624 128.624,174 122,174 115.376,174 110,168.624 110,162 110,155.376 115.376,150 122,150 128.624,150 134,155.376 134,162 z" transform="matrix(0.795464,0,0,0.798577,24.99896,32.67435)" /> +<path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient5389);stroke-width:1.2546769;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="path4338" sodipodi:cx="122" sodipodi:cy="162" sodipodi:rx="12" sodipodi:ry="12" d="m 134,162 c 0,6.624 -5.376,12 -12,12 -6.624,0 -12,-5.376 -12,-12 0,-6.624 5.376,-12 12,-12 6.624,0 12,5.376 12,12 z" transform="matrix(0.795464,0,0,0.798577,24.99896,32.67435)" /> </g> <g id="reset_circle" style="fill:none"> <rect y="150" x="500" height="16" width="16" id="rect4298" style="fill:none;stroke:none" /> @@ -2624,11 +2681,11 @@ http://www.inkscape.org/</dc:description> </g> <g style="fill:none" id="circle_closed_arc" transform="translate(20,0)"> <rect style="fill:none;stroke:none" id="rect4316" width="16" height="16" x="500" y="150" /> -<path d="M 514,158 C 514,161.312 511.312,164 508,164 504.688,164 502,161.312 502,158 502,155.792 503.0878,153.9078 505,152.8038 L 508,158 z" sodipodi:ry="6" sodipodi:rx="6" sodipodi:cy="158" sodipodi:cx="508" id="path4318" style="fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="4.18879" /> +<path d="m 514,158 c 0,3.312 -2.688,6 -6,6 -3.312,0 -6,-2.688 -6,-6 0,-2.208 1.0878,-4.0922 3,-5.1962 L 508,158 z" sodipodi:ry="6" sodipodi:rx="6" sodipodi:cy="158" sodipodi:cx="508" id="path4318" style="fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="4.18879" /> </g> <g transform="translate(40,0)" id="circle_open_arc" style="fill:none"> <rect y="150" x="500" height="16" width="16" id="rect4326" style="fill:none;stroke:none" /> -<path sodipodi:end="4.18879" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="path4328" sodipodi:cx="508" sodipodi:cy="158" sodipodi:rx="6" sodipodi:ry="6" d="M 514,158 C 514,161.312 511.312,164 508,164 504.688,164 502,161.312 502,158 502,155.792 503.0878,153.9078 505,152.8038" sodipodi:open="true" /> +<path sodipodi:end="4.18879" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="path4328" sodipodi:cx="508" sodipodi:cy="158" sodipodi:rx="6" sodipodi:ry="6" d="m 514,158 c 0,3.312 -2.688,6 -6,6 -3.312,0 -6,-2.688 -6,-6 0,-2.208 1.0878,-4.0922 3,-5.1962" sodipodi:open="true" /> </g> <g id="draw_3dbox"> <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0492821px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 604.0245,114.9402 592.1873,119.5308 591.9578,132.5813 600.8438,138.7786 612.1565,135.1716 612.3859,122.613 604.0245,114.9402 z" id="path5192" /> @@ -2740,7 +2797,7 @@ http://www.inkscape.org/</dc:description> <rect y="180.9545" x="-43.13489" height="4.069275" width="4.069275" id="rect4581" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;" /> </g> <g id="edit_next_parameter" inkscape:label="#g10193" transform="translate(20,0)"> -<path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 761.9292,60.21135 C 761.5878,61.39286 761.4946,62.3835 761.5011,63.20978 761.5077,64.03606 761.6167,64.69823 761.7564,65.22109 762.0358,66.2668 762.4196,66.76142 762.7922,66.84248 763.1648,66.92354 764.0584,66.69636 764.9435,66.40187 765.3861,66.25463 765.8255,66.09125 766.196,65.9186 766.5666,65.74595 766.8671,65.56494 767.048,65.34354 766.4063,64.64298 765.4475,64.04417 764.4271,63.34698 763.9169,62.99839 763.396,62.61954 762.9432,62.13023 762.4904,61.64091 762.1008,61.0399 761.9292,60.21135 z M 764.4579,59.01822 C 764.2129,59.7969 764.3097,60.67268 764.6999,61.36216 765.0313,61.94976 765.5572,62.39261 766.1623,62.67942 766.6964,62.92688 767.2804,63.04656 767.9134,63.0393 767.2183,62.61982 766.613,62.21989 766.1246,61.81109 765.6363,61.40228 765.2668,60.98517 765.0109,60.58979 764.4991,59.79903 764.4542,59.10024 764.4579,59.01822 z M 767.2562,57.98462 C 766.778,58.99773 766.8948,59.70934 767.2669,60.18111 767.639,60.65288 768.2666,60.91061 768.9902,61.0957 768.3331,60.58465 767.8453,59.85018 767.5652,59.20611 767.2851,58.56204 767.214,58.01559 767.2562,57.98462 z M 770.782,55.78203 C 770.2055,56.1138 770.2762,57.16371 770.004,57.54492 769.478,58.28155 768.9415,58.39158 769.2239,58.98036 769.5903,59.74429 769.7493,59.35851 770.7399,59.45409 771.0491,59.48392 771.9668,60.4286 772.2901,60.37037 771.3092,58.83005 770.7454,57.38913 770.782,55.78203 z" id="path9858" inkscape:path-effect="#path-effect9860" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" /> +<path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 761.9292,60.21135 c -0.3414,1.18151 -0.4346,2.17215 -0.4281,2.99843 0.01,0.82628 0.1156,1.48845 0.2553,2.01131 0.2794,1.04571 0.6632,1.54033 1.0358,1.62139 0.3726,0.0811 1.2662,-0.14612 2.1513,-0.44061 0.4426,-0.14724 0.882,-0.31062 1.2525,-0.48327 0.3706,-0.17265 0.6711,-0.35366 0.852,-0.57506 -0.6417,-0.70056 -1.6005,-1.29937 -2.6209,-1.99656 -0.5102,-0.34859 -1.0311,-0.72744 -1.4839,-1.21675 -0.4528,-0.48932 -0.8424,-1.09033 -1.014,-1.91888 z m 2.5287,-1.19313 c -0.245,0.77868 -0.1482,1.65446 0.242,2.34394 0.3314,0.5876 0.8573,1.03045 1.4624,1.31726 0.5341,0.24746 1.1181,0.36714 1.7511,0.35988 -0.6951,-0.41948 -1.3004,-0.81941 -1.7888,-1.22821 -0.4883,-0.40881 -0.8578,-0.82592 -1.1137,-1.2213 -0.5118,-0.79076 -0.5567,-1.48955 -0.553,-1.57157 z m 2.7983,-1.0336 c -0.4782,1.01311 -0.3614,1.72472 0.011,2.19649 0.3721,0.47177 0.9997,0.7295 1.7233,0.91459 -0.6571,-0.51105 -1.1449,-1.24552 -1.425,-1.88959 -0.2801,-0.64407 -0.3512,-1.19052 -0.309,-1.22149 z m 3.5258,-2.20259 c -0.5765,0.33177 -0.5058,1.38168 -0.778,1.76289 -0.526,0.73663 -1.0625,0.84666 -0.7801,1.43544 0.3664,0.76393 0.5254,0.37815 1.516,0.47373 0.3092,0.0298 1.2269,0.97451 1.5502,0.91628 -0.9809,-1.54032 -1.5447,-2.98124 -1.5081,-4.58834 z" id="path9858" inkscape:path-effect="#path-effect9860" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" /> <path sodipodi:nodetypes="cc" id="path9256" d="M 762.5,68.5 C 763.3058,62.01571 768.0747,58.5078 773.5,57.5" style="fill:none;stroke:#008000;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" /> <rect style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline" id="rect9258" width="16" height="16" x="759.9762" y="55.0535" /> <use transform="translate(760,-189)" x="0" y="0" xlink:href="#g6043" id="use9872" width="1250" height="1250" /> @@ -2850,7 +2907,7 @@ http://www.inkscape.org/</dc:description> <path sodipodi:nodetypes="ccccc" id="path4912" d="M 784,206 795,210.5 784,215 773,210.5 784,206 z" style="fill:url(#radialGradient8474);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5633);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;" /> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;" d="M 848,219 848,232.417" id="path5699" transform="translate(-64,-4)" sodipodi:nodetypes="cc" /> <g id="g5864" transform="translate(-64,-4)"> -<path transform="matrix(1.795342,0,0,1.795342,-669.664,-176.9133)" d="M 843,222.75 C 843,223.44 842.664,224 842.25,224 841.836,224 841.5,223.44 841.5,222.75 841.5,222.06 841.836,221.5 842.25,221.5 842.664,221.5 843,222.06 843,222.75 z" sodipodi:ry="1.25" sodipodi:rx="0.75" sodipodi:cy="222.75" sodipodi:cx="842.25" id="path5706" style="fill:url(#radialGradient5579);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3484024;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" /> +<path transform="matrix(1.795342,0,0,1.795342,-669.664,-176.9133)" d="m 843,222.75 c 0,0.69 -0.336,1.25 -0.75,1.25 -0.414,0 -0.75,-0.56 -0.75,-1.25 0,-0.69 0.336,-1.25 0.75,-1.25 0.414,0 0.75,0.56 0.75,1.25 z" sodipodi:ry="1.25" sodipodi:rx="0.75" sodipodi:cy="222.75" sodipodi:cx="842.25" id="path5706" style="fill:url(#radialGradient5579);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3484024;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" /> <use height="1250" width="1250" transform="translate(9.037201,-1.473703)" id="use5833" xlink:href="#path5706" y="0" x="0" /> <use height="1250" width="1250" transform="translate(9.037201,3.880038)" id="use5842" xlink:href="#path5706" y="0" x="0" /> <use height="1250" width="1250" transform="translate(13.22746,-3.462058)" id="use5848" xlink:href="#path5706" y="0" x="0" /> @@ -2960,7 +3017,7 @@ http://www.inkscape.org/</dc:description> <g transform="translate(416.9762,-39.9465)" id="tweak_move_mode" inkscape:label="#g4416"> <rect style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline" id="rect4991" width="16" height="16" x="-45" y="175" /> <g id="g5135" style="fill:#000000" transform="translate(-416.8263,39.0012)"> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" inkscape:tile-h="2.223736" inkscape:tile-w="2.223736" inkscape:tile-cy="137.9821" inkscape:tile-cx="375.0941" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5011" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.17581)" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" inkscape:tile-h="2.223736" inkscape:tile-w="2.223736" inkscape:tile-cy="137.9821" inkscape:tile-cx="375.0941" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5011" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.17581)" /> <use height="1250" width="1250" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" id="use5085" xlink:href="#path5011" inkscape:tiled-clone-of="#path5011" y="0" x="0" transform="translate(4.825002e-8,2.41142)" /> <use height="1250" width="1250" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" id="use5087" transform="translate(0.0067742,5.089253)" xlink:href="#path5011" inkscape:tiled-clone-of="#path5011" y="0" x="0" /> <use height="1250" width="1250" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" id="use5091" transform="translate(0.0027824,7.946541)" xlink:href="#path5011" inkscape:tiled-clone-of="#path5011" y="0" x="0" /> @@ -2996,7 +3053,7 @@ http://www.inkscape.org/</dc:description> <use height="1250" width="1250" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" id="use5126" transform="translate(11.0383,9.082095)" xlink:href="#path5084" inkscape:tiled-clone-of="#path5011" y="0" x="0" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084" transform="translate(10.38143,6.05473)" id="use5090" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> <use height="1250" width="1250" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" id="use5132" transform="translate(5.90759,10.40446)" xlink:href="#path5084" inkscape:tiled-clone-of="#path5011" y="0" x="0" /> -<path transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.88514)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="path5084" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-cx="375.0941" inkscape:tile-cy="137.9821" inkscape:tile-w="2.223736" inkscape:tile-h="2.223736" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.88514)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="path5084" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-cx="375.0941" inkscape:tile-cy="137.9821" inkscape:tile-w="2.223736" inkscape:tile-h="2.223736" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> <use transform="translate(8.706381,0.9318868)" x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084" id="use5086" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084" transform="translate(2.953795,0.8543842)" id="use5092" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084" transform="translate(11.81518,0)" id="use5094" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> @@ -3018,7 +3075,7 @@ http://www.inkscape.org/</dc:description> </g> <rect y="175.053" x="-26.0238" height="16" width="16" id="tweak_move_mode_jitter" style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline" inkscape:label="#rect5080-2" /> <g transform="translate(-397.9047,38.6171)" style="fill:#000000" id="g5082-9"> -<path transform="matrix(1.20571,0,0,1.20571,-78.24976,-27.879)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="path5084-3" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-cx="375.0941" inkscape:tile-cy="137.9821" inkscape:tile-w="2.223736" inkscape:tile-h="2.223736" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.20571,0,0,1.20571,-78.24976,-27.879)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="path5084-3" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-cx="375.0941" inkscape:tile-cy="137.9821" inkscape:tile-w="2.223736" inkscape:tile-h="2.223736" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> <use transform="translate(8.561625,0.49145)" x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084-3" id="use5086-7" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084-3" transform="translate(11.84313,2.65475)" id="use5088-6" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084-3" transform="translate(11.465,6.015863)" id="use5090-6" style="fill:#000000;stroke:#ffffff;stroke-width:0.2773579" width="1250" height="1250" /> @@ -3046,7 +3103,7 @@ http://www.inkscape.org/</dc:description> </g> <rect y="197.0282" x="-64.90511" height="16" width="16" id="tweak_scale_mode" style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline" inkscape:label="#rect5080-7" /> <g transform="translate(-436.7857,60.59235)" style="fill:#000000" id="g5082-3"> -<path transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.88514)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="path5084-2" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-cx="375.0941" inkscape:tile-cy="137.9821" inkscape:tile-w="2.223736" inkscape:tile-h="2.223736" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.88514)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="path5084-2" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-cx="375.0941" inkscape:tile-cy="137.9821" inkscape:tile-w="2.223736" inkscape:tile-h="2.223736" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> <use transform="matrix(0.9860759,0,0,0.9860759,14.06913,1.928293)" x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084-2" id="use5086-8" style="fill:#000000;stroke:#ffffff;stroke-width:0.2812746" width="1250" height="1250" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084-2" transform="matrix(0.9791266,0,0,0.9791266,19.62171,5.917923)" id="use5088-8" style="fill:#000000;stroke:#ffffff;stroke-width:0.2832711" width="1250" height="1250" /> <use x="0" y="0" inkscape:tiled-clone-of="#path5011" xlink:href="#path5084-2" transform="matrix(0.9025255,0,0,0.9025255,48.27027,19.55311)" id="use5090-1" style="fill:#000000;stroke:#ffffff;stroke-width:0.3073135" width="1250" height="1250" /> @@ -3102,45 +3159,45 @@ http://www.inkscape.org/</dc:description> </g> <rect inkscape:label="#rect5080-7" style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline" id="tweak_moreless_mode" width="16" height="16" x="-25.73359" y="197.0282" /> <g id="g5678" style="fill:#000000" transform="translate(-399.5418,60.29884)" clip-path="url(#clipPath5905)"> -<path transform="matrix(2.361086,0,0,2.361086,-503.8152,-187.3038)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="use5685" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(2.176368,0,0,2.176368,-434.5286,-155.763)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="use5687" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(2.363946,0,0,2.363946,-504.888,-175.5924)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="use5828" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5885" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.361086,-2.361086,0,713.6548,-741.0926)" /> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5889" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.363946,-2.363946,0,701.94,-742.1654)" /> -<path transform="matrix(0,2.361086,-2.361086,0,713.6548,-747.1456)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="path5893" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(0,2.363946,-2.363946,0,701.94,-748.2184)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="path5895" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5897" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.361086,-2.361086,0,713.6548,-735.0396)" /> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5899" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.363946,-2.363946,0,701.94,-736.1123)" /> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5909" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(2.176368,0,0,2.176368,-433.9294,-155.2869)" /> -<path transform="matrix(2.176368,0,0,2.176368,-433.3154,-154.7343)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="path5911" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(2.361086,0,0,2.361086,-503.8152,-187.3038)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="use5685" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(2.176368,0,0,2.176368,-434.5286,-155.763)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="use5687" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(2.363946,0,0,2.363946,-504.888,-175.5924)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="use5828" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5885" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.361086,-2.361086,0,713.6548,-741.0926)" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5889" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.363946,-2.363946,0,701.94,-742.1654)" /> +<path transform="matrix(0,2.361086,-2.361086,0,713.6548,-747.1456)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="path5893" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(0,2.363946,-2.363946,0,701.94,-748.2184)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="path5895" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5897" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.361086,-2.361086,0,713.6548,-735.0396)" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5899" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(0,2.363946,-2.363946,0,701.94,-736.1123)" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path5909" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(2.176368,0,0,2.176368,-433.9294,-155.2869)" /> +<path transform="matrix(2.176368,0,0,2.176368,-433.3154,-154.7343)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.138679;marker:none;visibility:visible;display:inline;" id="path5911" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> </g> <rect inkscape:label="#rect5080-7" style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline" id="tweak_blur_mode" width="16" height="16" x="-64.90511" y="221.0282" /> <g id="g7655" style="fill:#000000" transform="translate(-436.7857,84.59235)"> -<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" inkscape:tile-h="2.223736" inkscape:tile-w="2.223736" inkscape:tile-cy="137.9821" inkscape:tile-cx="375.0941" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path7657" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.88514)" /> -<path transform="matrix(1.188922,0,0,1.188922,-63.09951,-25.56857)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7660" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.180543,0,0,1.180543,-57.00309,-21.38516)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7662" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.088184,0,0,1.088184,-22.35986,-5.61394)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7664" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.188915,0,0,1.188915,-69.00487,-25.56775)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7666" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.20571,0,0,1.20571,-66.44314,-27.88514)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7668" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.093412,0,0,1.093412,-36.13602,-6.3353)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7670" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.184974,0,0,1.184974,-70.48049,-15.94187)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7672" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.111722,0,0,1.111722,-37.0964,-14.9165)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7674" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.181829,0,0,1.181829,-69.30058,-21.56258)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7676" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.485788,0,0,1.485788,-180.3604,-63.50353)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7818);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7678" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.485788,0,0,1.485788,-180.3597,-57.44874)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7802);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7680" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.485788,0,0,1.485788,-177.4064,-63.50356)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7826);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7682" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.485788,0,0,1.485788,-174.4526,-63.50354)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7834);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7684" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.485788,0,0,1.485788,-180.3605,-60.47619)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7810);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7686" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.4858,0,0,1.4858,-177.4101,-57.45014)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7794);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7688" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.485788,0,0,1.485788,-174.4524,-60.47613)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7842);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7692" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.492675,0,0,1.492675,-177.0357,-58.39903)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7786);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7694" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.191739,0,0,1.191739,-64.1566,-13.84799)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7696" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.181973,0,0,1.181973,-57.53942,-15.52772)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7698" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.20571,0,0,1.20571,-78.25832,-15.77568)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7700" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.193386,0,0,1.193386,-70.68201,-14.07527)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7702" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.121575,0,0,1.121575,-40.79199,-4.166495)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7704" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(1.20571,0,0,1.20571,-66.44314,-15.77568)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7706" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> -<path transform="matrix(6.75293,0,0,6.75293,-2153.081,-787.2478)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7778);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7690" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="M 376.206,137.9821 C 376.206,138.5959 375.7078,139.094 375.0941,139.094 374.4803,139.094 373.9822,138.5959 373.9822,137.9821 373.9822,137.3684 374.4803,136.8702 375.0941,136.8702 375.7078,136.8702 376.206,137.3684 376.206,137.9821 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path inkscape:tile-y0="136.8702" inkscape:tile-x0="373.9822" inkscape:tile-h="2.223736" inkscape:tile-w="2.223736" inkscape:tile-cy="137.9821" inkscape:tile-cx="375.0941" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" sodipodi:ry="1.111868" sodipodi:rx="1.111868" sodipodi:cy="137.9821" sodipodi:cx="375.0941" id="path7657" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" sodipodi:type="arc" transform="matrix(1.20571,0,0,1.20571,-78.25832,-27.88514)" /> +<path transform="matrix(1.188922,0,0,1.188922,-63.09951,-25.56857)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7660" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.180543,0,0,1.180543,-57.00309,-21.38516)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7662" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.088184,0,0,1.088184,-22.35986,-5.61394)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7664" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.188915,0,0,1.188915,-69.00487,-25.56775)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7666" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.20571,0,0,1.20571,-66.44314,-27.88514)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7668" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.093412,0,0,1.093412,-36.13602,-6.3353)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7670" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.184974,0,0,1.184974,-70.48049,-15.94187)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7672" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.111722,0,0,1.111722,-37.0964,-14.9165)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7674" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.181829,0,0,1.181829,-69.30058,-21.56258)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7676" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.485788,0,0,1.485788,-180.3604,-63.50353)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7818);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7678" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.485788,0,0,1.485788,-180.3597,-57.44874)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7802);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7680" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.485788,0,0,1.485788,-177.4064,-63.50356)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7826);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7682" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.485788,0,0,1.485788,-174.4526,-63.50354)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7834);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7684" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.485788,0,0,1.485788,-180.3605,-60.47619)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7810);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7686" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.4858,0,0,1.4858,-177.4101,-57.45014)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7794);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7688" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.485788,0,0,1.485788,-174.4524,-60.47613)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7842);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7692" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.492675,0,0,1.492675,-177.0357,-58.39903)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7786);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7694" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.191739,0,0,1.191739,-64.1566,-13.84799)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7696" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.181973,0,0,1.181973,-57.53942,-15.52772)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7698" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.20571,0,0,1.20571,-78.25832,-15.77568)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7700" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.193386,0,0,1.193386,-70.68201,-14.07527)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7702" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.121575,0,0,1.121575,-40.79199,-4.166495)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7704" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(1.20571,0,0,1.20571,-66.44314,-15.77568)" sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7706" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> +<path transform="matrix(6.75293,0,0,6.75293,-2153.081,-787.2478)" sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient7778);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2773579;marker:none;visibility:visible;display:inline;" id="use7690" sodipodi:cx="375.0941" sodipodi:cy="137.9821" sodipodi:rx="1.111868" sodipodi:ry="1.111868" d="m 376.206,137.9821 c 0,0.6138 -0.4982,1.1119 -1.1119,1.1119 -0.6138,0 -1.1119,-0.4981 -1.1119,-1.1119 0,-0.6137 0.4981,-1.1119 1.1119,-1.1119 0.6137,0 1.1119,0.4982 1.1119,1.1119 z" inkscape:tile-x0="373.9822" inkscape:tile-y0="136.8702" /> </g> </g> <g inkscape:label="#node_symmetric" transform="translate(725.0198,-119.9465)" id="node_auto"> @@ -3148,4 +3205,89 @@ http://www.inkscape.org/</dc:description> <rect style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" id="rect5385" width="16" height="16" x="-45" y="175" /> <rect transform="matrix(2.790265e-6,-1,1,-2.867107e-6,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect5387" width="4.966394" height="4.950177" x="-188.4831" y="-39.47938" ry="2.475089" /> </g> +<g id="toggle_snap_global"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6" width="16" height="16" x="620" y="30" /> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-0" width="16" height="16" x="620" y="30.00057" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2" width="3.584063" height="3.621212" x="415.401" y="462.0515" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2-8" width="3.584063" height="3.621212" x="415.401" y="476.282" /> +<path id="path9093" d="m 631,41 0,-4 -4,4 4,0" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" inkscape:transform-center-y="-2.12133" inkscape:transform-center-x="1.414208" y="466.7135" x="416.693" height="7.962208" width="1" id="rect9095" style="fill:#000000;fill-opacity:1;stroke:none" /> +</g> +<g id="toggle_snap_bbox"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-4" width="16" height="16" x="638" y="30" /> +<path id="path9141" d="m 641,46 0,-13 13,0" style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:2.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2-2" width="3.584063" height="3.621212" x="428.1289" y="474.691" /> +</g> +<g id="toggle_snap_to_bbox_path"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-5" width="16" height="16" x="656" y="30.00057" /> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-0-1" width="16" height="16" x="656" y="30.00114" /> +<path id="path9141-9" d="m 669,30 0,13 -13,0" style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:2.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +</g> +<g id="toggle_snap_to_bbox_node"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-4-0" width="16" height="16" x="674" y="30.00057" /> +<path id="path9141-9-2" d="m 687,30 0,13 -13,0" style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:2.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2-8-6" width="3.584063" height="3.621212" x="453.5847" y="514.3773" /> +</g> +<g id="toggle_snap_nodes"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-7" width="16" height="16" x="692" y="30.00057" /> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-0-8" width="16" height="16" x="692" y="30.00114" /> +<path sodipodi:nodetypes="ccsc" id="path6308" d="m 693,38 c 0,0 0,-5 7,-5 -4,5 -2.25,8 0.5,9.75 2.75,1.75 6.5,2.25 6.5,2.25" style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2-9" width="3.584063" height="3.621212" x="469.8239" y="516.5415" /> +</g> +<g id="toggle_snap_to_paths"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-4-8" width="16" height="16" x="710" y="30.00057" /> +<path sodipodi:nodetypes="ccsc" id="path6308-6" d="m 725,39 c 0,0 0,5 -7,5 4,-5 2.25,-8 -0.5,-9.75 C 714.75,32.5 711,32 711,32" style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +</g> +<g id="toggle_snap_to_nodes"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-74" width="16" height="16" x="728" y="30.00057" /> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-0-19" width="16" height="16" x="728" y="30.00114" /> +<path sodipodi:nodetypes="ccsc" id="path6308-6-3" d="m 743,38 c 0,0 0,5 -7,5 4,-5 2.25,-8 -0.5,-9.75 C 732.75,31.5 729,31 729,31" style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<rect transform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2-8-6-5" width="3.584063" height="3.621212" x="488.233" y="549.0256" /> +</g> +<g id="toggle_snap_to_smooth_nodes"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-4-09" width="16" height="16" x="746" y="30.00057" /> +<path sodipodi:nodetypes="ccsc" id="path6308-6-3-2" d="m 761,38 c 0,0 0,5 -7,5 4,-5 2.25,-8 -0.5,-9.75 C 750.75,31.5 747,31 747,31" style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<rect transform="matrix(0,-1,1,0,0,0)" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:0.9051017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" id="rect3224-2-8-6-5-6" width="3.584063" height="3.621212" x="-35.08406" y="751.8788" /> +</g> +<g id="toggle_snap_to_midpoints"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.1;marker:none;display:inline" id="rect5385-6-5-8" width="16" height="16" x="764" y="30.00114" /> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.1;marker:none;display:inline" id="rect5385-6-0-1-8" width="16" height="16" x="764" y="30.00171" /> +<path id="path6507" d="M 765,45 779,31" style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path transform="matrix(0.8749999,0,0,0.875,112.6876,9.126711)" d="m 755.5,33 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" sodipodi:ry="2" sodipodi:rx="2" sodipodi:cy="33" sodipodi:cx="753.5" id="path6530" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:1.1428572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="arc" /> +<g transform="matrix(1.5,0,0,1.5,-383.9324,-21.06763)" id="g6242"> +<path style="color:#000000;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:0.6666667px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 766.7737,40.68077 1,4" id="path6218" /> +<path style="color:#000000;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:0.6666667px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 767.9558,39.58974 1,4" id="path6218-9" /> +</g> +<g id="g6242-2" transform="matrix(1.5,0,0,1.5,-375.4835,-29.48977)"> +<path style="color:#000000;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:0.6666667px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 766.7737,40.68077 1,4" id="path6218-2" /> +<path style="color:#000000;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:0.6666667px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 767.9558,39.58974 1,4" id="path6218-9-6" /> +</g> +</g> +<g id="toggle_snap_to_path_intersections"> +<g id="g6774"> +<rect y="30.00114" x="782" height="16" width="16" id="rect5385-6-4-0-5" style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" /> +<path style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="M 783,45 797,31" id="path6507-9" /> +<path style="color:#000000;fill:none;stroke:#646464;stroke-width:1.0000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 783,40 14,-4" id="path6507-9-3" /> +<path sodipodi:type="arc" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:1.1428572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path6530-3" sodipodi:cx="753.5" sodipodi:cy="33" sodipodi:rx="2" sodipodi:ry="2" d="m 755.5,33 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" transform="matrix(0.8749999,0,0,0.875,130.6876,9.127)" /> +</g> +</g> +<g id="toggle_snap_center"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-7-8" width="16" height="16" x="800" y="30.00114" /> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-0-8-4" width="16" height="16" x="800" y="30.00171" /> +<path id="path9141-9-0" d="m 813,30 0,13 -13,0" style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:2.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path id="path6380" d="m 805,31.5 0,3" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path id="path6380-4" d="m 805,35.5 0,3" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path id="path6380-8" d="m 801.5,35 3,0" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path id="path6380-4-0" d="m 805.5,35 3,0" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;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 id="toggle_snap_page_border"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-4-8-3" width="16" height="16" x="818" y="30.00114" /> +<path sodipodi:nodetypes="ccccc" id="path3805-7" d="m 820.7689,31.00114 10.4622,0 0,14 -10.4622,0 0,-14 z" style="color:#000000;fill:url(#linearGradient6465);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6467);stroke-width:1.0000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;display:inline" /> +</g> +<g id="toggle_snap_grid_guide_intersections"> +<rect style="color:#000000;fill:none;stroke:none;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;display:inline" id="rect5385-6-4-8-3-1" width="16" height="16" x="836" y="30.00057" /> +<path id="path6498-9-0" d="m 851,37 -14,0" style="color:#000000;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#0065ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path id="path6498-1" d="m 841.5822,45.57303 4.8364,-15.14606" style="color:#000000;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:#0065ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<path transform="matrix(0.8749999,0,0,0.875,185.0073,8.125)" d="m 755.5,33 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" sodipodi:ry="2" sodipodi:rx="2" sodipodi:cy="33" sodipodi:cx="753.5" id="path6530-3-7" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#008000;stroke-width:1.1428572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="arc" /> +</g> </svg> diff --git a/share/keys/default.xml b/share/keys/default.xml index c52e45608..0fa71c1e1 100644 --- a/share/keys/default.xml +++ b/share/keys/default.xml @@ -238,8 +238,8 @@ override) the bindings in the main default.xml. <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # --> <bind key="numbersign" action="ToggleGrid" display="true"/> - <bind key="percent" action="ToggleSnapping" display="true"/> <!-- # --> - <bind key="percent" modifiers="Shift" action="ToggleSnapping" /> + <bind key="percent" action="ToggleSnapGlobal" display="true"/> <!-- % --> + <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" /> <bind action="ViewNew"/> <bind action="ViewNewPreview"/> diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml index e5ef7d430..49423c0aa 100644 --- a/share/keys/inkscape.xml +++ b/share/keys/inkscape.xml @@ -235,8 +235,8 @@ override) the bindings in the main default.xml. <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # --> <bind key="numbersign" action="ToggleGrid" display="true"/> - <bind key="percent" action="ToggleSnapping" display="true"/> <!-- # --> - <bind key="percent" modifiers="Shift" action="ToggleSnapping" /> + <bind key="percent" action="ToggleSnapGlobal" display="true"/> <!-- # --> + <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" /> <bind action="ViewNew"/> <bind action="ViewNewPreview"/> diff --git a/src/desktop.cpp b/src/desktop.cpp index 8b60291ef..85df3af04 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -869,7 +869,7 @@ SPDesktop::next_zoom() \param enable Whether we're going in or out of quick zoom */ -void +void SPDesktop::zoom_quick (bool enable) { if (enable == _quick_zoom_enabled) { @@ -940,7 +940,7 @@ SPDesktop::zoom_quick (bool enable) if (d && d->area() * 2.0 < _quick_zoom_stored_area.area()) { set_display_area(*d, 10); zoomed = true; - } + } } if (!zoomed) { @@ -1325,7 +1325,7 @@ SPDesktop::shutdown() bool SPDesktop::onDeleteUI (GdkEventAny*) { - if(shutdown()) + if(shutdown()) return true; destroyWidget(); @@ -1448,7 +1448,7 @@ void SPDesktop::showGrids(bool show, bool dirty_document) } } -void SPDesktop::toggleSnapping() +void SPDesktop::toggleSnapGlobal() { bool v = namedview->snap_manager.snapprefs.getSnapEnabledGlobally(); Inkscape::XML::Node *repr = SP_OBJECT_REPR(namedview); diff --git a/src/desktop.h b/src/desktop.h index b55d9da01..50041543c 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -289,7 +289,7 @@ struct SPDesktop : public Inkscape::UI::View::View void toggleColorProfAdjust(); void toggleGrids(); - void toggleSnapping(); + void toggleSnapGlobal(); bool gridsEnabled() { return grids_visible; } void showGrids(bool show, bool dirty_document = true); diff --git a/src/ink-action.cpp b/src/ink-action.cpp index acb65d131..7bcb297d3 100644 --- a/src/ink-action.cpp +++ b/src/ink-action.cpp @@ -15,8 +15,6 @@ #include "widgets/button.h" #include "widgets/icon.h" - - static void ink_action_class_init( InkActionClass* klass ); static void ink_action_init( InkAction* action ); static void ink_action_finalize( GObject* obj ); @@ -354,7 +352,8 @@ InkToggleAction* ink_toggle_action_new( const gchar *name, const gchar *label, const gchar *tooltip, const gchar *inkId, - Inkscape::IconSize size ) + Inkscape::IconSize size, + SPAttributeEnum attr) { GObject* obj = (GObject*)g_object_new( INK_TOGGLE_ACTION_TYPE, "name", name, @@ -362,8 +361,10 @@ InkToggleAction* ink_toggle_action_new( const gchar *name, "tooltip", tooltip, "iconId", inkId, "iconSize", Inkscape::getRegisteredIconSize(size), + //"SP_ATTR_INKSCAPE", attr, // Why doesn't this work and do I need to use g_object_set_data below? NULL ); + g_object_set_data(obj, "SP_ATTR_INKSCAPE", GINT_TO_POINTER(attr)); InkToggleAction* action = INK_TOGGLE_ACTION( obj ); return action; diff --git a/src/ink-action.h b/src/ink-action.h index ed3c92511..7b48d40af 100644 --- a/src/ink-action.h +++ b/src/ink-action.h @@ -8,6 +8,7 @@ #include <gtk/gtkradioaction.h> #include <glib-object.h> #include "icon-size.h" +#include "attributes.h" /* Equivalent to GTK Actions of the same type, but can support Inkscape SVG icons */ @@ -78,7 +79,8 @@ InkToggleAction* ink_toggle_action_new( const gchar *name, const gchar *label, const gchar *tooltip, const gchar *inkId, - Inkscape::IconSize size ); + Inkscape::IconSize size, + SPAttributeEnum attr = SP_ATTR_INVALID); /* --------------------------------------------------------------- */ diff --git a/src/interface.cpp b/src/interface.cpp index 2242e6224..b14e14c60 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -130,7 +130,7 @@ static void sp_ui_drag_leave( GtkWidget *widget, static void sp_ui_menu_item_set_sensitive(SPAction *action, unsigned int sensitive, void *data); -static void sp_ui_menu_item_set_name(SPAction *action, +static void sp_ui_menu_item_set_name(SPAction *action, Glib::ustring name, void *data); static void sp_recent_open(GtkRecentChooser *, gpointer); @@ -159,21 +159,21 @@ sp_create_window(SPViewWidget *vw, gboolean editable) if (editable) { g_object_set_data(G_OBJECT(vw), "window", win); - + SPDesktopWidget *desktop_widget = reinterpret_cast<SPDesktopWidget*>(vw); SPDesktop* desktop = desktop_widget->desktop; - + desktop_widget->window = win; win->set_data("desktop", desktop); win->set_data("desktopwidget", desktop_widget); - + win->signal_delete_event().connect(sigc::mem_fun(*(SPDesktop*)vw->view, &SPDesktop::onDeleteUI)); win->signal_window_state_event().connect(sigc::mem_fun(*desktop, &SPDesktop::onWindowStateEvent)); win->signal_focus_in_event().connect(sigc::mem_fun(*desktop_widget, &SPDesktopWidget::onFocusInEvent)); - + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - gint prefs_geometry = + gint prefs_geometry = (2==prefs->getInt("/options/savewindowgeometry/value", 0)); if (prefs_geometry) { gint pw = prefs->getInt("/desktop/geometry/width", -1); @@ -827,6 +827,8 @@ sp_ui_checkboxes_menus(GtkMenu *m, Inkscape::UI::View::View *view) // checkitem_toggled, checkitem_update, 0); sp_ui_menu_append_check_item_from_verb(m, view, _("Commands Bar"), _("Show or hide the Commands bar (under the menu)"), "commands", checkitem_toggled, checkitem_update, 0); + sp_ui_menu_append_check_item_from_verb(m, view, _("Snap controls Bar"), _("Show or hide the snapping controls"), "snaptoolbox", + checkitem_toggled, checkitem_update, 0); sp_ui_menu_append_check_item_from_verb(m, view, _("Tool Controls Bar"), _("Show or hide the Tool Controls bar"), "toppanel", checkitem_toggled, checkitem_update, 0); sp_ui_menu_append_check_item_from_verb(m, view, _("_Toolbox"), _("Show or hide the main toolbox (on the left)"), "toolbox", @@ -924,7 +926,7 @@ sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, Inkscape::UI: // sort most recently used documents first to preserve previous behavior gtk_recent_chooser_set_sort_type(GTK_RECENT_CHOOSER(recent_menu), GTK_RECENT_SORT_MRU); g_signal_connect(G_OBJECT(recent_menu), "item-activated", G_CALLBACK(sp_recent_open), (gpointer) NULL); - + // add filter to only open files added by Inkscape GtkRecentFilter *inkscape_only_filter = gtk_recent_filter_new(); gtk_recent_filter_add_application(inkscape_only_filter, g_get_prgname()); @@ -932,7 +934,7 @@ sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, Inkscape::UI: GtkWidget *recent_item = gtk_menu_item_new_with_mnemonic(_("Open _Recent")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent_item), recent_menu); - + gtk_menu_append(GTK_MENU(menu), GTK_WIDGET(recent_item)); continue; } @@ -1129,7 +1131,7 @@ sp_ui_drag_data_received(GtkWidget *widget, sp_desktop_apply_css_recursive( item, css, true ); item->updateRepr(); - sp_document_done( doc , SP_VERB_NONE, + sp_document_done( doc , SP_VERB_NONE, _("Drop color")); if ( srgbProf ) { @@ -1183,7 +1185,7 @@ sp_ui_drag_data_received(GtkWidget *widget, if (!consumed && item) { bool fillnotstroke = (drag_context->action != GDK_ACTION_MOVE); - if (fillnotstroke && + if (fillnotstroke && (SP_IS_SHAPE(item) || SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item))) { Path *livarot_path = Path_for_item(item, true, true); livarot_path->ConvertWithBackData(0.04); @@ -1200,7 +1202,7 @@ sp_ui_drag_data_received(GtkWidget *widget, SP_OBJECT_STYLE (item)->stroke_width.computed * to_2geom(sp_item_i2d_affine(item)).descrim() * 0.5 : 0.0) - + prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + + prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); if (Geom::L2 (delta) < stroke_tolerance) { fillnotstroke = false; @@ -1215,7 +1217,7 @@ sp_ui_drag_data_received(GtkWidget *widget, sp_desktop_apply_css_recursive( item, css, true ); item->updateRepr(); - sp_document_done( doc , SP_VERB_NONE, + sp_document_done( doc , SP_VERB_NONE, _("Drop color")); } } @@ -1271,7 +1273,7 @@ sp_ui_drag_data_received(GtkWidget *widget, } Inkscape::GC::release(newgroup); - sp_document_done(doc, SP_VERB_NONE, + sp_document_done(doc, SP_VERB_NONE, _("Drop SVG")); break; } @@ -1329,7 +1331,7 @@ sp_ui_drag_data_received(GtkWidget *widget, desktop->currentLayer()->appendChildRepr(newImage); Inkscape::GC::release(newImage); - sp_document_done( doc , SP_VERB_NONE, + sp_document_done( doc , SP_VERB_NONE, _("Drop bitmap image")); break; } @@ -1466,7 +1468,7 @@ sp_ui_menu_item_set_name(SPAction */*action*/, Glib::ustring name, void *data) gtk_label_set_markup_with_mnemonic(GTK_LABEL (child), name.c_str()); } else if (GTK_IS_HBOX(child)) { gtk_label_set_markup_with_mnemonic( - GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (child))->data), + GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (child))->data), name.c_str()); }//else sp_ui_menu_append_item_from_verb has been modified and can set //a menu item in yet another way... diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 86ffa8e21..c31ff63cd 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -113,7 +113,7 @@ static char const menus_skeleton[] = " <separator/>\n" " <verb verb-id=\"ToggleGrid\" />\n" " <verb verb-id=\"ToggleGuides\" />\n" -" <verb verb-id=\"ToggleSnapping\" />\n" +" <verb verb-id=\"ToggleSnapGlobal\" />\n" " <verb verb-id=\"ViewCmsToggle\" />\n" " <separator/>\n" " <submenu name=\"" N_("Show/Hide") "\">\n" diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 1c8287fe0..1d17613c6 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -10,6 +10,7 @@ static char const preferences_skeleton[] = " <group id=\"window\">\n" " <group id=\"menu\" state=\"1\"/>\n" " <group id=\"commands\" state=\"1\"/>\n" +" <group id=\"snaptoolbox\" state=\"1\"/>\n" " <group id=\"toppanel\" state=\"1\"/>\n" " <group id=\"toolbox\" state=\"1\"/>\n" " <group id=\"statusbar\" state=\"1\"/>\n" @@ -20,6 +21,7 @@ static char const preferences_skeleton[] = " <group id=\"fullscreen\">\n" " <group id=\"menu\" state=\"1\"/>\n" " <group id=\"commands\" state=\"1\"/>\n" +" <group id=\"snaptoolbox\" state=\"1\"/>\n" " <group id=\"toppanel\" state=\"1\"/>\n" " <group id=\"toolbox\" state=\"1\"/>\n" " <group id=\"statusbar\" state=\"1\"/>\n" @@ -30,6 +32,7 @@ static char const preferences_skeleton[] = " <group id=\"focus\">\n" " <group id=\"menu\" state=\"0\"/>\n" " <group id=\"commands\" state=\"0\"/>\n" +" <group id=\"snaptoolbox\" state=\"0\"/>\n" " <group id=\"toppanel\" state=\"0\"/>\n" " <group id=\"toolbox\" state=\"0\"/>\n" " <group id=\"statusbar\" state=\"0\"/>\n" @@ -248,7 +251,7 @@ static char const preferences_skeleton[] = " <group id=\"wheelzooms\" value=\"0\"/>\n" " <group id=\"transientpolicy\" value=\"1\"/>\n" " <group id=\"scrollingacceleration\" value=\"0.4\"/>\n" -" <group id=\"snapdelay\" value=\"150\"/>\n" +" <group id=\"snapdelay\" value=\"150\"/>\n" " <group id=\"snapweight\" value=\"0.5\"/>\n" " <group id=\"snapclosestonly\" value=\"0\"/>\n" " <group id=\"snapindicator\" value=\"1\"/>\n" diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp index 9f025120e..ce73888ed 100644 --- a/src/sp-shape.cpp +++ b/src/sp-shape.cpp @@ -1074,7 +1074,7 @@ static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p, Inkscape:: Geom::Matrix const i2d (sp_item_i2d_affine (item)); for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) { - *p = from_2geom(path_it->initialPoint() * i2d); + *p = path_it->initialPoint() * i2d; Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve @@ -1090,13 +1090,13 @@ static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p, Inkscape:: // Depending on the snapping preferences, either add only cusp nodes, or add add both cusp and smooth nodes if (snapprefs->getSnapSmoothNodes() || nodetype == Geom::NODE_NONE || nodetype == Geom::NODE_CUSP) { - *p = from_2geom(curve_it1->finalPoint() * i2d); + *p = curve_it1->finalPoint() * i2d; } // Consider midpoints of line segments for snapping if (snapprefs->getSnapMidpoints()) { - if (Geom::LineSegment const* line_segment = dynamic_cast<Geom::LineSegment const*>(&(*curve_it1))) { - *p = from_2geom(Geom::middle_point(*line_segment) * i2d); + if (Geom::LineSegment const* line_segment = dynamic_cast<Geom::LineSegment const*>(&(*curve_it1))) { + *p = Geom::middle_point(*line_segment) * i2d; } } @@ -1111,7 +1111,7 @@ static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p, Inkscape:: if (cs.size() > 0) { // There might be multiple intersections... for (Geom::Crossings::const_iterator i = cs.begin(); i != cs.end(); i++) { Geom::Point p_ix = (*path_it).pointAt((*i).ta); - *p = from_2geom(p_ix * i2d); + *p = p_ix * i2d; } } } diff --git a/src/verbs.cpp b/src/verbs.cpp index c84a17da6..262ec4884 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -629,11 +629,11 @@ Verb::sensitive(SPDocument *in_doc, bool in_sensitive) return; } -/** \brief Accessor to get the tooltip for verb as localised string */ +/** \brief Accessor to get the tooltip for verb as localised string */ gchar const * -Verb::get_tip (void) +Verb::get_tip (void) { - return _(_tip); + return _(_tip); } void @@ -1244,7 +1244,7 @@ LayerVerb::perform(SPAction *action, void *data, void */*pdata*/) sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_DUPLICATE, _("Duplicate layer")); - + // TRANSLATORS: this means "The layer has been duplicated." dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Duplicated layer.")); } else { @@ -1697,8 +1697,8 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) sp_namedview_toggle_guides(doc, repr); break; case SP_VERB_TOGGLE_SNAPPING: - dt->toggleSnapping(); - break; + dt->toggleSnapGlobal(); + break; case SP_VERB_TOGGLE_GRID: dt->toggleGrids(); break; @@ -2565,7 +2565,7 @@ Verb *Verb::_base_verbs[] = { new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), "scrollbars"), new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), "grid"), new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), "guides"), - new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapping", N_("Snap"), N_("Toggle snapping on or off"), NULL), + new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Toggle snapping on or off"), NULL), new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"), "zoom_next"), new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"), diff --git a/src/verbs.h b/src/verbs.h index 2524aefef..28812dde6 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -38,7 +38,7 @@ enum { SP_VERB_FILE_REVERT, /**< Revert this file to its original state. */ SP_VERB_FILE_SAVE, /**< Save the current file with its saved filename */ SP_VERB_FILE_SAVE_AS, /**< Save the current file with a new filename */ - SP_VERB_FILE_SAVE_A_COPY, /**< Save a copy of the current file */ + SP_VERB_FILE_SAVE_A_COPY, /**< Save a copy of the current file */ SP_VERB_FILE_PRINT, SP_VERB_FILE_VACUUM, SP_VERB_FILE_PRINT_PREVIEW, diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index c80c1b4e7..a64d53bb6 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -48,6 +48,7 @@ #include "widgets/spw-utilities.h" #include "widgets/spinbutton-events.h" #include "widgets/layer-selector.h" +#include "widgets/toolbox.h" #include "ui/dialog/dialog-manager.h" #include "ui/widget/dock.h" #include "ui/widget/selected-style.h" @@ -325,6 +326,9 @@ sp_desktop_widget_init (SPDesktopWidget *dtw) dtw->aux_toolbox = sp_aux_toolbox_new (); gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->aux_toolbox, FALSE, TRUE, 0); + dtw->snap_toolbox = sp_snap_toolbox_new (); + gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->snap_toolbox, FALSE, TRUE, 0); + dtw->commands_toolbox = sp_commands_toolbox_new (); gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->commands_toolbox, FALSE, TRUE, 0); @@ -1210,6 +1214,12 @@ sp_desktop_widget_layout (SPDesktopWidget *dtw) gtk_widget_show_all (dtw->commands_toolbox); } + if (!prefs->getBool(pref_root + "snaptoolbox/state", true)) { + gtk_widget_hide_all (dtw->snap_toolbox); + } else { + gtk_widget_show_all (dtw->snap_toolbox); + } + if (!prefs->getBool(pref_root + "toppanel/state", true)) { gtk_widget_hide_all (dtw->aux_toolbox); } else { @@ -1345,6 +1355,7 @@ sp_desktop_widget_new (SPNamedView *namedview) sp_tool_toolbox_set_desktop (dtw->tool_toolbox, dtw->desktop); sp_aux_toolbox_set_desktop (dtw->aux_toolbox, dtw->desktop); sp_commands_toolbox_set_desktop (dtw->commands_toolbox, dtw->desktop); + sp_snap_toolbox_set_desktop (dtw->snap_toolbox, dtw->desktop); return SP_VIEW_WIDGET (dtw); } @@ -1406,7 +1417,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge { SPNamedView *nv=SP_NAMEDVIEW(obj); if (flags & SP_OBJECT_MODIFIED_FLAG) { - dtw->dt2r = 1.0 / nv->doc_units->unittobase; + dtw->dt2r = 1.0 / nv->doc_units->unittobase; dtw->ruler_origin = Geom::Point(0,0); //nv->gridorigin; Why was the grid origin used here? sp_ruler_set_metric (GTK_RULER (dtw->vruler), nv->getDefaultMetric()); @@ -1416,6 +1427,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge gtk_tooltips_set_tip (dtw->tt, dtw->vruler_box, gettext(sp_unit_get_plural (nv->doc_units)), NULL); sp_desktop_widget_update_rulers (dtw); + update_snap_toolbox(dtw->desktop, NULL, dtw->snap_toolbox); } } diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h index 51c9141de..3c6434efa 100644 --- a/src/widgets/desktop-widget.h +++ b/src/widgets/desktop-widget.h @@ -84,7 +84,7 @@ struct SPDesktopWidget { GtkWidget *hscrollbar, *vscrollbar, *vscrollbar_box; - GtkWidget *tool_toolbox, *aux_toolbox, *commands_toolbox; + GtkWidget *tool_toolbox, *aux_toolbox, *commands_toolbox, *snap_toolbox; /* Rulers */ GtkWidget *hruler, *vruler; diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index e6929fcff..171fb00cf 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -66,7 +66,7 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel) using Geom::Y; if ( sel && !sel->isEmpty() ) { int prefs_bbox = prefs->getInt("/tools/bounding_box", 0); - SPItem::BBoxType bbox_type = (prefs_bbox ==0)? + SPItem::BBoxType bbox_type = (prefs_bbox ==0)? SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX; Geom::OptRect const bbox(sel->bounds(bbox_type)); if ( bbox ) { @@ -157,7 +157,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) sp_document_ensure_up_to_date (document); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int prefs_bbox = prefs->getInt("/tools/bounding_box"); - SPItem::BBoxType bbox_type = (prefs_bbox ==0)? + SPItem::BBoxType bbox_type = (prefs_bbox ==0)? SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX; Geom::OptRect bbox = selection->bounds(bbox_type); diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index c2e80db78..4b3ea042f 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -475,7 +475,6 @@ static void update_aux_toolbox (SPDesktop *desktop, SPEventContext *eventcontext static void setup_commands_toolbox (GtkWidget *toolbox, SPDesktop *desktop); static void update_commands_toolbox (SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox); - GtkWidget * sp_toolbox_button_new_from_verb_with_doubleclick( GtkWidget *t, Inkscape::IconSize size, SPButtonType type, Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb, Inkscape::UI::View::View *view, GtkTooltips *tt); @@ -897,6 +896,34 @@ sp_commands_toolbox_new() return hb; } +GtkWidget * +sp_snap_toolbox_new() +{ + GtkWidget *tb = gtk_vbox_new(FALSE, 0); + gtk_box_set_spacing(GTK_BOX(tb), AUX_SPACING); + g_object_set_data(G_OBJECT(tb), "desktop", NULL); + + //GtkWidget *tb = gtk_toolbar_new(); + //g_object_set_data(G_OBJECT(tb), "desktop", NULL); + + gtk_widget_set_sensitive(tb, FALSE); + + GtkWidget *hb = gtk_handle_box_new(); + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(hb), GTK_POS_LEFT); + gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(hb), GTK_SHADOW_OUT); + gtk_handle_box_set_snap_edge(GTK_HANDLE_BOX(hb), GTK_POS_LEFT); + + gtk_container_add(GTK_CONTAINER(hb), tb); + gtk_widget_show(GTK_WIDGET(tb)); + + sigc::connection* conn = new sigc::connection; + g_object_set_data(G_OBJECT(hb), "event_context_connection", conn); + + g_signal_connect(G_OBJECT(hb), "child_detached", G_CALLBACK(handlebox_detached), static_cast<gpointer>(0)); + g_signal_connect(G_OBJECT(hb), "child_attached", G_CALLBACK(handlebox_attached), static_cast<gpointer>(0)); + + return hb; +} static EgeAdjustmentAction * create_adjustment_action( gchar const *name, gchar const *label, gchar const *shortLabel, gchar const *tooltip, @@ -1547,6 +1574,18 @@ sp_commands_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop) "event_context_connection"))); } +void +sp_snap_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop) +{ + toolbox_set_desktop(toolbox, + desktop, + setup_snap_toolbox, + update_snap_toolbox, + static_cast<sigc::connection*>(g_object_get_data(G_OBJECT(toolbox), + "event_context_connection"))); +} + + static void toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop, SetupFunction setup_func, UpdateFunction update_func, sigc::connection *conn) { @@ -1709,12 +1748,12 @@ setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) g_free( tmp ); tmp = 0; - Inkscape::IconSize toolboxSize = prefToSize("/toolbox/small"); if ( prefs->getBool( "/toolbox/icononly", true) ) { gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); } - gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), static_cast<GtkIconSize>(toolboxSize) ); + Inkscape::IconSize toolboxSize = prefToSize("/toolbox/small"); + gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), static_cast<GtkIconSize>(toolboxSize) ); gtk_table_attach( GTK_TABLE(holder), toolBar, 0, 1, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0 ); @@ -1834,6 +1873,383 @@ update_commands_toolbox(SPDesktop */*desktop*/, SPEventContext */*eventcontext*/ { } +void toggle_snap_callback (GtkToggleAction *act, gpointer data) { //data points to the toolbox + + if (g_object_get_data(G_OBJECT(data), "freeze" )) { + return; + } + + gpointer ptr = g_object_get_data(G_OBJECT(data), "desktop"); + g_assert(ptr != NULL); + + SPDesktop *dt = reinterpret_cast<SPDesktop*>(ptr); + SPNamedView *nv = sp_desktop_namedview(dt); + + if (dt == NULL || nv == NULL) { + g_warning("No desktop or namedview specified (in toggle_snap_callback)!"); + return; + } + + Inkscape::XML::Node *repr = SP_OBJECT_REPR(nv); + + if (repr == NULL) { + g_warning("This namedview doesn't have a xml representation attached!"); + return; + } + + bool v = false; + SPAttributeEnum attr = (SPAttributeEnum) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(act), "SP_ATTR_INKSCAPE")); + + switch (attr) { + case SP_ATTR_INKSCAPE_SNAP_GLOBAL: + dt->toggleSnapGlobal(); + break; + case SP_ATTR_INKSCAPE_SNAP_BBOX: + v = nv->snap_manager.snapprefs.getSnapModeBBox(); + sp_repr_set_boolean(repr, "inkscape:snap-bbox", !v); + break; + case SP_ATTR_INKSCAPE_BBOX_PATHS: + v = nv->snap_manager.object.getSnapToBBoxPath(); + sp_repr_set_boolean(repr, "inkscape:bbox-paths", !v); + break; + case SP_ATTR_INKSCAPE_BBOX_NODES: + v = nv->snap_manager.object.getSnapToBBoxNode(); + sp_repr_set_boolean(repr, "inkscape:bbox-nodes", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_NODES: + v = nv->snap_manager.snapprefs.getSnapModeNode(); + sp_repr_set_boolean(repr, "inkscape:snap-nodes", !v); + break; + case SP_ATTR_INKSCAPE_OBJECT_PATHS: + v = nv->snap_manager.object.getSnapToItemPath(); + sp_repr_set_boolean(repr, "inkscape:object-paths", !v); + break; + case SP_ATTR_INKSCAPE_OBJECT_NODES: + v = nv->snap_manager.object.getSnapToItemNode(); + sp_repr_set_boolean(repr, "inkscape:object-nodes", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_SMOOTH_NODES: + v = nv->snap_manager.snapprefs.getSnapSmoothNodes(); + sp_repr_set_boolean(repr, "inkscape:snap-smooth-nodes", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_MIDPOINTS: + v = nv->snap_manager.snapprefs.getSnapMidpoints(); + sp_repr_set_boolean(repr, "inkscape:snap-midpoints", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_INTERS_PATHS: + v = nv->snap_manager.snapprefs.getSnapIntersectionCS(); + sp_repr_set_boolean(repr, "inkscape:snap-intersection-paths", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_CENTER: + v = nv->snap_manager.snapprefs.getIncludeItemCenter(); + sp_repr_set_boolean(repr, "inkscape:snap-center", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_PAGE: + v = nv->snap_manager.object.getSnapToPageBorder(); + sp_repr_set_boolean(repr, "inkscape:snap-page", !v); + break; + case SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE: + v = nv->snap_manager.snapprefs.getSnapIntersectionGG(); + sp_repr_set_boolean(repr, "inkscape:snap-intersection-grid-guide", !v); + break; + default: + g_warning("toggle_snap_callback has been called with an ID for which no action has been defined"); + break; + } + + // The snapping preferences are stored in the document, and therefore toggling makes the document dirty + SPDocument *doc = SP_OBJECT_DOCUMENT(nv); + doc->setModifiedSinceSave(); +} + +void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop) +{ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + Glib::RefPtr<Gtk::ActionGroup> mainActions = create_or_fetch_actions(desktop); + + gchar const * descr = + "<ui>" + " <toolbar name='SnapToolbar'>" + " <toolitem action='ToggleSnapGlobal' />" + " <separator />" + " <toolitem action='ToggleSnapFromBBoxCorner' />" + " <toolitem action='ToggleSnapToBBoxPath' />" + " <toolitem action='ToggleSnapToBBoxNode' />" + " <separator />" + " <toolitem action='ToggleSnapFromNode' />" + " <toolitem action='ToggleSnapToItemPath' />" + " <toolitem action='ToggleSnapToItemNode' />" + " <toolitem action='ToggleSnapToSmoothNodes' />" + " <toolitem action='ToggleSnapToPathIntersections' />" + " <toolitem action='ToggleSnapToFromCenter' />" + " <separator />" + " <toolitem action='ToggleSnapToPageBorder' />" + " <toolitem action='ToggleSnapToGridGuideIntersections' />" + " <toolitem action='ToggleSnapToFromMidpoints' />" + " </toolbar>" + "</ui>"; + + Inkscape::IconSize secondarySize = prefToSize("/toolbox/secondary", 1); + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapGlobal", // "name" + _("Snap"), // "label" + _("Toggle all snapping"), // "tooltip" + "toggle_snap_global", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_GLOBAL); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapFromBBoxCorner",// "name" + _("Bounding box"), // "label" + _("Toggle snapping of bounding box corners"), // "tooltip" + "toggle_snap_bbox", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_BBOX); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToBBoxPath", // "name" + _("Bounding box edges"), // "label" + _("Toggle snapping to edges of a bounding box"), // "tooltip" + "toggle_snap_to_bbox_path", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_BBOX_PATHS); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToBBoxNode", // "name" + _("Bounding box corners"), // "label" + _("Toggle snapping to bounding box corners"), // "tooltip" + "toggle_snap_to_bbox_node", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_BBOX_NODES); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapFromNode", // "name" + _("Nodes"), // "label" + _("Toggle snapping of nodes"), // "tooltip" + "toggle_snap_nodes", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_NODES); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToItemPath", // "name" + _("Paths"), // "label" + _("Toggle snapping to paths"), // "tooltip" + "toggle_snap_to_paths", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_OBJECT_PATHS); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToItemNode", // "name" + _("To nodes"), // "label" + _("Toggle snapping to nodes"), // "tooltip" + "toggle_snap_to_nodes", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_OBJECT_NODES); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToSmoothNodes", // "name" + _("Smooth nodes"), // "label" + _("Toggle snapping to smooth nodes"), // "tooltip" + "toggle_snap_to_smooth_nodes", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_SMOOTH_NODES); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromMidpoints", // "name" + _("Midpoints"), // "label" + _("Toggle snapping from and to midpoints of line segments and bounding boxes"), // "tooltip" + "toggle_snap_to_midpoints", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_MIDPOINTS); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToPathIntersections", // "name" + _("Path intersections"), // "label" + _("Toggle snapping to path intersections"), // "tooltip" + "toggle_snap_to_path_intersections", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_INTERS_PATHS); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromCenter",// "name" + _("Center"), // "label" + _("Toggle snapping from and to an item's rotation center"), // "tooltip" + "toggle_snap_center", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_CENTER); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToPageBorder", // "name" + _("Page border"), // "label" + _("Toggle snapping to the page border"), // "tooltip" + "toggle_snap_page_border", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_PAGE); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + { + InkToggleAction* act = ink_toggle_action_new("ToggleSnapToGridGuideIntersections", // "name" + _("Grid/guide intersections"), // "label" + _("Toggle snapping to intersections of a grid with a guide"), // "tooltip" + "toggle_snap_grid_guide_intersections", // "iconId" + secondarySize, + SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE); + + gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox ); + } + + GtkUIManager* mgr = gtk_ui_manager_new(); + GError* errVal = 0; + + gtk_ui_manager_insert_action_group( mgr, mainActions->gobj(), 0 ); + gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal ); + + GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, "/ui/SnapToolbar" ); + if ( prefs->getBool("/toolbox/icononly", true) ) { + gtk_toolbar_set_style( GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS ); + } + + Inkscape::IconSize toolboxSize = prefToSize("/toolbox/secondary"); + gtk_toolbar_set_icon_size( GTK_TOOLBAR(toolBar), static_cast<GtkIconSize>(toolboxSize) ); + + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolBar), GTK_ORIENTATION_HORIZONTAL); + gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolBar), TRUE); + + g_object_set_data(G_OBJECT(toolBar), "desktop", NULL); + + GtkWidget* child = gtk_bin_get_child(GTK_BIN(toolbox)); + if ( child ) { + gtk_container_remove( GTK_CONTAINER(toolbox), child ); + } + + gtk_container_add( GTK_CONTAINER(toolbox), toolBar ); + +} + +void update_snap_toolbox(SPDesktop *desktop, SPEventContext */*eventcontext*/, GtkWidget *toolbox) +{ + g_assert(desktop != NULL); + g_assert(toolbox != NULL); + + SPNamedView *nv = sp_desktop_namedview(desktop); + if (nv == NULL) { + g_warning("Namedview cannot be retrieved (in update_snap_toolbox)!"); + return; + } + + Glib::RefPtr<Gtk::ActionGroup> mainActions = create_or_fetch_actions(desktop); + + Glib::RefPtr<Gtk::Action> act1 = mainActions->get_action("ToggleSnapGlobal"); + Glib::RefPtr<Gtk::Action> act2 = mainActions->get_action("ToggleSnapFromBBoxCorner"); + Glib::RefPtr<Gtk::Action> act3 = mainActions->get_action("ToggleSnapToBBoxPath"); + Glib::RefPtr<Gtk::Action> act4 = mainActions->get_action("ToggleSnapToBBoxNode"); + Glib::RefPtr<Gtk::Action> act5 = mainActions->get_action("ToggleSnapFromNode"); + Glib::RefPtr<Gtk::Action> act6 = mainActions->get_action("ToggleSnapToItemPath"); + Glib::RefPtr<Gtk::Action> act7 = mainActions->get_action("ToggleSnapToItemNode"); + Glib::RefPtr<Gtk::Action> act8 = mainActions->get_action("ToggleSnapToSmoothNodes"); + Glib::RefPtr<Gtk::Action> act10 = mainActions->get_action("ToggleSnapToPathIntersections"); + Glib::RefPtr<Gtk::Action> act11 = mainActions->get_action("ToggleSnapToFromCenter"); + Glib::RefPtr<Gtk::Action> act12 = mainActions->get_action("ToggleSnapToPageBorder"); + Glib::RefPtr<Gtk::Action> act13 = mainActions->get_action("ToggleSnapToGridGuideIntersections"); + Glib::RefPtr<Gtk::Action> act14 = mainActions->get_action("ToggleSnapToFromMidpoints"); + + + if (!act1) { + return; // The snap actions haven't been defined yet (might be the case during startup) + } + + // The ..._set_active calls below will toggle the buttons, but this shouldn't lead to + // changes in our document because we're only updating the UI; + // Setting the "freeze" parameter to true will block the code in toggle_snap_callback() + g_object_set_data(G_OBJECT(toolbox), "freeze", GINT_TO_POINTER(TRUE)); + + bool const c1 = nv->snap_manager.snapprefs.getSnapEnabledGlobally(); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act1->gobj()), c1); + + bool const c2 = nv->snap_manager.snapprefs.getSnapModeBBox(); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act2->gobj()), c2); + gtk_action_set_sensitive(GTK_ACTION(act2->gobj()), c1); + + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act3->gobj()), nv->snap_manager.object.getSnapToBBoxPath()); + gtk_action_set_sensitive(GTK_ACTION(act3->gobj()), c1 && c2); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act4->gobj()), nv->snap_manager.object.getSnapToBBoxNode()); + gtk_action_set_sensitive(GTK_ACTION(act4->gobj()), c1 && c2); + + bool const c3 = nv->snap_manager.snapprefs.getSnapModeNode(); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act5->gobj()), c3); + gtk_action_set_sensitive(GTK_ACTION(act5->gobj()), c1); + + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act6->gobj()), nv->snap_manager.object.getSnapToItemPath()); + gtk_action_set_sensitive(GTK_ACTION(act6->gobj()), c1 && c3); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act7->gobj()), nv->snap_manager.object.getSnapToItemNode()); + gtk_action_set_sensitive(GTK_ACTION(act7->gobj()), c1 && c3); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act8->gobj()), nv->snap_manager.snapprefs.getSnapSmoothNodes()); + gtk_action_set_sensitive(GTK_ACTION(act8->gobj()), c1 && c3); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act10->gobj()), nv->snap_manager.snapprefs.getSnapIntersectionCS()); + gtk_action_set_sensitive(GTK_ACTION(act10->gobj()), c1 && c3); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act11->gobj()), nv->snap_manager.snapprefs.getIncludeItemCenter()); + gtk_action_set_sensitive(GTK_ACTION(act11->gobj()), c1 && c3); + + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act12->gobj()), nv->snap_manager.object.getSnapToPageBorder()); + gtk_action_set_sensitive(GTK_ACTION(act12->gobj()), c1); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act13->gobj()), nv->snap_manager.snapprefs.getSnapIntersectionGG()); + gtk_action_set_sensitive(GTK_ACTION(act13->gobj()), c1); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act14->gobj()), nv->snap_manager.snapprefs.getSnapMidpoints()); + gtk_action_set_sensitive(GTK_ACTION(act14->gobj()), c1); + + + g_object_set_data(G_OBJECT(toolbox), "freeze", GINT_TO_POINTER(FALSE)); // unfreeze (see above) +} + void show_aux_toolbox(GtkWidget *toolbox_toplevel) { gtk_widget_show(toolbox_toplevel); @@ -3918,7 +4334,7 @@ static void update_presets_list (GObject *tbl) int ege_index = 1; for (std::vector<Glib::ustring>::iterator i = presets.begin(); i != presets.end(); ++i, ++ege_index) { bool match = true; - + std::vector<Inkscape::Preferences::Entry> preset = prefs->getAllEntries(*i); for (std::vector<Inkscape::Preferences::Entry>::iterator j = preset.begin(); j != preset.end(); ++j) { Glib::ustring entry_name = j->getEntryName(); @@ -3945,7 +4361,7 @@ static void update_presets_list (GObject *tbl) } } } - + if (match) { // newly added item is at the same index as the // save command, so we need to change twice for it to take effect @@ -4068,12 +4484,12 @@ static void sp_dcc_build_presets_list(GObject *tbl) gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, 0, _("No preset"), 1, 0, -1 ); } - + // iterate over all presets to populate the list Inkscape::Preferences *prefs = Inkscape::Preferences::get(); std::vector<Glib::ustring> presets = prefs->getAllDirs("/tools/calligraphic/preset"); int ii=1; - + for (std::vector<Glib::ustring>::iterator i = presets.begin(); i != presets.end(); ++i) { GtkTreeIter iter; Glib::ustring preset_name = prefs->getString(*i + "/name"); @@ -4118,13 +4534,13 @@ static void sp_dcc_save_profile (GtkWidget */*widget*/, GObject *tbl) } g_object_set_data(tbl, "presets_blocked", GINT_TO_POINTER(TRUE)); - + // If there's a preset with the given name, find it and set save_path appropriately std::vector<Glib::ustring> presets = prefs->getAllDirs("/tools/calligraphic/preset"); int total_presets = presets.size(); int new_index = -1; Glib::ustring save_path; // profile pref path without a trailing slash - + int temp_index = 0; for (std::vector<Glib::ustring>::iterator i = presets.begin(); i != presets.end(); ++i, ++temp_index) { Glib::ustring name = prefs->getString(*i + "/name"); @@ -4196,7 +4612,7 @@ static void sp_ddc_change_profile(EgeSelectOneAction* act, GObject* tbl) { if (!preset_path.empty()) { g_object_set_data(tbl, "presets_blocked", GINT_TO_POINTER(TRUE)); //temporarily block the selector so no one will updadte it while we're reading it - + std::vector<Inkscape::Preferences::Entry> preset = prefs->getAllEntries(preset_path); // Shouldn't this be std::map? @@ -5367,9 +5783,9 @@ sp_text_toolbox_selection_changed (Inkscape::Selection */*selection*/, GObject * // If querying returned nothing, read the style from the text tool prefs (default style for new texts) if (result_family == QUERY_STYLE_NOTHING || result_style == QUERY_STYLE_NOTHING || result_numbers == QUERY_STYLE_NOTHING) { // there are no texts in selection, read from prefs - + sp_style_read_from_prefs(query, "/tools/text"); - + if (g_object_get_data(tbl, "text_style_from_prefs")) { // do not reset the toolbar style from prefs if we already did it last time sp_style_unref(query); diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h index a4d6f21a5..4bc417e8f 100644 --- a/src/widgets/toolbox.h +++ b/src/widgets/toolbox.h @@ -29,6 +29,11 @@ void sp_aux_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop); GtkWidget *sp_commands_toolbox_new (); void sp_commands_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop); +GtkWidget *sp_snap_toolbox_new (); +void sp_snap_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop); +void update_snap_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox); +void setup_snap_toolbox (GtkWidget *toolbox, SPDesktop *desktop); + void show_aux_toolbox(GtkWidget *toolbox); GtkWidget *sp_toolbox_button_normal_new_from_verb(GtkWidget *t, |
