Merge install logo into chrome.png. Display faction logos on install screen

This commit is contained in:
Paul Chote
2011-05-19 23:36:27 +12:00
parent f577525fad
commit 939a667229
7 changed files with 84 additions and 124 deletions

View File

@@ -19,7 +19,34 @@
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
id="defs4">
<marker
style="overflow:visible;"
id="Arrow1Lend"
refX="0.0"
refY="0.0"
orient="auto"
inkscape:stockid="Arrow1Lend">
<path
transform="scale(0.8) rotate(180) translate(12.5,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
id="path4339" />
</marker>
<marker
style="overflow:visible"
id="TriangleOutL"
refX="0.0"
refY="0.0"
orient="auto"
inkscape:stockid="TriangleOutL">
<path
transform="scale(0.8)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
id="path4479" />
</marker>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -27,9 +54,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="251.37687"
inkscape:cy="137.00729"
inkscape:zoom="4"
inkscape:cx="211.37687"
inkscape:cy="457.00729"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -48,7 +75,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -454,5 +481,29 @@
d="m 350.91976,886.3592 -16.53766,0.78287 -30.6411,-6.78638 c 2.17824,-4.04198 4.61773,-7.85508 7.3136,-11.40463 z m 23.99227,-12.26492 -9.55349,0.28995 -42.3932,-18.5176 c 1.82739,-1.65213 3.71453,-3.22311 5.58994,-4.76587 z m -32.9261,131.22512 C 304.77282,985.96029 286.40279,944.57782 294.49125,905.31013 l 56.10283,38.08292 11.29046,24.64584 10.71149,5.79899 2.60549,11.88796 -3.18449,5.21904 6.07949,16.81722 0.28949,-14.49759 20.26495,0.28998 14.47498,13.04781 -12.44849,-21.16643 -15.05395,-0.28998 -9.55349,-38.85343 44.58291,10.43826 5.21098,14.49756 -15.34347,2.89957 21.42296,0.28998 13.60648,-19.13682 -10.42199,-20.00714 -34.16091,-20.29653 43.71439,-20.00661 -103.98118,-51.5943 c 25.75821,-13.99095 57.72797,-15.29758 85.6659,-0.76362 44.65965,23.23301 62.2154,78.21842 39.16884,123.35181 -23.4335,45.18758 -78.6889,62.69188 -123.54898,39.35478 z m -4.69886,9.0606 c -49.85632,-25.9364 -69.27996,-87.44216 -43.38392,-137.37623 25.89604,-49.93408 87.30547,-69.38799 137.1618,-43.45159 49.63361,25.82056 69.14462,86.92993 43.53123,137.09005 -26.04336,50.22037 -87.45278,69.67407 -137.30911,43.73777 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccsccccccccccccccccccccccscsssscs" />
<g
transform="translate(128,-381.99999)"
id="layer1-36"
inkscape:label="Layer 1">
<path
sodipodi:open="true"
sodipodi:end="9.424778"
sodipodi:start="3.1499891"
transform="matrix(1.9954016,0,0,1.4804587,-42.183894,874.77148)"
d="M 22.143954,94.833844 C 22.288037,86.254008 36.315502,79.357078 53.475173,79.42912 70.634844,79.501162 84.428703,86.514895 84.28462,95.09473 84.140536,103.67457 70.113071,110.5715 52.9534,110.49945 35.89552,110.42784 22.142858,103.49353 22.142859,94.964286"
sodipodi:ry="15.535714"
sodipodi:rx="31.071428"
sodipodi:cy="94.964287"
sodipodi:cx="53.214287"
id="path2985"
style="fill:none;stroke:#800000;stroke-width:1.16363478;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="rect4963"
d="m 55.5,936.36218 17,0 0,40 13.5,0 -22,33.37502 -21.894,-33.37502 13.394,0 z"
style="fill:#2b0000;fill-opacity:0.87843137;stroke:#800000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@@ -1,107 +0,0 @@
<?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"
version="1.1"
inkscape:version="0.48.1 r9760"
sodipodi:docname="install.svg"
inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/install.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<marker
inkscape:stockid="TriangleOutL"
orient="auto"
refY="0.0"
refX="0.0"
id="TriangleOutL"
style="overflow:visible">
<path
id="path4479"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
transform="scale(0.8)" />
</marker>
<marker
inkscape:stockid="Arrow1Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Lend"
style="overflow:visible;">
<path
id="path4339"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
transform="scale(0.8) rotate(180) translate(12.5,0)" />
</marker>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8284271"
inkscape:cx="35.668421"
inkscape:cy="60.097918"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1626"
inkscape:window-height="1006"
inkscape:window-x="54"
inkscape:window-y="22"
inkscape:window-maximized="0"
showguides="true"
inkscape:guide-bbox="true" />
<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:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-924.36218)">
<path
sodipodi:type="arc"
style="fill:none;fill-opacity:0.87843137999999998;stroke:#800000;stroke-width:1.16363477999999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2985"
sodipodi:cx="53.214287"
sodipodi:cy="94.964287"
sodipodi:rx="31.071428"
sodipodi:ry="15.535714"
d="m 22.143954,94.833844 a 31.071428,15.535714 0 1 1 -0.0011,0.130442"
transform="matrix(1.9954016,0,0,1.4804587,-42.183894,874.77148)"
sodipodi:start="3.1499891"
sodipodi:end="9.424778"
sodipodi:open="true" />
<path
style="fill:#2b0000;fill-opacity:0.87843137;stroke:#800000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 55.5,936.36218 17,0 0,40 13.5,0 -22,33.37502 -21.894,-33.37502 13.394,0 z"
id="rect4963"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -1,8 +1,10 @@
shellmap: reticle.png
reticle: 0,0,512,512
install: install.png
logo:0,0,128,128
logos: chrome.png
install:128,0,128,128
nod-load:0,256,256,256
gdi-load:256,256,256,256
button: chrome.png
background: 2,194,60,60

