From a65021b550a0feb8280a4d348cc340bc745a439f Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 15 May 2011 21:27:21 +1200 Subject: [PATCH] Merge most of the new ui into a single texture --- artsrc/cnc/ui.svg | 426 ++++++++++++++++++++++++++++ mods/cnc/chrome.yaml | 163 +++++------ mods/cnc/uibits/chrome.png | Bin 0 -> 1306 bytes mods/cnc/uibits/dialog.png | Bin 1349 -> 0 bytes mods/cnc/uibits/dialog2.png | Bin 5924 -> 0 bytes mods/cnc/uibits/dialog3.png | Bin 6539 -> 0 bytes mods/cnc/uibits/panel.png | Bin 1244 -> 0 bytes mods/cnc/uibits/shellmap-border.png | Bin 501 -> 0 bytes mods/cnc/uibits/uibuttons.png | Bin 549 -> 0 bytes mods/cnc/uibits/widget-panel.png | Bin 3425 -> 0 bytes 10 files changed, 491 insertions(+), 98 deletions(-) create mode 100644 artsrc/cnc/ui.svg create mode 100644 mods/cnc/uibits/chrome.png delete mode 100644 mods/cnc/uibits/dialog.png delete mode 100644 mods/cnc/uibits/dialog2.png delete mode 100644 mods/cnc/uibits/dialog3.png delete mode 100644 mods/cnc/uibits/panel.png delete mode 100644 mods/cnc/uibits/shellmap-border.png delete mode 100644 mods/cnc/uibits/uibuttons.png delete mode 100644 mods/cnc/uibits/widget-panel.png diff --git a/artsrc/cnc/ui.svg b/artsrc/cnc/ui.svg new file mode 100644 index 0000000000..a0f0b89452 --- /dev/null +++ b/artsrc/cnc/ui.svg @@ -0,0 +1,426 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + panel-darkred + panel-gray + panel-black + panel-scanline + button-hover + button + button-disabled + button-pressed + shellmapborder + + + diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 00ea335f93..b5b18ebf02 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -4,29 +4,51 @@ shellmap: reticle.png install: install.png logo:0,0,128,128 -dialog: uibuttons.png - background: 2,2,60,60 - border-r: 62,2,2,60 - border-l: 0,2,2,60 - border-b: 2,62,60,2 - border-t: 2,0,60,2 - corner-tl: 0,0,2,2 - corner-tr: 62,0,2,2 - corner-bl: 0,62,2,2 - corner-br: 62,62,2,2 +button: chrome.png + background: 2,194,60,60 + border-r: 62,194,2,60 + border-l: 0,194,2,60 + border-b: 2,254,60,2 + border-t: 2,192,60,2 + corner-tl: 0,192,2,2 + corner-tr: 62,192,2,2 + corner-bl: 0,254,2,2 + corner-br: 62,254,2,2 -button-hover: uibuttons.png - background: 2,2,60,60 - border-r: 62,2,2,60 - border-l: 0,2,2,60 - border-b: 2,62,60,2 - border-t: 2,0,60,2 - corner-tl: 0,0,2,2 - corner-tr: 62,0,2,2 - corner-bl: 0,62,2,2 - corner-br: 62,62,2,2 +button-hover: chrome.png + background: 2,130,60,60 + border-r: 62,132,2,60 + border-l: 0,130,2,60 + border-b: 2,190,60,2 + border-t: 2,128,60,2 + corner-tl: 0,128,2,2 + corner-tr: 62,128,2,2 + corner-bl: 0,190,2,2 + corner-br: 62,190,2,2 -button-disabled: uibuttons.png +button-disabled: chrome.png + background: 66,130,60,60 + border-r: 126,130,2,60 + border-l: 64,130,2,60 + border-b: 66,190,60,2 + border-t: 66,128,60,2 + corner-tl: 64,128,2,2 + corner-tr: 126,128,2,2 + corner-bl: 64,190,2,2 + corner-br: 126,190,2,2 + +button-pressed: chrome.png + background: 66,194,60,60 + border-r: 126,194,2,60 + border-l: 64,194,2,60 + border-b: 66,254,60,2 + border-t: 66,192,60,2 + corner-tl: 64,192,2,2 + corner-tr: 126,192,2,2 + corner-bl: 64,254,2,2 + corner-br: 126,254,2,2 + +panel-black: chrome.png background: 66,2,60,60 border-r: 126,2,2,60 border-l: 64,2,2,60 @@ -37,18 +59,7 @@ button-disabled: uibuttons.png corner-bl: 64,62,2,2 corner-br: 126,62,2,2 -button-pressed: uibuttons.png - background: 66,66,60,60 - border-r: 126,66,2,60 - border-l: 64,66,2,60 - border-b: 66,126,60,2 - border-t: 66,64,60,2 - corner-tl: 64,64,2,2 - corner-tr: 126,64,2,2 - corner-bl: 64,126,2,2 - corner-br: 126,126,2,2 - -button: uibuttons.png +panel-darkred: chrome.png background: 2,66,60,60 border-r: 62,66,2,60 border-l: 0,66,2,60 @@ -59,18 +70,7 @@ button: uibuttons.png corner-bl: 0,126,2,2 corner-br: 62,126,2,2 -dialog2: panel.png - background: 2,66,60,60 - border-r: 62,66,2,60 - border-l: 0,66,2,60 - border-b: 2,126,60,2 - border-t: 2,64,60,2 - corner-tl: 0,64,2,2 - corner-tr: 62,64,2,2 - corner-bl: 0,126,2,2 - corner-br: 62,126,2,2 - -dialog3: panel.png +panel-gray: chrome.png background: 66,66,60,60 border-r: 126,66,2,60 border-l: 64,66,2,60 @@ -81,49 +81,27 @@ dialog3: panel.png corner-bl: 64,126,2,2 corner-br: 126,126,2,2 -panel-black: panel.png - background: 66,2,60,60 - border-r: 126,2,2,60 - border-l: 64,2,2,60 - border-b: 66,62,60,2 - border-t: 66,0,60,2 - corner-tl: 64,0,2,2 - corner-tr: 126,0,2,2 - corner-bl: 64,62,2,2 - corner-br: 126,62,2,2 +panel-scanline: chrome.png + background: 2,2,60,60 + border-r: 62,2,2,60 + border-l: 0,2,2,60 + border-b: 2,62,60,2 + border-t: 2,0,60,2 + corner-tl: 0,0,2,2 + corner-tr: 62,0,2,2 + corner-bl: 0,62,2,2 + corner-br: 62,62,2,2 -panel-darkred: panel.png - background: 2,66,60,60 - border-r: 62,66,2,60 - border-l: 0,66,2,60 - border-b: 2,126,60,2 - border-t: 2,64,60,2 - corner-tl: 0,64,2,2 - corner-tr: 62,64,2,2 - corner-bl: 0,126,2,2 - corner-br: 62,126,2,2 - -panel-gray: panel.png - background: 66,66,60,60 - border-r: 126,66,2,60 - border-l: 64,66,2,60 - border-b: 66,126,60,2 - border-t: 66,64,60,2 - corner-tl: 64,64,2,2 - corner-tr: 126,64,2,2 - corner-bl: 64,126,2,2 - corner-br: 126,126,2,2 - -panel-scanline: panel.png - background: 130,2,60,60 - border-r: 190,2,2,60 - border-l: 128,2,2,60 - border-b: 130,62,60,2 - border-t: 130,0,60,2 - corner-tl: 128,0,2,2 - corner-tr: 190,0,2,2 - corner-bl: 128,62,2,2 - corner-br: 190,62,2,2 +shellmapborder: chrome.png + border-t: 161,128,62,33 + border-b: 161,223,62,33 + border-l: 128,161,33,62 + border-r: 223,161,33,62 + corner-tl: 128,128,33,33 + corner-tr: 223,128,33,33 + corner-bl: 128,223,33,33 + corner-br: 223,223,33,33 + background: 161,161,62,62 dialog4: dialog4.png border-t: 5,0,52,6 @@ -136,17 +114,6 @@ dialog4: dialog4.png corner-br: 58,58,6,6 background: 5,5,52,52 -shellmapborder: shellmap-border.png - border-t: 33,0,62,33 - border-b: 33,95,62,33 - border-l: 0,33,33,62 - border-r: 95,33,33,62 - corner-tl: 0,0,33,33 - corner-tr: 95,0,33,33 - corner-bl: 0,95,33,33 - corner-br: 95,95,33,33 - background: 33,33,62,62 - music: musicplayer.png pause: 0,0,25,25 stop: 28,0,25,25 diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png new file mode 100644 index 0000000000000000000000000000000000000000..fafbaf3bb57904921b466e9970a708dcc6692edb GIT binary patch literal 1306 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIGvQXMsm# zF;M+=5N34Jm|X!Blq_+LC<)F_D=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEDo&~#51 z$B>FSZ*LsjnA|GrdQp4&ryplHnT#4v`ZuXWsXSDvN-}CtsPa>9vMJ;{9$LMYrDVR> zEvu!+@9x!qv(+x)&FSBNBkmtK_gVHo!=HZ@d*aLM*S?Raxchg@zQ(oBAAj7ypm2(* zgMES-cS0=#Pb9-fhD<Yxo-!xfSFbZs|09Wi&`(Ji_cTn{|U7Lz_-R1w-a$hHLBx zCa?*!}z0shUdQ+X2rc`{&#+l+xl!qhZ(E~uDp(WDZlXg-hYw%>VBPVx1zR{ z5I<~qe)n#Ex%_MAX?FW-z3uH|&)Z)Y@AQL70(Y)*K0-AbW|YuPgg4CTUiF?e%VkKzRnG64!_l=ltB< z)VvY~=c3falGGH1^30M91$R&10EPTKg+vA4#N_rB<<1NYEYm$*978H@y`5zrd^QMwx&(&2c6*#Wsn4LVqzvyO;76()4 z>Sep$ZrfxLHYo+DaZ-r6Z{#%9>!snV87`mHKQk$$Pu+8w%1`g*%a`A}dpGp1iD-J{ z&v}n(r+O`|`TOC6LHWL*l`HPQpPuYFY0C5M+qb_rGVFUi<@wdDtv2hgW<9;X#fN9v z^X?nlqI6r6rN2M_6tw4h>0NQ{gWndN+`o7K{GAtmoNsYl5Vm^h=FOWQw$IuXC*$9@ z$7KG~N&h!165ALnh^xwE~GJh)lu`TY6w)KB}vU&UUZntYqvbHiSrPu<+J zzwTPMe!Xa0V&o*gEYq*n6Z!c0OA8A(PF(tP-{);pPkyicYJJ$H?APDUAM&!Yn%$2( zrAq}l#a=Nj(ztZ4Px1J+_Ojy}{bt=i6>Aq&{jO@JR4-fi7wL-`CMDNTt0n1qs{6X% zTv27QZS7pyFN!IzOXjR|U#7Fpy%;Oiw(t$JyYFmnoXYm z@j26Hv*u!XR&nuy*zo@Te&f&Ea;J0ZGd-xBw{G3Kh#l8Eo>y`$o^5n2QR3A1+ETaQ zn+iYK#P8squ*6Y-g_(E1_=Ycu@)peZzo#FwIbZ$N)KZQA{AadrjmC!0e*Zgj!^nN& z=e4C%_8RP(_`Fg$`EH!iM$M+{`8vDzrX*F)T*tP0!?b#KanAYE6i&CYXsg+uHl6$@ zQ!y;DI##~yN282oU+}if{JomLuFlLWpTC;z{UWA<>;LCueORY;pg*g11>5V^^)0y; z91Xw%WT-$62K;cp#OgTe~DWM4f DHHA<0 diff --git a/mods/cnc/uibits/dialog2.png b/mods/cnc/uibits/dialog2.png deleted file mode 100644 index 6705b7919a4b28d79a298a10cbd3f58972395e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5924 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 diff --git a/mods/cnc/uibits/dialog3.png b/mods/cnc/uibits/dialog3.png deleted file mode 100644 index 67da64ad3f02b70d72ae57d622847bc425403503..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6539 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 diff --git a/mods/cnc/uibits/panel.png b/mods/cnc/uibits/panel.png deleted file mode 100644 index 1e2e10a5e59efdb1374b984275999b6f6d9ef444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1244 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIGvQXMsm# zF;M+=5N34Jm|X!Blq_+LC<)F_D=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEDoP^71e zV@SoEx7Qs*Wdj9VFIGj~XSX=$q$b$NwXeJ5go==q`hq1B1DiK*Z!&*T9rkr++B?qO z+vGRA+4;92^?U97x8^xjXU_bY`}1DiiMH=Er_Y@E{LJ%D!C^M(_g*otsLru(h=(b`&#iVb)+M{K|NR(_s$x0$B&fj@A4N{1_g^ zFuY~pa)_yAC}k3O&XmC(!0-rYoN$AMxPx^AlR&t9$^pozGGWF!C@5H$D7*{rc^1 z(l@?l|7JWO$Jk&n)X;{{b9Qc*KRB=dx83dhg!4P|f46JxXAn>uMFSK9-2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4+Sh#l%Dh9h!GiG!r-C0tAybF2 z!yJZ3ECT8z3e|@nt~UJ>P`%|f(~-Hc4fWQu`wG(Sr~iI=-kqV6Y*T5ZaR<=n`fcBn sz8w6Pah2?p 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