diff --git a/artsrc/cnc/chrome.svg b/artsrc/cnc/chrome.svg index a61a2b35d6..d8d624cc19 100644 --- a/artsrc/cnc/chrome.svg +++ b/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 @@ image/svg+xml - + @@ -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" /> + + + + + + + + diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 02a663a1b7..e2c1977762 100644 --- a/mods/cnc/chrome.yaml +++ b/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 diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index 967e0a6b3f..74f134c4a1 100644 --- a/mods/cnc/chrome/music.yaml +++ b/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: diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index f521ec7035..89371080b5 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ diff --git a/mods/cnc/uibits/musicplayer.png b/mods/cnc/uibits/musicplayer.png deleted file mode 100644 index 79d5c60dad..0000000000 Binary files a/mods/cnc/uibits/musicplayer.png and /dev/null differ