View File

@@ -1,8 +1,22 @@
Background@INSTALL_BACKGROUND:
Container@INSTALL_BACKGROUND:
Id:INSTALL_BACKGROUND
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
Background:shellmapborder
Children:
Image@NOD:
X:WINDOW_RIGHT/3-256
Y:(WINDOW_BOTTOM-256)/2
ImageCollection:logos
ImageName:nod-load
Image@NOD:
X:2*WINDOW_RIGHT/3
Y:(WINDOW_BOTTOM-256)/2
ImageCollection:logos
ImageName:gdi-load
Background:
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Background:shellmapborder
Container@INSTALL_PANEL:
Id:INSTALL_PANEL
@@ -27,8 +41,8 @@ Container@INSTALL_PANEL:
Image@INSTALL:
X:11
Y:11
ImageCollection: install
ImageName: logo
ImageCollection:logos
ImageName:install
Label@INFO:
X:170
Y:35
@@ -95,8 +109,8 @@ Container@INSTALL_FROMCD_PANEL:
Image@INSTALL:
X:11
Y:11
ImageCollection: install
ImageName: logo
ImageCollection:logos
ImageName:install
ProgressBar@PROGRESS_BAR:
Id:PROGRESS_BAR
X:170
@@ -148,8 +162,8 @@ Container@INSTALL_DOWNLOAD_PANEL:
Image@INSTALL:
X:11
Y:11
ImageCollection: install
ImageName: logo
ImageCollection:logos
ImageName:install
ProgressBar@PROGRESS_BAR:
Id:PROGRESS_BAR
X:170

View File

@@ -212,8 +212,8 @@ Container@INSTALL_MUSIC_PANEL:
Image@INSTALL:
X:11
Y:11
ImageCollection: install
ImageName: logo
ImageCollection:logos
ImageName:install
ProgressBar@PROGRESS_BAR:
Id:PROGRESS_BAR
X:170

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB