root dir tidying: cleanup inkscape icons

- move inkscape.ico -> share/branding (it's an icon but it should not end up in an icon theme in share/icons, so this seemed like a better choice) and update depentans (.rc files and NSIS installer)
- remove inkscape.png as it was only used by Doxyfile and is mostly redundant to the files in share/icons/application (todo: maybe re-create those files and include a 64x64 size)
- use inkscape.svg in Doxyfile (confirmed working). It's a bit too large but looks much nicer than any of the smaller icons in share/icons/application (the recommended maximum size is 55 px height which looks ugly though and is obviously too small, the optimum seems to be somewhere around 70 px)
- also remove one of the two flat icons in share/branding which were duplicates (the smaller file was kept but renamed)

10 files changed, 14 insertions, 72 deletions

diff --git a/Doxyfile b/Doxyfile
index 1850b0b09..f5db13c15 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = inkscape
+PROJECT_NAME           = Inkscape
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Vector Graphics Editor"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = inkscape.png
+PROJECT_LOGO           = share/branding/inkscape.svg
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/inkscape.png b/inkscape.png
deleted file mode 100644
index 30eaff2e4..000000000
--- a/inkscape.png
+++ /dev/null
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 525df2294..42cf108de 100644
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -66,7 +66,7 @@ RequestExecutionLevel admin
 !include MUI.nsh
 ; MUI Configuration {{{4
 !define MUI_ABORTWARNING
-!define MUI_ICON ..\..\inkscape.ico
+!define MUI_ICON ..\..\share\branding\inkscape.ico
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP header.bmp
diff --git a/share/branding/inkscape-flat.svg b/share/branding/inkscape-flat.svg
index a9534676d..4c1ef03ac 100644
--- a/share/branding/inkscape-flat.svg
+++ b/share/branding/inkscape-flat.svg
@@ -1,58 +1,9 @@
 <?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="128" height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.91+devel r14706 custom" sodipodi:docname="inkscape-flat.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/valessio/Desenvolvimento/inkscape/inkscape/inkscape.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" viewBox="0 0 128 128">
-<title id="title7387">Inkscape Logo</title>
-<sodipodi:namedview bordercohor="#666666" inkscape:window-height="577" inkscape:window-width="862" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:zoom="1" inkscape:cx="-232" inkscape:cy="64" inkscape:window-x="192" inkscape:window-y="122" inkscape:current-layer="svg2" showgrid="false" inkscape:window-maximized="0" inkscape:document-units="px" />
-<defs id="defs4" />
-<style type="text/css" id="style26">
-	.specularity {opacity:0.5;}
-	.low-specularity {opacity:0.25;}
-	.full-specularity {opacity:1;}
-	.black {fill:#000000;}
-	.white {fill:#ffffff;}
-	.outline-big {stroke-width:16;stroke:none;opacity:0.1;fill:none;}
-	.outline-small {stroke-width:8;stroke:none;opacity:0.2;fill:none;}
-	.stroke-highlight {fill:none;stroke:none;opacity:0.2;}
-       	.base-shadow 	{fill:black;opacity:75;}
-	</style>
-<!-- Copyright License -->
-<metadata id="metadata49">
-<rdf:RDF>
-<cc:Work rdf:about="etiquette-icon">
-<dc:format>image/svg+xml</dc:format>
-<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-<dc:creator>
-<cc:Agent>
-<dc:title>Andy Fitzsimon</dc:title>
-</cc:Agent>
-</dc:creator>
-<dc:rights>
-<cc:Agent>
-<dc:title>Andrew Michael Fitzsimon</dc:title>
-</cc:Agent>
-</dc:rights>
-<dc:publisher>
-<cc:Agent>
-<dc:title>Fitzsimon IT Consulting Pty Ltd</dc:title>
-</cc:Agent>
-</dc:publisher>
-<dc:identifier>http://andy.fitzsimon.com.au</dc:identifier>
-<dc:date>2006</dc:date>
-<cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-<dc:title>Inkscape Logo</dc:title>
-</cc:Work>
-<cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-<cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-<cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-<cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-</cc:License>
-</rdf:RDF>
-</metadata>
-<g id="inkscape-logo" transform="matrix(0.3432319,0,0,0.3432319,-2.915043,-2.66029)">
-<path d="M 163.15,27.83 28.81,165.3 C -16.58,221.51 59.7,214.97 92.4,231.16 104.13,243.15 47.44,252 59.17,264 c 11.73,11.99 70.93,23.1 82.68,35.09 11.73,11.99 -24.01,24.71 -12.28,36.7 11.73,11.99 38.86,0.63 43.94,28.31 3.62,19.78 48.89,8.5 71.03,-7.7 11.73,-12 -22.44,-10.87 -10.71,-22.86 29.17,-29.83 56.33,-10.84 66.31,-40.73 4.93,-14.77 -42.94,-22.77 -31.19,-34.76 33.75,-19.71 150.4,-32.54 95.05,-87.89 L 224.75,27.83 c -17.03,-16.35 -45.45,-16.53 -61.6,0 z m 154.31,264.98 c 0,6.82 50.25,11.29 50.25,-1.61 -7.16,-20.72 -44.31,-19.32 -50.25,1.61 z M 91.1,329.05 c 11.9,10.29 30.28,-2.56 35.79,-16.92 -11.53,-15.32 -54.69,0.55 -35.79,16.92 z m 220.06,-22.23 c -15.34,13.76 1.72,27.72 16.84,18.83 3.37,-3.42 -0.09,-15.41 -16.84,-18.83 z" id="path2313" inkscape:connector-curvature="0" />
-<path d="m 131,238.6 c 3.59,2.23 57.89,13.26 71.16,15.46 4.6,0.97 1.34,5.71 -5,8.91 -14.3,3.8 -83.66,-24.37 -66.16,-24.37 z" id="path2315" style="fill:#ffffff" inkscape:connector-curvature="0" />
-<path d="m 216.63,37.47 53.15,53.98 c 5.04,5.15 4.97,15.13 2.15,18 L 245.54,88.34 240.35,119.6 218.3,107.96 182.99,130.27 171.3,83.24 152.33,116.06 h -29 c -11.82,0 -13.21,-15 -2.47,-25.74 18.76,-20.25 40.29,-40.89 51.99,-52.85 11.76,-12.02 32.25,-11.68 43.78,0 z" id="path2317" style="fill:#ffffff" inkscape:connector-curvature="0" />
-</g>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="390" height="390">
+  <g id="inkscape-logo">
+    <path d="M163.15,27.83L28.81,165.3C-16.58,221.51 59.7,214.97 92.4,231.16C104.13,243.15 47.44,252 59.17,264C70.9,275.99 130.1,287.1 141.85,299.09C153.58,311.08 117.84,323.8 129.57,335.79C141.3,347.78 168.43,336.42 173.51,364.1C177.13,383.88 222.4,372.6 244.54,356.4C256.27,344.4 222.1,345.53 233.83,333.54C263,303.71 290.16,322.7 300.14,292.81C305.07,278.04 257.2,270.04 268.95,258.05C302.7,238.34 419.35,225.51 364,170.16L224.75,27.83C207.72,11.48 179.3,11.3 163.15,27.83 zM317.46,292.81C317.46,299.63 367.71,304.1 367.71,291.2C360.55,270.48 323.4,271.88 317.46,292.81 zM91.1,329.05C103,339.34 121.38,326.49 126.89,312.13C115.36,296.81 72.2,312.68 91.1,329.05 zM311.16,306.82C295.82,320.58 312.88,334.54 328,325.65C331.37,322.23 327.91,310.24 311.16,306.82z"/>
+    <path fill="white" d="M131,238.6C134.59,240.83 188.89,251.86 202.16,254.06C206.76,255.03 203.5,259.77 197.16,262.97C182.86,266.77 113.5,238.6 131,238.6z"/>
+    <path fill="white" d="M216.63,37.47L269.78,91.45C274.82,96.6 274.75,106.58 271.93,109.45L245.54,88.34L240.35,119.6L218.3,107.96L182.99,130.27L171.3,83.24L152.33,116.06L123.33,116.06C111.51,116.06 110.12,101.06 120.86,90.32C139.62,70.07 161.15,49.43 172.85,37.47C184.61,25.45 205.1,25.79 216.63,37.47z"/>
+  </g>
 </svg>
diff --git a/inkscape.ico b/share/branding/inkscape.ico
index 185e41463..185e41463 100644
--- a/inkscape.ico
+++ b/share/branding/inkscape.ico
diff --git a/share/branding/inkscape.logo.svg b/share/branding/inkscape.logo.svg
deleted file mode 100644
index 4c1ef03ac..000000000
--- a/share/branding/inkscape.logo.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="390" height="390">
-  <g id="inkscape-logo">
-    <path d="M163.15,27.83L28.81,165.3C-16.58,221.51 59.7,214.97 92.4,231.16C104.13,243.15 47.44,252 59.17,264C70.9,275.99 130.1,287.1 141.85,299.09C153.58,311.08 117.84,323.8 129.57,335.79C141.3,347.78 168.43,336.42 173.51,364.1C177.13,383.88 222.4,372.6 244.54,356.4C256.27,344.4 222.1,345.53 233.83,333.54C263,303.71 290.16,322.7 300.14,292.81C305.07,278.04 257.2,270.04 268.95,258.05C302.7,238.34 419.35,225.51 364,170.16L224.75,27.83C207.72,11.48 179.3,11.3 163.15,27.83 zM317.46,292.81C317.46,299.63 367.71,304.1 367.71,291.2C360.55,270.48 323.4,271.88 317.46,292.81 zM91.1,329.05C103,339.34 121.38,326.49 126.89,312.13C115.36,296.81 72.2,312.68 91.1,329.05 zM311.16,306.82C295.82,320.58 312.88,334.54 328,325.65C331.37,322.23 327.91,310.24 311.16,306.82z"/>
-    <path fill="white" d="M131,238.6C134.59,240.83 188.89,251.86 202.16,254.06C206.76,255.03 203.5,259.77 197.16,262.97C182.86,266.77 113.5,238.6 131,238.6z"/>
-    <path fill="white" d="M216.63,37.47L269.78,91.45C274.82,96.6 274.75,106.58 271.93,109.45L245.54,88.34L240.35,119.6L218.3,107.96L182.99,130.27L171.3,83.24L152.33,116.06L123.33,116.06C111.51,116.06 110.12,101.06 120.86,90.32C139.62,70.07 161.15,49.43 172.85,37.47C184.61,25.45 205.1,25.79 216.63,37.47z"/>
-  </g>
-</svg>
diff --git a/src/inkscape-x64.rc b/src/inkscape-x64.rc
index f5d3b5b99..ae1312d89 100644
--- a/src/inkscape-x64.rc
+++ b/src/inkscape-x64.rc
@@ -1,5 +1,5 @@
 
-APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
+APPLICATION_ICON    ICON          DISCARDABLE     "../share/branding/inkscape.ico"
 1                   24            DISCARDABLE     "./inkscape-manifest-x64.xml"
 
 1 VERSIONINFO
diff --git a/src/inkscape.rc b/src/inkscape.rc
index ddb55ac30..50daf0bda 100644
--- a/src/inkscape.rc
+++ b/src/inkscape.rc
@@ -1,5 +1,5 @@
 
-APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
+APPLICATION_ICON    ICON          DISCARDABLE     "../share/branding/inkscape.ico"
 1                   24            DISCARDABLE     "./inkscape-manifest.xml"
 
 1 VERSIONINFO
diff --git a/src/inkview-x64.rc b/src/inkview-x64.rc
index 397d9710f..c1745095e 100644
--- a/src/inkview-x64.rc
+++ b/src/inkview-x64.rc
@@ -1,5 +1,5 @@
 
-APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
+APPLICATION_ICON    ICON          DISCARDABLE     "../share/branding/inkscape.ico"
 1                   24            DISCARDABLE     "./inkview-manifest-x64.xml"
 
 1 VERSIONINFO
diff --git a/src/inkview.rc b/src/inkview.rc
index 5c439981a..f8a2e2054 100644
--- a/src/inkview.rc
+++ b/src/inkview.rc
@@ -1,5 +1,5 @@
 
-APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
+APPLICATION_ICON    ICON          DISCARDABLE     "../share/branding/inkscape.ico"
 1                   24            DISCARDABLE     "./inkview-manifest.xml"
 
 1 VERSIONINFO