From 590faca990832809930b43e2f7fceebe89a7740d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 6 Jan 2016 01:22:41 +0000 Subject: [PATCH] default.skn: update to Shkvorka 2.1, move arcanii game to cd version, desktop app: wider buttons git-svn-id: svn://kolibrios.org@6033 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 3 +-- data/common/default.skn | Bin 854 -> 1059 bytes data/common/settings/game_center.ini | 2 +- programs/system/desktop/trunk/desktop.asm | 8 ++++---- skins/_old/Leency/Shkvorka/default.asm | 8 ++++---- skins/_old/Leency/Shkvorka/default.dtp | Bin 40 -> 40 bytes skins/_old/Leency/Shkvorka/default.dtp.asm | 4 ++-- skins/_old/Leency/Shkvorka/default.skn | Bin 1059 -> 1059 bytes 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 4350bf97ba..346c0bc10d 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -333,7 +333,6 @@ tup.append_table(img_files, { {"File Managers/KFM", PROGS .. "/fs/kfm/trunk/kfm"}, {"File Managers/OPENDIAL", PROGS .. "/fs/opendial/opendial"}, {"GAMES/15", PROGS .. "/games/15/trunk/15"}, - {"GAMES/ARCANII", PROGS .. "/games/arcanii/trunk/arcanii"}, {"GAMES/FREECELL", PROGS .. "/games/freecell/freecell"}, {"GAMES/GOMOKU", PROGS .. "/games/gomoku/trunk/gomoku"}, {"GAMES/KLAVISHA", PROGS .. "/games/klavisha/trunk/klavisha"}, @@ -428,9 +427,9 @@ tup.append_table(extra_files, { {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/setmbr.exe"}, {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/MeOSload.com"}, {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/enable.exe"}, + {"kolibrios/games/arcanii", PROGS .. "/games/arcanii/trunk/arcanii"}, {"kolibrios/games/codemaster/binary_master", PROGS .. "/games/codemaster/binary_master"}, {"kolibrios/games/codemaster/hang_programmer", PROGS .. "/games/codemaster/hang_programmer"}, - {"kolibrios/games/codemaster/kolibri_puzzle", PROGS .. "/games/codemaster/kolibri_puzzle"}, {"kolibrios/games/invaders", PROGS .. "/games/invaders/invaders"}, {"kolibrios/media/zsea/zsea", PROGS .. "/media/zsea/zSea"}, diff --git a/data/common/default.skn b/data/common/default.skn index 1b32a46df39e2f04b843e88c865762cf7f9d90a5..31d05259f9ab88c44ed562bc8d3ab687bbf885a7 100644 GIT binary patch literal 1059 zcmV+;1l;>eP(w?^BLDya0000%#gZwsj&&}CIeQq_5y3R?L)Kmcm6(T`4(u0jQpLEx zd%!mjO%^?gdd*>;gD~yePr6TM-7a# z=j2H*233!5K42Ib)`hF|2_n@<-9Gy{EVm0)D(i4xh&|hHM1c*mmQ#bq{BbgCr5?}z zOa5)phpSNhh&-0U3P&6RDxTwY`xsg@|<#rPi#^NfD zPCI%p+HJHn2OERBJOm@wDzss0S*A*yxUS3OpRR!@NK^mb3W#r&UFXNtT?DM@%?fwz zmizGShm?k&49UE3%#sB*Iv*yLs>YdOWc}QC0iH-fjVA##ZIk(fgVc`5&6(`8jfGT+ zm8sf$>sT(iBCZE5ztZ&io}DQ26sf`_EiQ^cM4Dqv)LW1l>2A5u3SW_8s)f_GU>O0Oovuc(C%^$p}V%gz3S0QzvB zAw(wcd=NAh=xHQ;1g@>C9|Ea&V$j*#e;G^GXJi2|yAB>S8pB>cx9YFXCTrXVdbsaI zb6`S#MLfiQgNa%^i;)gBov0J$JzM!n*=Cc*3tK1Q5wrW3T|f@}U1+8#%eyLH zI&g}0A!Zf}!T7n*=ycik4b{+-honP!{{WFGqBmanAb%^#Z zs9n0(UyM2YeVP8%&ix|k0OETySb9a|1>#66Jk3{UA9S1D=No1LNMr3E*uZYL@Q0~b zi65Yy)cTer3D=&ry?iEeo2UguQGKg<`09D9VdjiL5=r18?X z(2j4`ynKJ1NaTCYkL?3k>ucKOt65>2Fc?VQ46uJ^K8?iZDN%4AZXx^IymDXZ9>s*V zm@>)~iWm4P^I|Cnufngi83nvz&UnV>bG1#Z=9AIZSq6AY$$+g!^**9vG}eiIO*-ce zZXLzSs=Rc#uPExU)>p6vnBW*rKf$8G2;E(YMMTv5bF&3NfFGkLFtH9FE1FWzrG|GXFh^pymM9l7 zyfxlbl2;$o%@e{7ED%4WB~;nTp#ktJN5E$U8t4>V$;?P3N6o*7T%;$S)cxweH5wXG z`P9P0BQ__rNWaK;_DwjABX)I^?^s>ty1S@Y-Ja=QrD6*|+`ChAM(AnQnnpgw2bmnR zs2klFTrm}Ly<;}P3_7hWuyaR>T7=eJh0LCY0Eu{nJSnVmnn+B2a+!#RUat#5NKmp{ zE_ssq-Xqsr9Gv->mnO>IF>X+Fgtjqf1-^i3eYRxyxN=sD%u9HlZKczFPhz?mau>4z z1jwLCZ2Un?Whm7htlTFp?*4dra%Z|ms?KCcK}M3f67RvEGxe~OE<{WYsdAANEC4FM z>N&XhH+rqHX3|Q?fDO1pC7CRh_{~Swj!N7I>S3nI?-AwwzjfE=G=K$ckM;DvWpB+B zBWi$T)mL4Q1DoUp2Yin9uS5J~obI^z8U~Mk9l8yzUgA;q-H9VnTlSw4t60r6iF`k@ zmVsMOr9MVHv$FkmG@Ac*jB#Iz{QK z>Qd3d;bSyl_;kWK>hLJ7N!Y}cW5pd^) zq-6TGf29Y>@(u8nw%U^#g25KX!=SvYBiCB39Ge4WDOi!rO|z_kPnakU_I%YGEqrM8 z@EXSzyk7OxRoM(871aP$!zxEBi>K28#lD+V`9aZUi@i6t+@MQtbjBima~@JBUTE=A zG?e4eIch}m$NbhqXUZDFdVW-%zPrQAG9iz0Dd7{XHzlUP4DCr$VKedp94+F^PX##` z6DA^(aUJECphqLhD&stHo=j}2Q%1`q+A8vJs5p)5XL5x~)BZzm>;S-~i|KuEo8et> zeIiDglYAJH=CxJ{p)u+5`wUmgz5l@`E^W=;s7%MGA3>CKChdrQilWRXLOSU8k|#yx zFNul*g)}~JxS*?qKWY3-v$napMkk^UxOtcb%;)Tu#Hq9kz25YMXmp@EB~!ZwHAu9@ gs+BT`j_coP(tfK^H9NT`KmTWj{3VG~n-0CGAceH0dH?_b diff --git a/data/common/settings/game_center.ini b/data/common/settings/game_center.ini index aced9ca3a4..445f882e0d 100644 --- a/data/common/settings/game_center.ini +++ b/data/common/settings/game_center.ini @@ -25,7 +25,7 @@ Pong=/sys/games/pong,79 Pong3=/sys/games/pong3,12 RocketForces=/sys/games/rforces Pig=/kolibrios/games/pig/pig -Arcanii=/sys/games/arcanii,12 +Arcanii=/kolibrios/games/arcanii,12 Padenie=/sys/games/padenie Xonix=/sys/games/xonix,21 Ataka=/sys/games/ataka diff --git a/programs/system/desktop/trunk/desktop.asm b/programs/system/desktop/trunk/desktop.asm index 6d510299fb..12bac52ed8 100644 --- a/programs/system/desktop/trunk/desktop.asm +++ b/programs/system/desktop/trunk/desktop.asm @@ -510,7 +510,7 @@ draw_window: ;----------------------------------- ; select color DTP frame ; LOAD BUTTON ; button 12 - mcall 8,,,12,[w_work_button] + mcall 8,,,12,[w_work_button] ; SAVE BUTTON add ebx,(load_w+2)*65536-load_w+save_w inc edx @@ -519,11 +519,11 @@ draw_window: mov ebx,(frame_1.x + frame_1.width - apply_w - 15)*65536+apply_w mcall 8,,,16 ; button 17 ; select color DTP button text - mcall 4,,[w_work_button_text],t1,t1.size + mcall 4,,[w_work_button_text],t1,t1.size ;----------------------------------- ; select skin frame ; LOAD SKIN BUTTON ; button 17 - mcall 8,,,17,[w_work_button] + mcall 8,,,17,[w_work_button] ; 3D mov ebx,(frame_2.x+155)*65536+34 mcall ,,,14 ; button 14 @@ -535,7 +535,7 @@ draw_window: mov ebx,(frame_2.x + frame_2.width - apply_w -15)*65536+apply_w mcall ,,,18 ; button 18 ; select skin button text - mcall 4,,[w_work_button_text],t2,t2.size + mcall 4,,[w_work_button_text],t2,t2.size ;----------------------------------- call draw_button_row call draw_button_row_of_texts diff --git a/skins/_old/Leency/Shkvorka/default.asm b/skins/_old/Leency/Shkvorka/default.asm index d7355c292a..c4ba82ef72 100644 --- a/skins/_old/Leency/Shkvorka/default.asm +++ b/skins/_old/Leency/Shkvorka/default.asm @@ -3,12 +3,12 @@ include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height margins = [6:5:43:3],\ ; margins [left:top:right:bottom] - colors active = [binner=0xE4DFE1:\ ; border inner + colors active = [binner=0xDDD7CF:\ ; border inner bouter=0x646464:\ ; border outer - bframe=0xE4DFE1],\ ; border middle - colors inactive = [binner=0xE4DFE1:\ ; border inner + bframe=0xDDD7CF],\ ; border middle + colors inactive = [binner=0xDDD7CF:\ ; border inner bouter=0x646464:\ ; border outer - bframe=0xE4DFE1],\ ; border middle + bframe=0xDDD7CF],\ ; border middle dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ diff --git a/skins/_old/Leency/Shkvorka/default.dtp b/skins/_old/Leency/Shkvorka/default.dtp index cd696c9566e368fde3dd061d1b179434f46794ea..db88e704bdefb1553e7f03faa6a44caff1a6d762 100644 GIT binary patch delta 25 ecmdPUm>?o@{`y^pW$hIV|Ni}B0D-!?ItBoRy$PiN delta 25 ecmdPUm>?qZ@ct8qjU7b{|Ni}B0D-!?ItBoUrU}dd diff --git a/skins/_old/Leency/Shkvorka/default.dtp.asm b/skins/_old/Leency/Shkvorka/default.dtp.asm index 6b801359af..283a668b47 100644 --- a/skins/_old/Leency/Shkvorka/default.dtp.asm +++ b/skins/_old/Leency/Shkvorka/default.dtp.asm @@ -5,8 +5,8 @@ struc system_colors .grab_button dd 0x000000 .grab_button_text dd 0x000000 .grab_text dd 0x333333 - .work dd 0xE4DFE1 - .work_button dd 0x7288B1 + .work dd 0xDDD7CF + .work_button dd 0x7887A6 .work_button_text dd 0xFEFEFE .work_text dd 0x000000 .work_graph dd 0x7E7E7E diff --git a/skins/_old/Leency/Shkvorka/default.skn b/skins/_old/Leency/Shkvorka/default.skn index 8078227118f8b2fdebe4ad9e9022591b05480348..31d05259f9ab88c44ed562bc8d3ab687bbf885a7 100644 GIT binary patch delta 1039 zcmV+q1n~Q#2%`v)BY%gQ4(u0jQpLExd%!mjO%^?gdd*>;gD~yePr6TM-7a#=j2H*233!5K42Ib)`hF|2_n@<-9Gy{EVm0) zD(i4xh&|hHM1c*mmQ#bq{BbgCr5?}zOa5)phpS<7BLr$gMuV?brp_Asvf_ zd>pbp&05?)MzhktO$zz9Z|DbbUdhiI_xZuFUfiSaTCx%L>!pjOyBW}8Y|KGCe!!w{ z;c_^_{FOix?tiy~A88JNh4T;Fg3*bxDK_AfMCpnnb(donL-B<_5h?Y*QcebEybA^0 z>#@)ClU7hPAicP##wfXwRtDvE6B5SaDvnM&dN0~-v@{1BgStEfBi1UkVQN{XN}RZ^ z%jBP~fhb5*|K19SZ0`hJT+7$-HpPk_9$8A10Nm#+hPd z{oHo}o=8EBCjm5Vllg;#)Q-r_ne4NTg;a@^soHz%ST4CDt_Ll@()9VBohb4Yslp^J zGom&Re>9O|GBcW}y$OzRt26AG8ZX`jGI~verGecJw(6Tx#GUvmU}Sq^pFC|JQa2uE zb=5tBcYj$;O0Oovuc(C%^$p}V%gz3S0QzvBAw(wcd=NAh=xHQ;1g@>C9|Ea&V$j*# ze;G^GXJi2|yAB>S8pB>cx9YFXCTrXVdbsaIb6`S#MLfiQgNa%^i;)gBov0J$JzM!n z*=Cc*3tK1Q5wrW3T|f@}U1+8#%eyLHuHe9r9e3BokK zGg^Wkq`Vjzz;+%5=AB>cXZXz;Ggx{> z8+U2WR zVVf`*NZt&ve`h|8#OEnda35|V``f&7U+EsjgtnM6$`pzh_$l*ZDF?5@ue2EjykgFH z#^-ajO|0gV(bic8cuL8Dtw!}eqGB}GiGO`fI_C~<9mUG3ymYv)DC)4*SFi<`;22In z!J@$k-Cc=AMAZ9pv)NY^Ch*N0v|~7csu1`!BtiarZIQXBMs7=rY9?Z;<2B20xGdj3 z^u!BE5zMhc>4;S?FBsBlHmdWZ45|2HV>edXZWUT)gEG2@lH{O&lIh@-d}W}FE4Pu{-PNc)@N$EMFFL`X%@ zCZ;s(eGVU@_kYKDrFn|}MIQaTJJ?~NAePv4>+{8Xdn?kD^K!cf8{G;)LYflY(y{TK-V1L4dkgdA+WA?K$C;Wna3TIKp(-t`J^ z3T~d5O*{e<)8nALMwtN$K4&9KRwySIFcDwIvBTGfTz`&d8mzZJ7YjDM0g1u@vGYib zXL>6z{}HADmEW3?^cEobDi)~JTbIAD_*G_v+W~|^)qrsnrEIRq3Ebim?e<1gtvLqm|i^Dg6^9SzkJ zcnsmLKYuhzRXsAgBS(HYYi%Ci$cqsO6^bO9NqKOV$4ZQWs}!>)M!be5XHu?(V1I%G z5Xk`?(WMmpPGZMbRsMAoFI-{GsteJ1W3t~z{B^UI1F+X*I^s`1X3!%QK=ud526ooF zX0h$W^=XR;CcvZID-yWH98kPAB$}?X3K@(1;eRa?4|ZDUVb1R% z3?!zxbwS71-33ywxc|cAFHO_#WRr$k`^8^*951-)Id-`pIvj1?ScmMjm_}PEIZJwy zOMd~m5*;uJ0CAIEBV{=ALQ~MGV2!LGlnlIN+X5$4Zi^8$47Gw$tJ0#%@)a2iZ-8}lf{cQ z$efn6V`Q5Zcx0qbpk6ajx=kBptCz6m3_WxMV4+z-q JfSNU|6M^DG`04-v