diff --git a/artsrc/cnc/chrome.svg b/artsrc/cnc/chrome.svg index c766703357..a61a2b35d6 100644 --- a/artsrc/cnc/chrome.svg +++ b/artsrc/cnc/chrome.svg @@ -19,7 +19,34 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + id="defs4"> + + + + + + + image/svg+xml - + @@ -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" /> + + + + diff --git a/artsrc/cnc/install.svg b/artsrc/cnc/install.svg deleted file mode 100644 index f3818e8458..0000000000 --- a/artsrc/cnc/install.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index e181ebfd22..02a663a1b7 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -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 diff --git a/mods/cnc/chrome/install.yaml b/mods/cnc/chrome/install.yaml index d4cd94f6fb..3ddeb4d036 100644 --- a/mods/cnc/chrome/install.yaml +++ b/mods/cnc/chrome/install.yaml @@ -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 diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index aa7935c862..967e0a6b3f 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -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 diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index 2de102969d..f521ec7035 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ diff --git a/mods/cnc/uibits/install.png b/mods/cnc/uibits/install.png deleted file mode 100644 index cc594aa596..0000000000 Binary files a/mods/cnc/uibits/install.png and /dev/null differ