From e94c9d2b32ad180a50e906cc91aceace34842aa9 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 28 Dec 2021 01:12:01 +0000 Subject: [PATCH] 2 new tile backgrounds, remove DRoboTech skin, fix Blacky skin outer frame git-svn-id: svn://kolibrios.org@9511 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/wallpapers/T_Grass.png | Bin 0 -> 1465 bytes data/common/wallpapers/T_Rug.png | Bin 0 -> 703 bytes data/common/wallpapers/copyright.txt | 1 + skins/_old/OpusOs_D/Opus_D.asm | 2 +- skins/_old/RoboTech/BRoboTech/BRoboTech.asm | 35 --- skins/_old/RoboTech/BRoboTech/BRoboTech.dtp | Bin 40 -> 0 bytes skins/_old/RoboTech/BRoboTech/Tupfile.lua | 2 - skins/_old/RoboTech/BRoboTech/active/base.bmp | Bin 150 -> 0 bytes skins/_old/RoboTech/BRoboTech/active/left.bmp | Bin 438 -> 0 bytes skins/_old/RoboTech/BRoboTech/active/oper.bmp | Bin 4374 -> 0 bytes .../_old/RoboTech/BRoboTech/inactive/base.bmp | Bin 150 -> 0 bytes .../_old/RoboTech/BRoboTech/inactive/left.bmp | Bin 438 -> 0 bytes .../_old/RoboTech/BRoboTech/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/RoboTech/BRoboTech/screenshot.png | Bin 3444 -> 0 bytes skins/_old/RoboTech/BRoboTech/skin.inc | 239 ------------------ skins/maxcodehack/blacky/default.asm | 4 +- skins/skinlist.lua | 1 - 17 files changed, 4 insertions(+), 280 deletions(-) create mode 100644 data/common/wallpapers/T_Grass.png create mode 100644 data/common/wallpapers/T_Rug.png delete mode 100644 skins/_old/RoboTech/BRoboTech/BRoboTech.asm delete mode 100644 skins/_old/RoboTech/BRoboTech/BRoboTech.dtp delete mode 100644 skins/_old/RoboTech/BRoboTech/Tupfile.lua delete mode 100644 skins/_old/RoboTech/BRoboTech/active/base.bmp delete mode 100644 skins/_old/RoboTech/BRoboTech/active/left.bmp delete mode 100644 skins/_old/RoboTech/BRoboTech/active/oper.bmp delete mode 100644 skins/_old/RoboTech/BRoboTech/inactive/base.bmp delete mode 100644 skins/_old/RoboTech/BRoboTech/inactive/left.bmp delete mode 100644 skins/_old/RoboTech/BRoboTech/inactive/oper.bmp delete mode 100644 skins/_old/RoboTech/BRoboTech/screenshot.png delete mode 100644 skins/_old/RoboTech/BRoboTech/skin.inc diff --git a/data/common/wallpapers/T_Grass.png b/data/common/wallpapers/T_Grass.png new file mode 100644 index 0000000000000000000000000000000000000000..fa9039254b74f2c6fa5a91afd547f16f3b7d4f3b GIT binary patch literal 1465 zcmV;q1xEUbP)MdrSOLCK8d~q z+mp!FIacEh&MrIbWE(U!G? zwiI|MDn`ZYIj}nt*(QhG*+Xu$4H#_$trl>f6foOH{j6=kY#V&`;l70JNtl*_?K+2e z{q`k0(QO;&hu|FDm>?$`$RYmqZV}H?6j{kA{K}uD1PncRr4h#VWD~MU!sm!w**eF3 zv_!H!lz^ZqMO%Q+^FU1wQ1At`+t9eQOgZxCCTGtay?z(GJa2 z0$~)?H#`s{GD`UHS+>rZSC$eGUf{kNDL4_9 z)X}g#$zM_;1nKLyFA+uo!YF{(cbHVwj$nsD=(aRhEG4iSZ`dz&lTKQ`&iAkD#%<$C z!dViO)JD`|6j0X%9UXms&^dZW37fwUyC0pd4R7G$`QSI0mVu}85pBB-(=yPOf~B_D zKGgmDCTuviI}+(~+mPR?e1v;$*PnO4myX4<{!~7~?noE}Kh@CfIp{_KEG2MvJ;!{s z#5ZlS>1|~y!GAED6xoQhMON}3O}y$r zDfJ}Hi)iriseFVRI?QsTZQz+>;m16MdtOgQ_uPhQ8Msdh+$RN!p9Q32;lh1^b@CsI zp9L=7gmBMo6h8}e|9D=Ppam>%H)yqhXO4wp`+%x^> zL{ve$KNmo$H1t}ao99;ES2M*tEh{=RnV-?f(g2O^_>vFkuV*7M~mkUA#1n5km()8UEuW{9<^Z<)JW`9Qcpzh@n3C26x=$|LG+o* z#KVXj(JBq>33&K|c}i%uagJ@A^VUmCr*3*%6G}(#hI-)Dc+)_E1V>+1^;y9xsw1)6 zjLt4QJOe0+Y@OFqOb7Ja5QNDhh1+xZ1~&F8NA;(qs3baqgan;;)xP7te_i8$&#Gpv Tx>E$u00000NkvXXu0mjf`|rDB literal 0 HcmV?d00001 diff --git a/data/common/wallpapers/T_Rug.png b/data/common/wallpapers/T_Rug.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2bd88ef08f632e28d27801e734526cff1a0130 GIT binary patch literal 703 zcmV;w0zmzVP)7cOw%!U0cw2tFDg!jm4ncz_F+#@GWkYO!*F08RM+ zr}UZRx0$}BCI*x3Tz21mXJ?+7d1m*0bG4UC-TJRDp;RgbNxR*)k>~# zysO1`#rL6ewij9#TlR9{^=c?SoVB(42sSol2)8&5X|lWm~dRU9&XM}2P-KgxD2fzWBA7McG(uZOpfmn}P_Piu-y z5qvxPY{t-0o$NLh9#=;7z$2X2&XF?|Rz+F#q0a zL><8RIT^&4B$mJv4u>8L29)-R@kw*$87)xfSEsQYevh02!V}X<00}+eymM-X$kFL_ zCq{q>%;Z?nfO&y0fXEWFkA$9Z64Iv{`&P<2_aJ-=tNxUZ$UQM*1|XLw6Ky0SK|(M2 zZlSO3ZgQ6c2M>F*_8{f}0MB6GI)07JP$G$MPu|ltzWsbB4FDKsl+;Q`8>k&wkPtoZ z(4|zvzzzWLCz?jFU4)a+Db3>zV>>#e7X7(Li;>|H5!35awmUgM--_uH*bccgQhN?B z35N<9goBZNwQC}kou!Er2Z^V l{$rB-*DR#|IZge0ehVDtoSQ0|sGI-*002ovPDHLkV1k3rNdW)= literal 0 HcmV?d00001 diff --git a/data/common/wallpapers/copyright.txt b/data/common/wallpapers/copyright.txt index 33479aa828..e67b3682e3 100644 --- a/data/common/wallpapers/copyright.txt +++ b/data/common/wallpapers/copyright.txt @@ -7,6 +7,7 @@ Free Yourself Jonathan Besler https://interfacelift.com Unsplash Alexander Popov https://unsplash.com/@5tep5 KolibriOS Tan Viktorya Sidorova Brick house islands Mrmo Tarius https://pixeljoint.com/pixelart/85317.htm +Grass; Rug Dusty https://pixeljoint.com/pixelart/67541.htm =====Icons==== diff --git a/skins/_old/OpusOs_D/Opus_D.asm b/skins/_old/OpusOs_D/Opus_D.asm index a3bf0f7fbd..f8b6e4f12a 100644 --- a/skins/_old/OpusOs_D/Opus_D.asm +++ b/skins/_old/OpusOs_D/Opus_D.asm @@ -2,7 +2,7 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [8:2:10:2],\ ; margins [left:top:right:bottom] + margins = [8:4:10:4],\ ; margins [left:top:right:bottom] colors active = [binner=0xDCD6CB:\ ; border inner color bouter=0x948B7B:\ ; border outer color bframe=0xDCD6CB],\ ; border frame color diff --git a/skins/_old/RoboTech/BRoboTech/BRoboTech.asm b/skins/_old/RoboTech/BRoboTech/BRoboTech.asm deleted file mode 100644 index 27e33aa4d5..0000000000 --- a/skins/_old/RoboTech/BRoboTech/BRoboTech.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x060606:\ ; border inner color - bouter=0x060606:\ ; border outer color - bframe=0x101010],\ ; border frame color - colors inactive = [binner=0x121212:\ ; border inner color - bouter=0x121212:\ ; border outer color - bframe=0x1B1B1B],\ ; border frame color - dtp = 'BRoboTech.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:4][16:15],\ ; buttons coordinates - minimize = [-46:4][16:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/RoboTech/BRoboTech/BRoboTech.dtp b/skins/_old/RoboTech/BRoboTech/BRoboTech.dtp deleted file mode 100644 index 0e71e89f316460db4d44185090d6914b9b486b0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 icmb1>lVgyB;<~zeh95tEFa!hyFeoS}fY~5ENFD&(ung<~ diff --git a/skins/_old/RoboTech/BRoboTech/Tupfile.lua b/skins/_old/RoboTech/BRoboTech/Tupfile.lua deleted file mode 100644 index 2f798b7b9e..0000000000 --- a/skins/_old/RoboTech/BRoboTech/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("BRoboTech.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "BRoboTech.skn") diff --git a/skins/_old/RoboTech/BRoboTech/active/base.bmp b/skins/_old/RoboTech/BRoboTech/active/base.bmp deleted file mode 100644 index ee38dd3e716c257f564403b5671dee75973d8f67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW;!7a`5MK!ifcUyd0K~UL0w8`85}*ekXeAsl006BnHT(bo diff --git a/skins/_old/RoboTech/BRoboTech/active/oper.bmp b/skins/_old/RoboTech/BRoboTech/active/oper.bmp deleted file mode 100644 index 4a8a8b4f0f16f4b2a82c3a702b6427dc83926463..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdUw!D@q05Jg`%RVhMRLJ3_8N)hVLu1dk|v-Ai06aH@h#9kaCgLAEk4-((NGtc84 z=Oi)YczS(yLw(}-j`f9gz!}*{pj^nZ{6Buso2n#9s;W|8 zd5aM?M4^p=&?JRpJDl;aJyx2gbzP6Ac7wZJ2yG0+vt8~9=MPo*aWze&0NG-$r4-s2 z2u)H*+X3PHtqPA#+qMeuEk@W26xtXFO;SkP;ryd2&-1S96qwy&guOaQ wv*%o&b{}V-x$^1J50*m7%W>iic=_X@?{mw&b>6-6u4ob#5o;T&T90Yfxf2mk;8 diff --git a/skins/_old/RoboTech/BRoboTech/inactive/base.bmp b/skins/_old/RoboTech/BRoboTech/inactive/base.bmp deleted file mode 100644 index bdb01f09779e3f2772f681f5270c01cc72d2fa4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 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%0DXVoiYwOHB&(&jdS_>6 zVcTC*^v7=jv?edPtd`PG_s*jFrzmk}buRu8RP~BbD)*bGrZE=pCyMKD?WyNH3*fHX zwf~sXgEXBbh)fr1-M>HA*a&P}T3Ecb7{ORsb+ms0Uij`t>WY!_*4y+f7dVy^A9)Ay z1nHkmr2$GRD#B_$q`i!c46BQ758d78@3{apBwIu|wQgu}SzSlN3*2XfZ}4-3+m+xP z9U~eT86Se{rp9r+*6k8xQpaxT`NF>pKX-P@vwc4!DER$A4eIdz>-ihm-02WsHi((M zKr5^ekcZ`K-wlNW|6Xl0(+j;I&-P7cQ_9rB!s1W%UI?8;B1P*S>rwM4WRZgv& md;4SBKxoz!crL2k7Cu8Ir0*hzoxpPeaP6uI`i+i#_}>8kyjtu4 diff --git a/skins/_old/RoboTech/BRoboTech/skin.inc b/skins/_old/RoboTech/BRoboTech/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/RoboTech/BRoboTech/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - _file equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - dd @f - $ - 4 - file _dtp - @@: -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} diff --git a/skins/maxcodehack/blacky/default.asm b/skins/maxcodehack/blacky/default.asm index 89e3ea2383..bd276c5fd8 100755 --- a/skins/maxcodehack/blacky/default.asm +++ b/skins/maxcodehack/blacky/default.asm @@ -4,10 +4,10 @@ SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height margins = [6:5:65:3],\ ; margins [left:top:right:bottom] colors active = [binner=0x626262:\ ; border inner - bouter=0x646464:\ ; border outer + bouter=0x010812:\ ; border outer bframe=0x626262],\ ; border middle colors inactive = [binner=0x626262:\ ; border inner - bouter=0x646464:\ ; border outer + bouter=0x010812:\ ; border outer bframe=0x626262],\ ; border middle dtp = 'default.dtp' ; dtp colors diff --git a/skins/skinlist.lua b/skins/skinlist.lua index d86b92d4f2..b99d48190e 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -52,7 +52,6 @@ skinlist = { "_old/MetalColor/MCRed/MCRed.skn", "_old/nix/nix.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn", -"_old/RoboTech/BRoboTech/BRoboTech.skn", "_old/Sad_grey/Sad_grey.skn", "_old/Simple_gray/Simple_gray.skn", "_old/skin_feol/skin_feol.skn",