Icons update

2013-11-13 22:48:55 +01:00 · 2013-11-13 22:48:55 +01:00 · 1c49890bec
commit 1c49890bec
parent 44ed1f293d
32 changed files with 103 additions and 6 deletions
--- a/icons/128x128/apps/fgcom.png
+++ b/icons/128x128/apps/fgcom.png
--- a/icons/128x128/apps/flightgear.png
+++ b/icons/128x128/apps/flightgear.png
--- a/icons/16x16/apps/fgcom.png
+++ b/icons/16x16/apps/fgcom.png
--- a/icons/16x16/apps/flightgear.png
+++ b/icons/16x16/apps/flightgear.png
--- a/icons/22x22/apps/fgcom.png
+++ b/icons/22x22/apps/fgcom.png
--- a/icons/22x22/apps/flightgear.png
+++ b/icons/22x22/apps/flightgear.png
--- a/icons/24x24/apps/fgcom.png
+++ b/icons/24x24/apps/fgcom.png
--- a/icons/24x24/apps/flightgear.png
+++ b/icons/24x24/apps/flightgear.png
--- a/icons/32x32/apps/fgcom.png
+++ b/icons/32x32/apps/fgcom.png
--- a/icons/32x32/apps/flightgear.png
+++ b/icons/32x32/apps/flightgear.png
--- a/icons/48x48/apps/fgcom.png
+++ b/icons/48x48/apps/fgcom.png
--- a/icons/48x48/apps/flightgear.png
+++ b/icons/48x48/apps/flightgear.png
--- a/icons/64x64/apps/fgcom.png
+++ b/icons/64x64/apps/fgcom.png
--- a/icons/64x64/apps/flightgear.png
+++ b/icons/64x64/apps/flightgear.png
--- a/icons/fg-128.png
+++ b/icons/fg-128.png
--- a/icons/fg-16.png
+++ b/icons/fg-16.png
--- a/icons/fg-32.png
+++ b/icons/fg-32.png
--- a/icons/fg-48.png
+++ b/icons/fg-48.png
--- a/icons/fg-64.png
+++ b/icons/fg-64.png
--- a/icons/fgcom-16.png
+++ b/icons/fgcom-16.png
--- a/icons/fgcom-32.png
+++ b/icons/fgcom-32.png
--- a/icons/fgcom.ico
+++ b/icons/fgcom.ico
--- a/icons/flightgear.ico
+++ b/icons/flightgear.ico
--- a/icons/scalable/fgcom.svg
+++ b/icons/scalable/fgcom.svg
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" 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" width="128" height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.48.4 r9939" sodipodi:docname="fgcom.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" inkscape:export-filename="/WIN/G/Misc/FG/fgcom/icon/fgcom_128.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
+  <defs id="defs4" />
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.3336049" inkscape:cx="110.52784" inkscape:cy="63.048433" inkscape:document-units="px" inkscape:current-layer="layer2" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1920" inkscape:window-height="1038" inkscape:window-x="0" inkscape:window-y="13" inkscape:showpageshadow="true" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:snap-page="true" borderlayer="true" inkscape:window-maximized="1">
+    <sodipodi:guide orientation="1,0" position="112,128" id="guide7278" />
+    <sodipodi:guide orientation="0,1" position="128,112" id="guide7280" />
+    <sodipodi:guide orientation="0,1" position="128,16" id="guide7282" />
+    <sodipodi:guide orientation="1,0" position="16,0" id="guide7293" />
+    <sodipodi:guide orientation="1,0" position="48,0" id="guide7343" />
+    <sodipodi:guide position="0,0" orientation="0,128" id="guide7355" />
+    <sodipodi:guide position="128,0" orientation="-128,0" id="guide7357" />
+    <sodipodi:guide position="128,128" orientation="0,-128" id="guide7359" />
+    <sodipodi:guide position="0,128" orientation="128,0" id="guide7361" />
+  </sodipodi:namedview>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license rdf:resource="" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Base" inkscape:groupmode="layer" id="layer1" transform="translate(0,64)">
+    <rect style="fill:#faf8fe;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" id="rect6828" width="80" height="128" x="48" y="0" transform="translate(0,-64)" />
+  </g>
+  <g inkscape:groupmode="layer" id="layer3" inkscape:label="Comms" style="display:inline">
+    <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/jacob/development/fgcomgui/data/images/fgcomgui_small.png" style="fill:#427ebf;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" transform="matrix(0.52338122,0,0,0.52375478,-222.09986,-220.4704)" id="g3758">
+      <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/jacob/development/fgcomgui/data/images/fgcomgui_small.png" transform="matrix(1.0006576,0,0,1.0006576,-85.734152,16.481851)" style="fill:#427ebf;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" id="g3760">
+        <path inkscape:connector-curvature="0" id="path3762" d="m 632.75,422.78125 c -23.48637,0 -46.07407,7.4624 -62.90625,22.03125 C 553.01157,459.38135 542.125,481.15731 542.125,508.75 l 0,22.9375 8.625,0 0,-22.9375 c 0,-25.36368 9.70688,-44.41714 24.75,-57.4375 15.04312,-13.02036 35.58593,-19.9375 57.25,-19.9375 21.89301,-10e-6 42.13585,6.88123 56.8125,19.8125 14.67665,12.93127 24,31.8811 24,57.15625 l 0,23.34375 8.59375,0 0,-23.34375 c 0,-27.4252 -10.42509,-49.10381 -26.90625,-63.625 -16.48116,-14.52119 -38.8111,-21.93751 -62.5,-21.9375 z" style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path inkscape:connector-curvature="0" style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 631.68599,419.97813 c 17.91601,-0.41686 43.51061,5.87041 43.7706,12.48369 l 0,7.46589 c 0,2.42779 -1.55225,4.38227 -3.48043,4.38227 0,0 -16.23205,-6.63584 -40.29017,-6.07615 -23.8291,0.55443 -39.30508,6.07615 -39.30508,6.07615 -1.92818,0 -3.48043,-1.95448 -3.48043,-4.38227 l 0,-7.46589 c 0,-6.53746 24.87474,-12.06702 42.78551,-12.48369 z" id="path3764" sodipodi:nodetypes="ccccccccz" />
+        <rect transform="matrix(0.9998925,-0.01466446,0.02076999,0.9997843,0,0)" ry="6.8694487" rx="8.6039553" y="546.88074" x="514.12274" height="36.342449" width="17.207911" id="rect3766" style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.07505261999999990px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path inkscape:connector-curvature="0" sodipodi:nodetypes="cccsccc" id="path3768" d="m 545.61191,525.8889 c 8.32011,-0.12072 15.12934,5.07222 15.26733,11.64335 -1.57727,13.91576 -0.81202,24.77815 0.81956,39.02881 0.13799,6.57113 -6.44907,11.95844 -14.76918,12.07916 -8.32013,0.12072 -15.12936,-5.07222 -15.26735,-11.64335 l -0.81956,-39.02881 c -0.13798,-6.57113 6.44908,-11.95844 14.7692,-12.07916 z" style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.07504260999999990px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.07505261999999990px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3770" width="17.207911" height="36.342449" x="-749.54053" y="528.34583" rx="8.6039553" ry="6.8694487" transform="matrix(-0.9998925,-0.01466446,-0.02076999,0.9997843,0,0)" />
+        <path inkscape:connector-curvature="0" id="path3772" d="m 718.15625,572.0625 -5.375,0.1875 c 0.33687,10.41939 1.95436,16.21305 1.125,20.1875 -0.41468,1.98723 -1.31446,3.72977 -3.53125,6.0625 -2.21679,2.33273 -5.7713,5.12573 -11.15625,8.6875 -9.58271,6.33832 -14.82228,9.4131 -22.84375,11.25 -8.02147,1.8369 -19.0898,2.40743 -39.71875,3.15625 l 0.1875,5.375 c 20.64945,-0.74956 31.92656,-1.2607 40.75,-3.28125 8.82344,-2.02055 14.92107,-5.60218 24.59375,-12 5.54668,-3.66875 9.39138,-6.62505 12.09375,-9.46875 2.70237,-2.8437 4.25124,-5.69832 4.875,-8.6875 1.24751,-5.97835 -0.68129,-11.61118 -1,-21.46875 z" style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path inkscape:connector-curvature="0" style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.07504260999999990px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 718.30047,525.8889 c -8.32011,-0.12072 -15.12934,5.07222 -15.26733,11.64335 1.57727,13.91576 0.81202,24.77815 -0.81956,39.02881 -0.13799,6.57113 6.44907,11.95844 14.76918,12.07916 8.32013,0.12072 15.12936,-5.07222 15.26735,-11.64335 l 0.81956,-39.02881 c 0.13798,-6.57113 -6.44908,-11.95844 -14.7692,-12.07916 z" id="path3774" sodipodi:nodetypes="cccsccc" />
+        <rect style="fill:#427ebf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="rect3776" width="29.289042" height="18.174417" x="621.42755" y="614.48444" ry="5.6120453" rx="14.213052" />
+      </g>
+    </g>
+  </g>
+  <g inkscape:groupmode="layer" id="layer2" inkscape:label="FG" style="display:inline">
+    <g id="g6047">
+      <rect y="0" x="0" height="128" width="48" id="rect6826" style="display:inline;fill:#fdfe4a;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <rect y="0" x="32" height="16" width="16" id="rect7288" style="fill:#feff47;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path inkscape:connector-curvature="0" d="m 32.25,112 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 16,-112 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 16,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 0,16 -8,0 -8,0 0,8 0,8 8,0 8,0 0,-8 z m 0,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 0,16 -8,0 -8,0 0,8 0,8 8,0 8,0 0,-8 z m 0,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 0,16 -8,0 -8,0 0,8 0,8 8,0 8,0 0,-8 z m 0,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m -16,-16 0,-8 0,-8 -8,0 -8,0 0,8 0,8 8,0 z m 0,-32 0,-8 0,-8 -8,0 -8,0 0,8 0,8 8,0 z m 0,-32 0,-8 0,-8 -8,0 -8,0 0,8 0,8 8,0 z" style="fill:#000000;fill-opacity:1" transform="translate(-32.25,0)" id="path6823" />
+    </g>
+  </g>
+</svg>
--- a/icons/scalable/flightgear.svg
+++ b/icons/scalable/flightgear.svg
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" 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.1" inkscape:version="0.48.4 r9939" width="128" height="128" id="svg2" sodipodi:docname="flightgear.svg" inkscape:export-filename="/WIN/G/Misc/FG/fgcom/icon/ico/flightgear_128.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
+  <metadata id="metadata60">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs58" />
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1038" id="namedview56" showgrid="false" borderlayer="true" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-nodes="true" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:snap-page="true" inkscape:zoom="2.9596211" inkscape:cx="69.644666" inkscape:cy="79.519578" inkscape:window-x="0" inkscape:window-y="13" inkscape:window-maximized="1" inkscape:current-layer="layer1" showguides="true" inkscape:guide-bbox="true">
+    <sodipodi:guide position="0,0" orientation="0,128" id="guide6073" />
+    <sodipodi:guide position="128,0" orientation="-128,0" id="guide6075" />
+    <sodipodi:guide position="128,128" orientation="0,-128" id="guide6077" />
+    <sodipodi:guide position="0,128" orientation="128,0" id="guide6079" />
+    <sodipodi:guide orientation="0,1" position="48,16" id="guide6921" />
+    <sodipodi:guide orientation="0,1" position="48,112" id="guide6923" />
+    <sodipodi:guide orientation="1,0" position="58,108" id="guide6931" />
+    <sodipodi:guide orientation="1,0" position="81,94" id="guide6933" />
+    <sodipodi:guide orientation="1,0" position="120,98" id="guide6935" />
+    <sodipodi:guide orientation="1,0" position="114,72" id="guide6937" />
+    <sodipodi:guide orientation="0,1" position="110,76" id="guide6939" />
+    <sodipodi:guide orientation="0,1" position="118,94" id="guide6957" />
+    <sodipodi:guide orientation="0,1" position="114,58" id="guide6959" />
+    <sodipodi:guide orientation="1,0" position="118,66.074524" id="guide6961" />
+    <sodipodi:guide orientation="0,1" position="81,20" id="guide6965" />
+    <sodipodi:guide orientation="0,1" position="58,108" id="guide6967" />
+    <sodipodi:guide orientation="1,0" position="62,112" id="guide6969" />
+    <sodipodi:guide orientation="1,0" position="77,16" id="guide6971" />
+    <sodipodi:guide orientation="1,0" position="116,94" id="guide6975" />
+    <sodipodi:guide orientation="0,1" position="118,62" id="guide6977" />
+    <sodipodi:guide orientation="0,1" position="118,72" id="guide6979" />
+  </sodipodi:namedview>
+  <g inkscape:groupmode="layer" id="layer1" inkscape:label="base" style="display:inline">
+    <rect y="0" x="0" height="200" width="200" style="fill:#faf8fe;fill-opacity:1;stroke:none" id="rect4" transform="scale(0.64,0.64)" />
+  </g>
+  <g inkscape:groupmode="layer" id="layer2" inkscape:label="F" style="display:inline;opacity:1">
+    <path style="fill:#427ebf;fill-opacity:1;stroke:none;display:inline" d="m 93.75,168.75 c 0,-41.21924 0,-93.695541 0,-137.5 0,-2.946278 3.303722,-6.25 6.25,-6.25 31.25,0 58.99342,0 84.375,0 2.94628,0 6.23758,3.303748 6.25,6.25 0.0212,5.028186 0.003,10.782217 0,15.625 -0.002,2.946278 -3.30372,6.25 -6.25,6.25 -18.37106,0 -54.6875,0 -54.6875,0 l 0,28.125 c 0,0 34.64048,0 51.5625,0 2.94628,0 6.25,3.303722 6.25,6.25 0,5.738844 0,10.674082 0,15.625 0,2.94628 -3.30372,6.25 -6.25,6.25 -15.92553,0 -51.5625,0 -51.5625,0 0,0 0,39.97752 0,59.375 0,2.94628 -3.30372,6.25 -6.25,6.25 -8.19113,0 -15.45494,0.0122 -23.4375,0 -2.946275,-0.005 -6.25,-3.30372 -6.25,-6.25 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssccsssscssss" id="path54" transform="matrix(0.64,0,0,0.64,-2,0)" />
+  </g>
+  <g inkscape:groupmode="layer" id="layer3" inkscape:label="checkers" style="display:inline">
+    <g style="display:inline" id="g6047">
+      <rect y="0" x="0" height="128" width="48" id="rect6826" style="fill:#fdfe4a;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
+      <rect y="0" x="32" height="16" width="16" id="rect7288" style="fill:#feff47;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path inkscape:connector-curvature="0" d="m 32.25,112 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 16,-112 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 16,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 0,16 -8,0 -8,0 0,8 0,8 8,0 8,0 0,-8 z m 0,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 0,16 -8,0 -8,0 0,8 0,8 8,0 8,0 0,-8 z m 0,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m 0,16 -8,0 -8,0 0,8 0,8 8,0 8,0 0,-8 z m 0,16 0,8 0,8 8,0 8,0 0,-8 0,-8 -8,0 z m -16,-16 0,-8 0,-8 -8,0 -8,0 0,8 0,8 8,0 z m 0,-32 0,-8 0,-8 -8,0 -8,0 0,8 0,8 8,0 z m 0,-32 0,-8 0,-8 -8,0 -8,0 0,8 0,8 8,0 z" style="fill:#000000;fill-opacity:1" transform="translate(-32.25,0)" id="path6823" />
+    </g>
+  </g>
+</svg>
--- a/package/Win32-Inno/setupsmall.bmp
+++ b/package/Win32-Inno/setupsmall.bmp
--- a/package/flightgear.ico
+++ b/package/flightgear.ico
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@ -1,10 +1,6 @@

 if (MSVC)
-	if (CMAKE_CL_64)
-		set( RESOURCE_FILE flightgear64.rc )
-	else (CMAKE_CL_64)
-		set( RESOURCE_FILE flightgear.rc )
-	endif (CMAKE_CL_64)
+	set( RESOURCE_FILE flightgear.rc )
 endif (MSVC)

 set(SOURCES
--- a/src/Main/flightgear.ico
+++ b/src/Main/flightgear.ico
--- a/src/Main/flightgear64.ico
+++ b/src/Main/flightgear64.ico
--- a/src/Main/flightgear64.rc
+++ b/src/Main/flightgear64.rc
@ -1 +0,0 @@
-FLIGHTGEAR              ICON                    "flightgear64.ico"
--- a/utils/fgcom/fgcom.ico
+++ b/utils/fgcom/fgcom.ico