From ff835dd422afcfc65412ef5980e3fa251842cdde Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 29 May 2020 21:02:45 +0000 Subject: [PATCH] Skins: upload Florence skin, remove duplicated skins with fake rounding git-svn-id: svn://kolibrios.org@8001 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/Leency/Blueberries/default.asm | 6 +- skins/Leency/Florence/Tupfile.lua | 3 + skins/Leency/Florence/build.bat | 4 + skins/Leency/Florence/ca.bmp | Bin 0 -> 1494 bytes skins/Leency/Florence/ci.bmp | Bin 0 -> 1494 bytes skins/Leency/Florence/col.dtp.asm | 14 + skins/Leency/Florence/florence.asm | 34 +++ skins/Leency/Florence/la.bmp | Bin 0 -> 342 bytes skins/Leency/Florence/li.bmp | Bin 0 -> 342 bytes skins/Leency/Florence/ra.bmp | Bin 0 -> 4374 bytes skins/Leency/Florence/ri.bmp | Bin 0 -> 4182 bytes .../Shkvorka/{right1.bmp => right1_big.bmp} | Bin 4374 -> 4374 bytes skins/Leency/Shkvorka/right2.bmp | Bin 4374 -> 0 bytes skins/_old/MenuetOS/1.MenuetOS/2/MenuetOS.asm | 36 --- skins/_old/MenuetOS/1.MenuetOS/2/Tupfile.lua | 2 - .../MenuetOS/1.MenuetOS/2/active/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/1.MenuetOS/2/active/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/1.MenuetOS/2/active/oper.bmp | Bin 4374 -> 0 bytes .../MenuetOS/1.MenuetOS/2/inactive/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/1.MenuetOS/2/inactive/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/1.MenuetOS/2/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp | Bin 40 -> 0 bytes skins/_old/MenuetOS/1.MenuetOS/2/skin.inc | 239 ------------------ skins/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP | Bin 40 -> 0 bytes skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm | 35 --- skins/_old/MenuetOS/2.MenuetOS/2/Tupfile.lua | 2 - .../MenuetOS/2.MenuetOS/2/active/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/2.MenuetOS/2/active/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/2.MenuetOS/2/active/oper.bmp | Bin 4374 -> 0 bytes .../MenuetOS/2.MenuetOS/2/inactive/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/2.MenuetOS/2/inactive/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/2.MenuetOS/2/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/MenuetOS/2.MenuetOS/2/skin.inc | 239 ------------------ skins/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP | Bin 40 -> 0 bytes skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm | 35 --- skins/_old/MenuetOS/3.MenuetOS/2/Tupfile.lua | 2 - .../MenuetOS/3.MenuetOS/2/active/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/3.MenuetOS/2/active/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/3.MenuetOS/2/active/oper.bmp | Bin 4374 -> 0 bytes .../MenuetOS/3.MenuetOS/2/inactive/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/3.MenuetOS/2/inactive/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/3.MenuetOS/2/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/MenuetOS/3.MenuetOS/2/skin.inc | 239 ------------------ skins/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP | Bin 40 -> 0 bytes skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm | 35 --- skins/_old/MenuetOS/4.MenuetOS/2/Tupfile.lua | 2 - .../MenuetOS/4.MenuetOS/2/active/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/4.MenuetOS/2/active/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/4.MenuetOS/2/active/oper.bmp | Bin 4374 -> 0 bytes .../MenuetOS/4.MenuetOS/2/inactive/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/4.MenuetOS/2/inactive/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/4.MenuetOS/2/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/MenuetOS/4.MenuetOS/2/skin.inc | 239 ------------------ skins/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP | Bin 40 -> 0 bytes skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm | 35 --- skins/_old/MenuetOS/5.MenuetOS/2/Tupfile.lua | 2 - .../MenuetOS/5.MenuetOS/2/active/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/5.MenuetOS/2/active/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/5.MenuetOS/2/active/oper.bmp | Bin 4374 -> 0 bytes .../MenuetOS/5.MenuetOS/2/inactive/base.bmp | Bin 150 -> 0 bytes .../MenuetOS/5.MenuetOS/2/inactive/left.bmp | Bin 438 -> 0 bytes .../MenuetOS/5.MenuetOS/2/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/MenuetOS/5.MenuetOS/2/skin.inc | 239 ------------------ skins/skinlist.lua | 6 +- 64 files changed, 59 insertions(+), 1389 deletions(-) create mode 100644 skins/Leency/Florence/Tupfile.lua create mode 100644 skins/Leency/Florence/build.bat create mode 100644 skins/Leency/Florence/ca.bmp create mode 100644 skins/Leency/Florence/ci.bmp create mode 100644 skins/Leency/Florence/col.dtp.asm create mode 100644 skins/Leency/Florence/florence.asm create mode 100644 skins/Leency/Florence/la.bmp create mode 100644 skins/Leency/Florence/li.bmp create mode 100644 skins/Leency/Florence/ra.bmp create mode 100644 skins/Leency/Florence/ri.bmp rename skins/Leency/Shkvorka/{right1.bmp => right1_big.bmp} (67%) delete mode 100644 skins/Leency/Shkvorka/right2.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/MenuetOS.asm delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/Tupfile.lua delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/active/base.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/active/left.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/active/oper.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/inactive/base.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/inactive/left.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/inactive/oper.bmp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp delete mode 100644 skins/_old/MenuetOS/1.MenuetOS/2/skin.inc delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/Tupfile.lua delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/active/base.bmp delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/active/left.bmp delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/active/oper.bmp delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/inactive/base.bmp delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/inactive/left.bmp delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/inactive/oper.bmp delete mode 100644 skins/_old/MenuetOS/2.MenuetOS/2/skin.inc delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/Tupfile.lua delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/active/base.bmp delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/active/left.bmp delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/active/oper.bmp delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/inactive/base.bmp delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/inactive/left.bmp delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/inactive/oper.bmp delete mode 100644 skins/_old/MenuetOS/3.MenuetOS/2/skin.inc delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/Tupfile.lua delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/active/base.bmp delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/active/left.bmp delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/active/oper.bmp delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/inactive/base.bmp delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/inactive/left.bmp delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/inactive/oper.bmp delete mode 100644 skins/_old/MenuetOS/4.MenuetOS/2/skin.inc delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/Tupfile.lua delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/active/base.bmp delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/active/left.bmp delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/active/oper.bmp delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/inactive/base.bmp delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/inactive/left.bmp delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/inactive/oper.bmp delete mode 100644 skins/_old/MenuetOS/5.MenuetOS/2/skin.inc diff --git a/skins/Leency/Blueberries/default.asm b/skins/Leency/Blueberries/default.asm index decb82186c..25ce5d2415 100644 --- a/skins/Leency/Blueberries/default.asm +++ b/skins/Leency/Blueberries/default.asm @@ -9,21 +9,21 @@ SKIN_PARAMS \ colors inactive = [binner=0x626262:\ ; border inner bouter=0x33383A:\ ; border outer bframe=0x626262],\ ; border middle - dtp = 'default.dtp' ; dtp colors + dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ close = [-30:1][26:18],\ ; buttons coordinates minimize = [-57:1][26:18] ; [left:top][width:height] SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers + left active = bmp_left1,\ ; skin bitmaps pointers left inactive = bmp_left2,\ oper active = bmp_right1,\ oper inactive = bmp_right2,\ base active = bmp_center1,\ base inactive = bmp_center2 -BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps +BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps BITMAP bmp_left2, 'left2.bmp' BITMAP bmp_right1, 'right1.bmp' BITMAP bmp_right2, 'right2.bmp' diff --git a/skins/Leency/Florence/Tupfile.lua b/skins/Leency/Florence/Tupfile.lua new file mode 100644 index 0000000000..28fde69939 --- /dev/null +++ b/skins/Leency/Florence/Tupfile.lua @@ -0,0 +1,3 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("col.dtp.asm", 'fasm "%f" "%o"', "col.dtp") +tup.rule({"florence.asm", extra_inputs = {"col.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Florence.skn") diff --git a/skins/Leency/Florence/build.bat b/skins/Leency/Florence/build.bat new file mode 100644 index 0000000000..eab5abd2e4 --- /dev/null +++ b/skins/Leency/Florence/build.bat @@ -0,0 +1,4 @@ +@fasm col.dtp.asm col.dtp +@fasm florence.asm florence.skn +@del col.dtp +@pause \ No newline at end of file diff --git a/skins/Leency/Florence/ca.bmp b/skins/Leency/Florence/ca.bmp new file mode 100644 index 0000000000000000000000000000000000000000..79d8dfed87369a8882e49a5de3099259d774ee0e GIT binary patch literal 1494 zcmbu9%}#|d5Ju6&l{JFC8)m_?R*+ zynX&&I93Oa&%_OJOPtxG_>T(TETP-_uy+cZ=zVBbG;y4yzk|bK|VHjSmL>NU; z5Clb0)OAfR!bhtx49l`?nnr|qp5I$}p2w_3m}Oa2RZJW43=z7nOM9t!XC*@4_c764 zDw2!v!3s;7rgU3`+tT2ov;M1& literal 0 HcmV?d00001 diff --git a/skins/Leency/Florence/ci.bmp b/skins/Leency/Florence/ci.bmp new file mode 100644 index 0000000000000000000000000000000000000000..74d06350ce30611c31d8f8006f9918f7cbde843a GIT binary patch literal 1494 zcmbu8O%8%E6ok>l8@TWYZd@Tn3$%$#6Ib2|ui>dYkDq-8i7Td^(53@#rqdrTx7Vgh zaP)iHmbRmrgRNbn)6pQuYB^nalosZ%n4HOc#)t`!=%+qK{mB)YEx#9Fe2m%8x&Ut|15U;O literal 0 HcmV?d00001 diff --git a/skins/Leency/Florence/col.dtp.asm b/skins/Leency/Florence/col.dtp.asm new file mode 100644 index 0000000000..270b67a77b --- /dev/null +++ b/skins/Leency/Florence/col.dtp.asm @@ -0,0 +1,14 @@ +struc system_colors + { + .unused1 dd 0xAAAaaa + .unused2 dd 0xFFFfff + .dark dd 0x505050 + .light dd 0x828282 + .window_title dd 0xE3E3E3 + .work dd 0x626262 + .button dd 0x4E4E4E + .button_text dd 0xFFC189 + .work_text dd 0xF5EEee + .graph dd 0x222222 + } +struct system_colors \ No newline at end of file diff --git a/skins/Leency/Florence/florence.asm b/skins/Leency/Florence/florence.asm new file mode 100644 index 0000000000..212c2d4359 --- /dev/null +++ b/skins/Leency/Florence/florence.asm @@ -0,0 +1,34 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; +;; Distributed under terms of the GNU General Public License ;; +;; ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +include '../../skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [5:1:58:1],\ ; margins [left:top:right:bottom] + colors active = [binner=0x626262:bouter=0x131313:bframe=0x131313],\ + colors inactive = [binner=0x626262:bouter=0x131313:bframe=0x2C2C2C],\ + dtp = 'col.dtp' + +SKIN_BUTTONS \ + close = [-29:1][24:18],\ ; buttons coordinates + minimize = [-56:1][22:18] ; [left:top][width:height] + +SKIN_BITMAPS \ + left active = bmp_left,\ + left inactive = bmp_left1,\ + oper active = bmp_oper,\ + oper inactive = bmp_oper1,\ + base active = bmp_base,\ + base inactive = bmp_base1 + +BITMAP bmp_left ,'la.bmp' +BITMAP bmp_oper ,'ra.bmp' +BITMAP bmp_base ,'ca.bmp' +BITMAP bmp_left1,'li.bmp' +BITMAP bmp_oper1,'ri.bmp' +BITMAP bmp_base1,'ci.bmp' diff --git a/skins/Leency/Florence/la.bmp b/skins/Leency/Florence/la.bmp new file mode 100644 index 0000000000000000000000000000000000000000..462d0e95873666411dd395dce1b9017fe0aae92f GIT binary patch literal 342 zcmZw9J5Pg97{+mG+-c%M5D^IXTflmhv(U&wA~j($b*h6M>}*00chT>l=8aq!7` z-~7()?H(Q{n#v75rcNn?ny9X6&d)tZzd8Fax~_9_cOT#e2FvLtSO_OO@2*DG6U@7IL3U1q$nFRNJ@49YL6nGrR zD2l48!pr3oW3w#7tJU+>S7!KSy`HJy*Ujd(Y3{lXziqdTlNW1 literal 0 HcmV?d00001 diff --git a/skins/Leency/Florence/ra.bmp b/skins/Leency/Florence/ra.bmp new file mode 100644 index 0000000000000000000000000000000000000000..86355fa119a67cf8201d2effc4bbdbcbdb2e9ea9 GIT binary patch literal 4374 zcmc(iJxn7<7=}qix3=J`}{tz^~lIy<6H#nQP1}G_j~Tp{-XKgzwHNW-&@(1ytR`noh%S64&pbp<9TCz;yR z)D)9~*{uT2#bWX3=;&l1E0s!gM}&2hCVuSXG+%3%&O5G94W3qIVIC+I8KEScFR^+rfSc#ss5^r0GAoZm+(imoFmzS5xA2DlaMpssA zmHXC!5l=Tk$IMQVreS{DvdmzsG$YkZQ*N7uua%A}h#*CJUl{H2g7BjNa zL{M?oxCXm=>B11e{@81{rT}yFtceu6o7l2hU}kqeu;yo0Zm_Lb@!O2nzPYiqv?NUg zp#|F&u*>Hi#|EdO4Zpj|13czB;)t1aCO4AFB+P_Gr&E9#Y`s-qk20kMGwS!S$!AiI732#GW_(QNM!8)6 zIfM~##Ccy!6MwhX%Kh0&y=$f487Ick*DIr*IVGHN39W18VOMtT`Ak%Ktsfp9!pyfH ziJ{!!1$Z37#LV(Z6Xs&Q_ z%)f;&QVVgmwlwj{QjH5X1q?rM^@7$mUlcfgY?9GZSb&y^c2Wj2=! z&&-q&;U6;uF?_FKkW4XgZUe)s8SHAqM7Z1Jup1`YJYbo-z&vwuVVH?SI+LlqcmXs2 z1S&FS2+tch$aJJTA}pCS{me(^%d<@(XcPjgOMlHxwdy8a0OpRE6UijZ-b)YW$35d+ zz@P(tJ9j(Loinqi_gKur2vf6INF5Z5j}8uA{qYLs*Kb~{i1{pp!OSV@1o0W}ym`fP f4_xSuh+lSWeEh?neKZW~iJ8B{(CcdWW%2(8HM1+% literal 0 HcmV?d00001 diff --git a/skins/Leency/Florence/ri.bmp b/skins/Leency/Florence/ri.bmp new file mode 100644 index 0000000000000000000000000000000000000000..482408c5e961e921ac386290a891e66911f90db5 GIT binary patch literal 4182 zcmd6q?@wD*7{}4X*OKtYmkwh>A`1&{lon{A%)&%AEQl~1knzKfjWOe*(_kXVaGIrz zmS3ANTNQJQLLkP;$?o(ZB4vZDR;yK_ z(w>-@nCP{Q*|@kknNL8u6a|<#_nh0(s${geGuqv|I_3FC!nE2W%WR(u1&yt}#FTyVFK{zEv?-AwWjPG$bAW4k2Et=aOG`t92Oqey zuQUd?w7QML%iOU(cm9&lV3XNZeOyM@Qr_%x~L-S;>V)Cc}ceAgYTk09Fdnr zPOsi}C%r}4*{bH_tkBr3_EpHD96SSSb@6G&#Th_U=n7UkDp`rS{kD_0LUASNzJ3+d z+T{{yWKyWI`pG-kTn{O8^g*P5S4Ef#ASoNl0Nr-r$_UCPx<+~G%V}PPg`oQ zhq7|{#@SgqS~1|+-yg_#dP<#hh)7wU;v31zHu2jn&MrSZd%IoWst$3#hfZgmalKSO z5eh0|2ALv(g_ZVsL{(9bf(WcaHYX=XV=XK!%wC5fBpSeeflGXJbn)Pj@5spFzFu(W z%KAOK&i)Iu;o1@|xg{>`q@;R8Ek{Jk78Dd}th@;9S% zObLZdAtGfDR#j=N)z#HuH2DaNvACE8M zwO3X;gCC7A9v@SkV67a+5kX3*zJKhP%E~JYH>+QVQI1IC=Z(UNxy{wzw3iimQvX*# cIU=F5&qqc^Jhu_{Y=~`yo~99^s)iB&07J0q$N&HU literal 0 HcmV?d00001 diff --git a/skins/Leency/Shkvorka/right1.bmp b/skins/Leency/Shkvorka/right1_big.bmp similarity index 67% rename from skins/Leency/Shkvorka/right1.bmp rename to skins/Leency/Shkvorka/right1_big.bmp index d6d3346a7cc10cf793a1e546db58e09504652ce6..25ee306c3312fa56bdf50a37fe773300e39df64f 100644 GIT binary patch delta 659 zcmbQHG)-wk2}}Lft=qP5-?3}g9?H??&0AAaQtB!%k${x(sXhxdC^IvAvly!mqe^%4 ztB!^j5Y*H98jj$CKn0W2*qkQEvx`p7W0#xU&(1daA)Dyrwe0+Cy{&J6X!0I*#mNtV z!ba>`a_iTxkB*ME#{fVU(uz}h-nG;`{Qv*|+0&oP@^3?I12T>tdJ7Z; zN=>fk5Cs})05UK;I~%AS4FCl}2I_GbsLYt~p{?#Q&?LBdaFecF{0x)=Dwy2F;VSX? z@#7~L;NioElOJ-3P5#R9eli=U&}4p2w#k1u=QGcp`eE}tE_X(`zK+ND@B9Rs4J4=b zKL;W>7brEEnP-|DPz)kJW75l|^FIO+kO5Hzl$yMqXPN>;3@E&8;YTKXCZ)QOeQo-Fs6~QW~r8l7N))slE<0C@U*xvly!mqe@Tf zYl3KU8k>{cO}t=o6}$B0hiszC{q66%n_qP_ynvwI);B-|=K`hr+b5r8mz-?GuEhp4 z@#V{xlQ*(yP3~croBWwgXfiju;^e#R#&UP>-tFq@vc~{G!8>>EOxEKtP?^&64rp0R z&BOoy|DQemxh(%S5FI`A7RUt(0;PZoCO2`oN-SKsFd72@1t&k`5S#p!<2~!#sUPM} zo&1t>6Z8C;?>Eoma%YrVH0Q(A{^vlW?%(+dWB?J60ptQ1K&i>hJk#Ws&i@ERGbX(R lB24z=?L5;a3-Bp!&f}fL==bj3yEjwx2oewr!AkPQ zfkkvyj=LonkNY{7ahx4LXJ?mtc)Y&ydfhSJa@}*?a9#AH=Y3pqGt$%2$^kkUnYFmZNvgGMVIBoG#XEunf z$h6FJF9{gh>J(C`bq4866Fn0I0aHf8sfGXggqa;pAF2YZ>pCKZ7K2-yYA{YY)~5Xo zGkB`lxzoQSIMraBq~Zg4(aIw5gp*MWRt={md^N+&L{)s?RBEI+4Kv$tMtmLRMHn+- zJlcbK22XutnAdi3@^tT95fl?fjGfYiy;w+lbo~}lAU!JQe1Qx(p+^J W(%p0!GTrqUay$(fDud0zW&;3yWfUa< diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/active/left.bmp deleted file mode 100644 index 6e0422af251cf278a2110ebb8a833574afbf6a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmZ|L$qoTQ6oujHg_RX6iKW&PEmm!&&9M+6F$6J(NIZn6@_g>;lEX&jzt#0s?Yc95 z87f+V?2b%KCM9D;yHZbiPsa7gb+qhsViII@a#p{VTXFYnIH^{F?k^lez diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/active/oper.bmp deleted file mode 100644 index b05547857548b32176cff06c2a9c055a9d93d2bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdVdOG`pQ7{>7lmu<2|1T8yx)HGUY7b~?JEg~wqP|=+t=nM31`y6fT&l!+m2A;!! z3rC(KQ_uV6Z#IF$(}k)jULD@+JUyO8o|)p^nBO^L=4b80uZvf{R81mhon;%e<8vwp z%;()Ktzf>`$kGbttIaH}V7}g3Nh_Fdwri7$8I4NgewHz#(zx^XjQO@#n^XYb?c^d1 zxSs`B3{zDqf9||JW7brigbb%wm`da|pn! zx1w4|FN3CtcPY$bmppZ3g*wFc0#e=2fvQj f5{fl{pRA`63+DajvOE15Ywdx59n&07Yk&L)zn)!Z diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 697725e36b5e61a91f0d9fe4276156eab36dd9d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW%psqa?=i_tS8irs!JAVGQoGgnYZ^#yQkszquDz2D|!oT*)6rD#X0DsX%#cwLsojEkwQ4%>w1m zQVTI}ofaq;!NP7@H$&bzBShVsZh`)!_eLNed?t{ihALxN)vL;x+3}3G9DM!H_5tHZ BY>)r| diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index ba4baea507b02d5fbe910eb76be475ac88b8639c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdUyK~BRk5Jk9o8k*iQA3&IWy+`R2E*l=lW_Eg`V?A5oix_ECHBb z@9dlg8I<-*JUR1rof6?jngPJXjMRMot^I$@ z^c3FH%L3_jof27QbsU(987a%G{1Ri%ylPZ7gjqKXVb*?$CuiQ3DUo+6FcULUm~$sH zuNsvF68C$C5axD6%(?yY-)|gJwkvzp#oTK~AI!N8BW0PD zUt-LeSB=U7X;8W$m5iv*sLOwFn>O+Vvzu2|Elxj*MU|7 M{B<0&JX-nr3x$PdB>(^b diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp b/skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp deleted file mode 100644 index 5d9a0976094bdd8b241893f9afed182abf2aa42b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ccmWGAQ(_2!;vYYLFu*WK48-Q(U;xVl06NVM`2YX_ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/1.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/1.MenuetOS/2/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/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988e5467765ccf421158bdb809039d74b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 rcmbO?Zyv)uD1P?r8N-(^Ul_J++r`k<*2eJd+cyRd4hDv*swxHmvHue_ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index fbb1a454b9..0000000000 --- a/skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x314C58:\ ; border inner color - bouter=0x011C28:\ ; border outer color - bframe=0x314C58],\ ; border frame color - colors inactive = [binner=0x6C7174:\ ; border inner color - bouter=0x011C28:\ ; border outer color - bframe=0x6C7174],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-18:6][12:12],\ ; buttons coordinates - minimize = [-34:6][12:12] ; [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/MenuetOS/2.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/2.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 7803fdb00c..0000000000 --- a/skins/_old/MenuetOS/2.MenuetOS/2/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/active/base.bmp deleted file mode 100644 index c815d68d4627ff317d1cce7c57194c891cbb6162..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW~ZzJL diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/active/oper.bmp deleted file mode 100644 index b84553b9f968e4ef901a567eed777ac422684c2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmeH~KMTSz6vSUwUHk(g=p+bT6uNW}UFxEsxH$On{U-HDK*HUSrHBs_E+HxR$o1Di zNq1jNEwmP6jebO5qE}%wdr!<}ywAZcirFvcY3XHTR^KU*`;p~*N^?g?9tC{s# zrGCr@KN|>4ThNjW2uucAs-a{CBEm?})SwutL=AfWfhQe7f5;Qd^Mk-N5 z;j9=5ni>=%m8iif=jUZNpt3)17}D*4F{{*%IXFMgwJ#y_^|bLN+z7jN{Ww_e1K$DzGOZ%g&AvK1ItQZNJ8Wbay zsG)FHj08;$ijhjxV3hN7xX-BUj~j+`J7CNz^ 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/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988e5467765ccf421158bdb809039d74b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 rcmbO?Zyv)uD1P?r8N-(^Ul_J++r`k<*2eJd+cyRd4hDv*swxHmvHue_ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index 51f88e8314..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x1D2325:\ ; border inner color - bouter=0x1D2325:\ ; border outer color - bframe=0x3B454A],\ ; border frame color - colors inactive = [binner=0x1D2325:\ ; border inner color - bouter=0x1D2325:\ ; border outer color - bframe=0x65686A],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][15:15],\ ; buttons coordinates - minimize = [-39:3][15: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/MenuetOS/3.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/3.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 9fc4b1f525..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/2/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "3.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/active/base.bmp deleted file mode 100644 index 9b2d8d23c477eea5bbe29c4d20e9707cc28f5deb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGWAU92#$hm!?^o1-~{ ztAiPXi@hm>qpb;pgS8PD+glkj*jN}aSexrJSeoiGSeWQCn49P@m>Fp?INO;pc)3}F G%?1E;%@UFT diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/active/left.bmp deleted file mode 100644 index 9e3904de556106b8fee5e126926f210358aa1f00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmb`DI}XAy5Ja7VijIng3Lzmx1VoN)Vjv$9lpt{@PR04yvC%*Q9jiBMzg@|No7*E% zp^WsUWF(nNlF*g9%YHJBk#VTSe0J@8MDFU-WeOkKg8ak##u2=CsV#wbl_Bu9%n7_c xY67o(M!tDj>LmvsbS|JO@II`ZQ6l$9y(*f-+YGY&p9U;C#;xZt-{i&Hwek&p*4* zw={AKJR3z4wnC*Jy7SW!U%Q4Dobxzn1-){mJ3k-N*r2P^HaKS&-y*EX4xbfnQGj!D zl6GN9XuM~g6`W(`S%+0An0-3p3`y2D3!@9?%VB377N%hKf%7ri+J%Lo@t$>7a8}{Q zA}q-cpA~LVfb-s8+k*8P0=hbF!O=L(-f#T!@hLj`_jtAompt`KgRIu3qY$qK% diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index 07f03b73691c80c05c410f88b8d010dee50120a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmZ?r-NwiO24+A~1Bh9HSOSO{!6XAi15jRw8-jttV4$ijo0X9YK|nSGG9M^P3w~yL z3LJsVhjV}o5I-Y51&+Y{wB!sJ0`b$+lHdr;PfbdPA#D7#)I>M}$)~0y!Vv}^7$~X9 h32+1oqm-lsI0AuS`NGt7QYNRA3ALRLH^%pcI zy+8I_VaFBg1@ne^z+Bl?i1$W_-I^xacAQVgB+^ux03Cnpu;cMyE{%*EhXkWv zbE?*?W%M{I6=Baz%s@JJ7>r$*jn1RTfvE_4VAd*+8wUoXUvsMH<{@&}@$jv=$YQ1A z{TjGFIq{^TWELxA8~yaamNh?>OeXX^m=G9LGFL{X5&~mwYCZorEfx6dm~%WWz5D>d CUv-oK diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/3.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/2/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/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988e5467765ccf421158bdb809039d74b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 rcmbO?Zyv)uD1P?r8N-(^Ul_J++r`k<*2eJd+cyRd4hDv*swxHmvHue_ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index e530ca2240..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x152D41:\ ; border inner color - bouter=0x0B1721:\ ; border outer color - bframe=0x152D41],\ ; border frame color - colors inactive = [binner=0x576067:\ ; border inner color - bouter=0x0B1721:\ ; border outer color - bframe=0x576067],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:6][12:12],\ ; buttons coordinates - minimize = [-36:6][12:12] ; [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/MenuetOS/4.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/4.MenuetOS/2/Tupfile.lua deleted file mode 100644 index c3ed68c2ee..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/2/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "4.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/active/base.bmp deleted file mode 100644 index f9f550465bffbabac422ac3226e130867679ace8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGWhRYZ4?+{?35T1990;ST~!&<-PIVfyfhf{d^H&g1GE`RgLD`wL-iPHBMlfD cVhkBt5s2?+Dh)>@*7BiNau5XK$Ji)F+9*H}h#%{q9Al>hK_Gsj zn`(li3Iu`pX>MxCuBs3O;%B*Qq`Rv@5SZ_$ndPMcK_GsCzfPX7CIo@_rGdJI0oo7* z;+KW!l?LfR5QtwBs$UtZ2SK1PsgE?QjWmED5WgYD5RO26AZU#@h9C%+p)bX}JJ}3~ QpnM=TAIbO0?nQ6dAmS!x3*vxXb$!kSrAb~l6;X65lPaQ=kxs~G>6_Y z3kWvPQ3M1NzE0?QSv2ntG2JVz1GO!zusbXr35s9R(KN#;35sVlO%n4ehVx3Q+e-I>;lanms=Jg{|7(&Ra^MF esmbQ=!HzA+VC+A4yW`J)tvuktOH&yX#km;(xQ!nQ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index c7f6d8aaef5c3d1d62bcaa88ccd186287d21434e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmZ|Ly$*sf5Ww*=II+3t>gE&p0PfC&fQ2H6RlX$<6OAkmypYf5U0cpLc==!9S2ni0 zx5dWoU(wV@Ek`#GvRxMLN{-Udlrxsp5q8;CVZdJE>kqOPbmvX3eRx_G!wp0*qUbS zEFdX7#}Uv>_&#B0ns=*|1tf*%I0Bjp-z${*xAFFzvVf%U97jMi;d_O0rkmF@7Iac@ zlq2Zouy%e)#Nb?E!yxhm2EeKmGxRW3YMv diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/4.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/2/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/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988e5467765ccf421158bdb809039d74b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 rcmbO?Zyv)uD1P?r8N-(^Ul_J++r`k<*2eJd+cyRd4hDv*swxHmvHue_ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index 81f277995d..0000000000 --- a/skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x162F44],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x576168],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-22:5][15:15],\ ; buttons coordinates - minimize = [-39:5][15: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/MenuetOS/5.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/5.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 9a1cae3142..0000000000 --- a/skins/_old/MenuetOS/5.MenuetOS/2/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "5.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/active/base.bmp deleted file mode 100644 index 8a6d90057930b0aef5d6e610b12b8874699e5389..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW5(R|9c40ttB50#J8=q*rwK3wNlgyrVy~A#R!3jN|7pEh%V|vP;}$Ug}CtN z{F8X-g>Y$`Sa5N@!4>d%!S;`b9FDCm^ZgE-_h;=<3HfPx@ z&fx5A&ng7Hw(Fe}dEsn#4(E%~yjqY91mr##%FU$}$GNs2R}QK;h#D#`*qeQ6WgSUGJR8 z3(eyU&dq9C73g(69X4nA;l#xG(J_^PSj641*C!{7^Rv685if2I=T|SM7dXG2uV@6q e#CvUB7e21?!uhklp$kHo`gODU{|RjMZGHfTJibE! diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 4e8958cce5a0ea30feb7bf8afc25591bb6dc710c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGWKaruiAc>)^Fo~hFD4C(N QB!!{7ER~_RJQZv_09p7Q`v3p{ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index 17bd48b38e588f7c5e4ef85e6da36d0d9342108d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmZ|EI}(C05P)GQtn92jf+z3*_SQZ?FbEjK@J2GDg^rHSp!e~7?y^a&%zPX8H?#T2 zw)!)Ldjd0n8N=B9ZCO`%9}Q_>tq*4lq86Mj4O|JfGO&|iZD6ONV_;{IV_@g8lSc}6 z8M}psUGYu1cL{bayqYW6t?-(If-QwFg-7~MeVHiKOv0*%eae{3wgmf}GguMqTh1;T i_M-^y8uqgc3~V@EwIh_)>lk%S2vo!8-A3TofBwFS8EKFJ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index 5f0c704a5081d83e1d3832736d485ebe501d0d84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdUrJ5Izf5Qa@n0~ClOZ~`hSdTJgC2@dO!O_bNNtR*OrKp+9)EV&X#;kPZKgx!Rd zD2B1V8I8u1%qJfm?`{iw4v_Z|hloAIhRs5JZV9oo=>lz5Cy^%(SSRw77jRDH886_R zMd!SLb3XBS0p~(_ynu75JQA9w8QD8{8+&lBVxJ0#tz13S$8a6{aIUX?LZJ6!`*No{ zFiS4re3JyUK(ZC+)@`#_qye1g(|{bP!olTnnT2)MY4CTjZse@&^7t*|QaY=}g>n zk^r%hy+gN;*7>Q581Y<1c;}Zo;su;vXIG4XuyLMGxbSwXob&raalr{Ae`xjpX>Iuy EU)7{^#{d8T diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/5.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/5.MenuetOS/2/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/skinlist.lua b/skins/skinlist.lua index 4dc181f340..5cf6522dcc 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -8,6 +8,7 @@ skinlist = { "ConLenov/Win10/Win10.skn", "Leency/AreaSq/AreaSq.skn", "Leency/Blueberries/Blueberries.skn", +"Leency/Florence/Florence.skn", "Leency/HydrogenOS/HydrogenOS.skn", "Leency/Latte/Latte.skn", "Leency/ObsidianOS/ObsidianOS.skn", @@ -85,15 +86,10 @@ skinlist = { "_old/lightskin/lightskin.skn", "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn", -"_old/MenuetOS/1.MenuetOS/2/1.MenuetOS.2.skn", "_old/MenuetOS/2.MenuetOS/1/2.MenuetOS.1.skn", -"_old/MenuetOS/2.MenuetOS/2/2.MenuetOS.2.skn", "_old/MenuetOS/3.MenuetOS/1/3.MenuetOS.1.skn", -"_old/MenuetOS/3.MenuetOS/2/3.MenuetOS.2.skn", "_old/MenuetOS/4.MenuetOS/1/4.MenuetOS.1.skn", -"_old/MenuetOS/4.MenuetOS/2/4.MenuetOS.2.skn", "_old/MenuetOS/5.MenuetOS/1/5.MenuetOS.1.skn", -"_old/MenuetOS/5.MenuetOS/2/5.MenuetOS.2.skn", "_old/MetalColor/MCBlue/MCBlue.skn", "_old/MetalColor/MCRed/MCRed.skn", "_old/MetalGearArrows/1.MetalGearArrows/1.MetalGearArrows.skn",