Merge music buttons into chrome.svg

artsrc/cnc/chrome.svg

@@ -14,7 +14,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="ui.svg"
+   sodipodi:docname="chrome.svg"
    inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/chrome.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
@@ -54,14 +54,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="211.37687"
-     inkscape:cy="457.00729"
+     inkscape:zoom="3.6081373"
+     inkscape:cx="289.81961"
+     inkscape:cy="494.58461"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1626"
-     inkscape:window-height="1006"
+     inkscape:window-width="1440"
+     inkscape:window-height="878"
      inkscape:window-x="61"
      inkscape:window-y="22"
      inkscape:window-maximized="0"
@@ -75,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>
@@ -505,5 +505,56 @@
          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>
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3316"
+       width="5"
+       height="16"
+       x="257"
+       y="540.46014" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect4100"
+       width="5"
+       height="16"
+       x="266"
+       y="540.36218" />
+    <rect
+       y="540.36218"
+       x="272"
+       height="16"
+       width="16"
+       id="rect4110"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 288,540.36218 16,8 0,0 -16,8 z"
+       id="rect4114"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path4119"
+       d="m 256,556.36218 8,8 0,0 -8,8 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 264,556.36218 8,8 0,0 -8,8 z"
+       id="path4121"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 288,556.36218 -8,8 0,0 8,8 z"
+       id="path4131"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path4133"
+       d="m 280,556.36218 -8,8 0,0 8,8 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
   </g>
 </svg>

mods/cnc/chrome.yaml

@@ -302,12 +302,12 @@ dialog4: dialog4.png
 	corner-br: 58,58,6,6
 	background: 5,5,52,52
 
-music: musicplayer.png
-	pause: 0,0,25,25
-	stop: 28,0,25,25
-	play: 56,0,25,25
-	next: 84,0,25,25
-	prev: 112,0,25,25
+music: chrome.png
+	pause: 256,0,16,16
+	stop: 272,0,16,16
+	play: 288,0,16,16
+	next: 256,16,16,16
+	prev: 272,16,16,16
 
 scrollbar: buttons.png
 	down_arrow: 16,112,16,16

mods/cnc/chrome/music.yaml

@@ -79,62 +79,72 @@ Container@MUSIC_PANEL:
 					Children:
 						Button@BUTTON_PREV:
 							Id:BUTTON_PREV
-							Width:25
-							Height:25
+							Width:26
+							Height:26
 							Children:
 								Image@IMAGE_PREV:
 									Id:IMAGE_PREV
-									Width:25
-									Height:25
+									X:5
+									Y:5
+									Width:16
+									Height:16
 									ImageCollection:music
 									ImageName:prev
 						Button@BUTTON_PLAY:
 							Id:BUTTON_PLAY
 							X:35
-							Width:25
-							Height:25
+							Width:26
+							Height:26
 							Children:
 								Image@IMAGE_PLAY:
 									Id:IMAGE_PLAY
-									Width:25
-									Height:25
+									X:5
+									Y:5
+									Width:16
+									Height:16
 									ImageCollection:music
 									ImageName:play
 						Button@BUTTON_PAUSE:
 							Id:BUTTON_PAUSE
 							Visible:false
 							X:35
-							Width:25
-							Height:25
+							Width:26
+							Height:26
 							Children:
 								Image@IMAGE_PAUSE:
 									Id:IMAGE_PAUSE
-									Width:25
-									Height:25
+									X:5
+									Y:5
+									Width:16
+									Height:16
 									ImageCollection:music
 									ImageName:pause
 						Button@BUTTON_STOP:
 							Id:BUTTON_STOP
 							X:70
-							Width:25
-							Height:25
+							Width:26
+							Height:26
 							Children:
 								Image@IMAGE_STOP:
 									Id:IMAGE_STOP
-									Width:25
-									Height:25
+									X:5
+									Y:5
+									Width:16
+									Height:16
 									ImageCollection:music
 									ImageName:stop
 						Button@BUTTON_NEXT:
 							Id:BUTTON_NEXT
 							X:105
-							Width:25
-							Height:25
+							Width:26
+							Height:26
 							Children:
 								Image@IMAGE_NEXT:
 									Id:IMAGE_NEXT
-									Width:25
-									Height:25
+									X:5
+									Y:5
+									Width:16
+									Height:16
 									ImageCollection:music
 									ImageName:next									
 						Slider@MUSIC_SLIDER: