From 112c948922bbdc65770cd1f03ef55b8f1aa78ac4 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 12 Jun 2021 21:12:15 +0000 Subject: [PATCH] icons16.png: has 18x18 px size now Eolite: - move properly implemented - show device icons in list - bugfixes clean skins git-svn-id: svn://kolibrios.org@8826 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/KolibriNext/icons16.PNG | Bin 12588 -> 0 bytes data/common/icons16.png | Bin 9565 -> 10943 bytes data/common/settings/app.ini | 4 +- data/common/settings/games.ini | 4 +- data/rus/settings/games.ini | 4 +- programs/cmm/eolite/Eolite.c | 15 +- programs/cmm/eolite/include/copy_and_delete.h | 21 +- programs/cmm/eolite/include/icons.h | 6 +- programs/cmm/eolite/include/left_panel.h | 8 +- programs/cmm/eolite/include/menu.h | 2 +- programs/cmm/eolite/include/settings.h | 4 +- programs/cmm/template/Tupfile.lua | 6 - programs/cmm/template/compile_en.bat | 5 - programs/cmm/template/template.c | 37 --- .../gliteskin/gliteskin_glider/Tupfile.lua | 2 - .../_old/gliteskin/gliteskin_glider/base.bmp | Bin 582 -> 0 bytes .../gliteskin/gliteskin_glider/base_1.bmp | Bin 582 -> 0 bytes .../gliteskin/gliteskin_glider/default.asm | 33 --- .../gliteskin/gliteskin_glider/default.dtp | Bin 40 -> 0 bytes .../gliteskin_glider/default.dtp.asm | 11 - .../gliteskin/gliteskin_glider/dtp_build.bat | 2 - .../_old/gliteskin/gliteskin_glider/left.bmp | Bin 406 -> 0 bytes .../gliteskin/gliteskin_glider/left_1.bmp | Bin 406 -> 0 bytes .../_old/gliteskin/gliteskin_glider/oper.bmp | Bin 2782 -> 0 bytes .../gliteskin/gliteskin_glider/oper_1.bmp | Bin 2782 -> 0 bytes .../gliteskin/gliteskin_glider/pack_build.bat | 1 - .../_old/gliteskin/gliteskin_glider/skin.inc | 239 ------------------ .../gliteskin/gliteskin_glider/skn_build.bat | 2 - skins/_old/mygrey/Tupfile.lua | 2 - skins/_old/mygrey/base.bmp | Bin 582 -> 0 bytes skins/_old/mygrey/build.bat | 9 - skins/_old/mygrey/default.asm | 28 -- skins/_old/mygrey/gray.dtp | Bin 40 -> 0 bytes skins/_old/mygrey/left.bmp | Bin 670 -> 0 bytes skins/_old/mygrey/oper.bmp | Bin 2694 -> 0 bytes skins/_old/mygrey/skin.inc | 239 ------------------ skins/_old/myskin1/Tupfile.lua | 2 - skins/_old/myskin1/base.bmp | Bin 582 -> 0 bytes skins/_old/myskin1/default.asm | 28 -- skins/_old/myskin1/left.bmp | Bin 670 -> 0 bytes skins/_old/myskin1/myblue.dtp | Bin 40 -> 0 bytes skins/_old/myskin1/oper.bmp | Bin 2694 -> 0 bytes skins/_old/myskin1/skin.inc | 239 ------------------ skins/_old/myskin3/Tupfile.lua | 2 - skins/_old/myskin3/base.bmp | Bin 582 -> 0 bytes skins/_old/myskin3/default.asm | 28 -- skins/_old/myskin3/left.bmp | Bin 670 -> 0 bytes skins/_old/myskin3/myblue.dtp | Bin 40 -> 0 bytes skins/_old/myskin3/oper.bmp | Bin 2694 -> 0 bytes skins/_old/myskin3/skin.inc | 239 ------------------ skins/_old/myskin4/Tupfile.lua | 2 - skins/_old/myskin4/base.bmp | Bin 582 -> 0 bytes skins/_old/myskin4/build.bat | 9 - skins/_old/myskin4/default.asm | 28 -- skins/_old/myskin4/default.dtp | Bin 40 -> 0 bytes skins/_old/myskin4/left.bmp | Bin 670 -> 0 bytes skins/_old/myskin4/oper.bmp | Bin 2694 -> 0 bytes skins/_old/myskin4/skin.inc | 239 ------------------ skins/_old/nix/nix_big/Tupfile.lua | 2 - skins/_old/nix/nix_big/active/base.bmp | Bin 182 -> 0 bytes skins/_old/nix/nix_big/active/left.bmp | Bin 438 -> 0 bytes skins/_old/nix/nix_big/active/oper.bmp | Bin 5046 -> 0 bytes skins/_old/nix/nix_big/inactive/base.bmp | Bin 182 -> 0 bytes skins/_old/nix/nix_big/inactive/left.bmp | Bin 438 -> 0 bytes skins/_old/nix/nix_big/inactive/oper.bmp | Bin 5046 -> 0 bytes skins/_old/nix/nix_big/nix_big.asm | 31 --- skins/_old/nix/nix_big/nix_big.dtp | Bin 40 -> 0 bytes skins/_old/nix/nix_big/skin.inc | 239 ------------------ skins/_old/nix/nix_medium/Tupfile.lua | 2 - skins/_old/nix/nix_medium/active/base.bmp | Bin 150 -> 0 bytes skins/_old/nix/nix_medium/active/left.bmp | Bin 342 -> 0 bytes skins/_old/nix/nix_medium/active/oper.bmp | Bin 2838 -> 0 bytes skins/_old/nix/nix_medium/inactive/base.bmp | Bin 150 -> 0 bytes skins/_old/nix/nix_medium/inactive/left.bmp | Bin 342 -> 0 bytes skins/_old/nix/nix_medium/inactive/oper.bmp | Bin 2838 -> 0 bytes skins/_old/nix/nix_medium/nix_medium.asm | 31 --- skins/_old/nix/nix_medium/nix_medium.dtp | Bin 40 -> 0 bytes skins/_old/nix/nix_medium/skin.inc | 239 ------------------ skins/skinlist.lua | 7 - 79 files changed, 43 insertions(+), 2008 deletions(-) delete mode 100644 data/common/KolibriNext/icons16.PNG delete mode 100644 programs/cmm/template/Tupfile.lua delete mode 100644 programs/cmm/template/compile_en.bat delete mode 100644 programs/cmm/template/template.c delete mode 100644 skins/_old/gliteskin/gliteskin_glider/Tupfile.lua delete mode 100644 skins/_old/gliteskin/gliteskin_glider/base.bmp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/base_1.bmp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/default.asm delete mode 100644 skins/_old/gliteskin/gliteskin_glider/default.dtp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/default.dtp.asm delete mode 100644 skins/_old/gliteskin/gliteskin_glider/dtp_build.bat delete mode 100644 skins/_old/gliteskin/gliteskin_glider/left.bmp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/left_1.bmp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/oper.bmp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/oper_1.bmp delete mode 100644 skins/_old/gliteskin/gliteskin_glider/pack_build.bat delete mode 100644 skins/_old/gliteskin/gliteskin_glider/skin.inc delete mode 100644 skins/_old/gliteskin/gliteskin_glider/skn_build.bat delete mode 100644 skins/_old/mygrey/Tupfile.lua delete mode 100644 skins/_old/mygrey/base.bmp delete mode 100644 skins/_old/mygrey/build.bat delete mode 100644 skins/_old/mygrey/default.asm delete mode 100644 skins/_old/mygrey/gray.dtp delete mode 100644 skins/_old/mygrey/left.bmp delete mode 100644 skins/_old/mygrey/oper.bmp delete mode 100644 skins/_old/mygrey/skin.inc delete mode 100644 skins/_old/myskin1/Tupfile.lua delete mode 100644 skins/_old/myskin1/base.bmp delete mode 100644 skins/_old/myskin1/default.asm delete mode 100644 skins/_old/myskin1/left.bmp delete mode 100644 skins/_old/myskin1/myblue.dtp delete mode 100644 skins/_old/myskin1/oper.bmp delete mode 100644 skins/_old/myskin1/skin.inc delete mode 100644 skins/_old/myskin3/Tupfile.lua delete mode 100644 skins/_old/myskin3/base.bmp delete mode 100644 skins/_old/myskin3/default.asm delete mode 100644 skins/_old/myskin3/left.bmp delete mode 100644 skins/_old/myskin3/myblue.dtp delete mode 100644 skins/_old/myskin3/oper.bmp delete mode 100644 skins/_old/myskin3/skin.inc delete mode 100644 skins/_old/myskin4/Tupfile.lua delete mode 100644 skins/_old/myskin4/base.bmp delete mode 100644 skins/_old/myskin4/build.bat delete mode 100644 skins/_old/myskin4/default.asm delete mode 100644 skins/_old/myskin4/default.dtp delete mode 100644 skins/_old/myskin4/left.bmp delete mode 100644 skins/_old/myskin4/oper.bmp delete mode 100644 skins/_old/myskin4/skin.inc delete mode 100644 skins/_old/nix/nix_big/Tupfile.lua delete mode 100644 skins/_old/nix/nix_big/active/base.bmp delete mode 100644 skins/_old/nix/nix_big/active/left.bmp delete mode 100644 skins/_old/nix/nix_big/active/oper.bmp delete mode 100644 skins/_old/nix/nix_big/inactive/base.bmp delete mode 100644 skins/_old/nix/nix_big/inactive/left.bmp delete mode 100644 skins/_old/nix/nix_big/inactive/oper.bmp delete mode 100644 skins/_old/nix/nix_big/nix_big.asm delete mode 100644 skins/_old/nix/nix_big/nix_big.dtp delete mode 100644 skins/_old/nix/nix_big/skin.inc delete mode 100644 skins/_old/nix/nix_medium/Tupfile.lua delete mode 100644 skins/_old/nix/nix_medium/active/base.bmp delete mode 100644 skins/_old/nix/nix_medium/active/left.bmp delete mode 100644 skins/_old/nix/nix_medium/active/oper.bmp delete mode 100644 skins/_old/nix/nix_medium/inactive/base.bmp delete mode 100644 skins/_old/nix/nix_medium/inactive/left.bmp delete mode 100644 skins/_old/nix/nix_medium/inactive/oper.bmp delete mode 100644 skins/_old/nix/nix_medium/nix_medium.asm delete mode 100644 skins/_old/nix/nix_medium/nix_medium.dtp delete mode 100644 skins/_old/nix/nix_medium/skin.inc diff --git a/data/common/KolibriNext/icons16.PNG b/data/common/KolibriNext/icons16.PNG deleted file mode 100644 index 49085c44c48f39f440b2abe2409cf0f72c904421..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12588 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

M%WkSh=ekgJfh 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 literal 9565 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 diff --git a/skins/_old/gliteskin/gliteskin_glider/base_1.bmp b/skins/_old/gliteskin/gliteskin_glider/base_1.bmp deleted file mode 100644 index 6cccc49e5d8f483ca561b9f1c02e2d82fa935896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$f0z$~!2)=Q$1h%uqG1pM|8W3ZQ4avP C{kD(* diff --git a/skins/_old/gliteskin/gliteskin_glider/default.asm b/skins/_old/gliteskin/gliteskin_glider/default.asm deleted file mode 100644 index fd493349d8..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/default.asm +++ /dev/null @@ -1,33 +0,0 @@ -;SKIN (.SKN) - COMPILE WITH FASM - -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:46:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x5e7186],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0xeae8e3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-22:3][17:17],\ ; buttons coordinates - minimize = [-41:3][17:17] ; [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 ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/gliteskin/gliteskin_glider/default.dtp b/skins/_old/gliteskin/gliteskin_glider/default.dtp deleted file mode 100644 index 2d963add4215bf73074dd5dcf709c1f4c87e7964..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ncmZoGjAPh6zm?(jyAKQ&R#puE|Nm!r{PHyzGeE(_S@ReGguoEq diff --git a/skins/_old/gliteskin/gliteskin_glider/default.dtp.asm b/skins/_old/gliteskin/gliteskin_glider/default.dtp.asm deleted file mode 100644 index 59b534e6ce..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x5e7186 -grab dd 0x859fbb -grab_button dd 0xf0eeeb -grab_button_text dd 0x3a3a38 -grab_text dd 0xFFFFFF -work dd 0xEBE9E3 -work_button dd 0xEBE9E3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0x9E9A91 \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_glider/dtp_build.bat b/skins/_old/gliteskin/gliteskin_glider/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_glider/left.bmp b/skins/_old/gliteskin/gliteskin_glider/left.bmp deleted file mode 100644 index 28db2fb3c06ecaeb08da1f6eada85a00e94ffc4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZ?royN!j24+A~1Bh9HSPY0686G@&XL zjzIj$HR*5!;!my1gd-4tMng6nf%vnUbKnTXpWB)TMX#sWpD)Iuk5dYBM^Vhq)Ipf@z+hMh9eMv38z!cu+$e?YRd_ZMs=iG(EQLqZZJrzD3$p`@gwEN$#$CuGK)&6pv7 zVBFu_dfumx^o)i1y1uWs_kFMDn%y)sK9vUwPc6RHcx&)h;w=kQ;Ts4X;{2+DZ(-yA zKhxb!#7i&qHR;`AK7SXASm21& z(KdiJ#E0jY1uar{?fY=FuDI7`ll8g-T?P!s@Ylq`03mmaC(*@WTOJdm3YhKVI zb=Qt0UMz6L?raZWTU(OkLLX_7x@$*MX$u^&Ki3P`_F0nm?Q4;`YsX$P7C7Qyz7Mdi zEeUg>kF-eLwG-)A3mkE@*bmqiOTyUEYhKVIb=OX2vKBbvcxeEzO-o`j#J8hG>aLx7 z%~{}xla(RBHY~~bCg^=FQg`ii_RRuEoUV-kwqddHqb^5Ur0&|8+`9#iI9neBZ0FuT zENGFsYvW(R@^HlY#spy7V&RS!seiR`U&NTZclQsyWD&hw7&arH;FI09?c+F&NFz|g`23njq(;wvnq+6^7u$sy zjUf9aozjKkyR4-~&&IQF2cwG_jUaoJ6=p=O(sMO>_BfwKq!DD(Wf%)_Cu;QU$+V0} zBgi(F!EmBA2h`}Uw4fl+gS|n&eh1)<~Nql>xeXhY;_r! zg|^h_*+sR8NF&HLmw|DjH3!t_*|T~Xkw%bBm%%K=ov6{X%S98BMvx7cVO)ZqtI@No z 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/gliteskin/gliteskin_glider/skn_build.bat b/skins/_old/gliteskin/gliteskin_glider/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/mygrey/Tupfile.lua b/skins/_old/mygrey/Tupfile.lua deleted file mode 100644 index 97faab2a2c..0000000000 --- a/skins/_old/mygrey/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mygrey.skn") diff --git a/skins/_old/mygrey/base.bmp b/skins/_old/mygrey/base.bmp deleted file mode 100644 index ad9674f24eb963309b2aae96b21269d883c5d832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$FT@SOU;#YD0i59Qfdg33Q5@g|4saR= yIEMpV!~w400M~JVTR6a79N+;C@CXNZh6B970bbz%Z*YM3IKU?y;42P*E9wChHk;T0 diff --git a/skins/_old/mygrey/build.bat b/skins/_old/mygrey/build.bat deleted file mode 100644 index c3a93565d4..0000000000 --- a/skins/_old/mygrey/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -set fasm=c:\kolibri\usr\dos\fasm.exe -set file=default -set srcext=asm -set binext=skn - -%fasm% %file%.%srcext% %file%.%binext% -pause -echo. \ No newline at end of file diff --git a/skins/_old/mygrey/default.asm b/skins/_old/mygrey/default.asm deleted file mode 100644 index 2e7f9e9abb..0000000000 --- a/skins/_old/mygrey/default.asm +++ /dev/null @@ -1,28 +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=0xffffff:\ ; border inner color - bouter=0x6e6e6e:\ ; border outer color - bframe=0x7d7d7d],\ ; border frame color - colors inactive = [binner=0xffffff:\ ; border inner color - bouter=0x6e6e6e:\ ; border outer color - bframe=0x7d7d7d],\ ; border frame color - dtp = 'gray.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/mygrey/gray.dtp b/skins/_old/mygrey/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/mygrey/left.bmp b/skins/_old/mygrey/left.bmp deleted file mode 100644 index f2bf274df67fb545f4c67dd89b8947a66ec0ef16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmZ|EQ3gUm6oBEWxBJp#T0$#m0r$Oqw5rxJR76}Z5fSMjNksJC`R_F({l7V9#(edB zIZR!%*wdIQW*jp}lh`RO!q=mIx{rS4($`;k7W%#MoL7Gjwvn){gzY4(k+4?6_7ZlG gu%m>XB@8v12OS8cvj6}9 diff --git a/skins/_old/mygrey/oper.bmp b/skins/_old/mygrey/oper.bmp deleted file mode 100644 index cd5cacefe36fb0c54581adb6aa60c506c5aef276..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmc(fK}rKr5JbnV3zy;z^aLKjz2IGPfvn6Sa)?}EU=##F5QG6ikSs(@ARxH@R#!2< zw>2)lMgK}?l2=7SGFR8P#~pPEzrZ=iImJ2Z&fr~lgV*m)ba*5U(UMMUc5y6!bo4u=5@dgPag~cNxxKd)Xcd;nm zAmNq5;t>&CDY1X+eWT{~ijrrq{gt8aox);6@p(nbv)BHKAYn^kv7zV{CC^^_FM)&) z3X2UzuPAx;+P45Cd{S6!D0)T7v)8`mA>oU{Vnfj@N}j#;EglJb3X2UzuPAx##dTi? W%74G!DN3&1@8(kPPjjjFzx)@i7uVnb diff --git a/skins/_old/mygrey/skin.inc b/skins/_old/mygrey/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/mygrey/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/myskin1/Tupfile.lua b/skins/_old/myskin1/Tupfile.lua deleted file mode 100644 index 5c3dd43576..0000000000 --- a/skins/_old/myskin1/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "myskin1.skn") diff --git a/skins/_old/myskin1/base.bmp b/skins/_old/myskin1/base.bmp deleted file mode 100644 index 2183439ff26a5ef2da9459db6f6eb8c48204057d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$FT@SOU;!W@%YhyJZ*ahh{?yrHML%ln zu%a(jwph`J3LC8GO_?=T^rFNHD|%97i4{F4u)vD$4<7>0?DZV)U>gtdR&5#1-!VHrn=) diff --git a/skins/_old/myskin1/default.asm b/skins/_old/myskin1/default.asm deleted file mode 100644 index 8829a195b6..0000000000 --- a/skins/_old/myskin1/default.asm +++ /dev/null @@ -1,28 +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=0x4488ff],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x4488ff],\ ; border frame color - dtp = 'myblue.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/myskin1/left.bmp b/skins/_old/myskin1/left.bmp deleted file mode 100644 index 263f4cecb39935fd807039be207b32db6268c528..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmZ?royWug24+A~1Bf|+SPY0686jV)QT(R1PgQAkqYK`axzh0055f1yTS2 diff --git a/skins/_old/myskin1/myblue.dtp b/skins/_old/myskin1/myblue.dtp deleted file mode 100644 index 9e268cc7a7e358f6da593fac8e74b92da4d39ed3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 rcmcap6Tol>ioaaA!0_eE7lwQ5`WQ}>*)V*2_l<#rgMr~%Qy2pPo0k%m diff --git a/skins/_old/myskin1/oper.bmp b/skins/_old/myskin1/oper.bmp deleted file mode 100644 index 2e77ff35856038f98eeade705d74d3434ec23c16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmZ?rZR27912Z700mSM+EC$4k3=%++fgu1We}oT$!2&=+mV-{{e}e-A0c`{VIG1h= zh`oR6?CFVszJu8NqsES&2yX9}DqDIYxV;}LZ0L#L_P!~zhNJ%&04{}x0n~&ki&YS) z3~uj>5-T{uu=YP(3Ks*e1z7=BL5Kply-$iPDMWBvAm*TP(F}*%`=G#ras;;v&cJ0R z+}=BR=2Ss&8-WZw2Ey&Vkz+;`glsP!1L5{w$ugxJAzKPz<1!O&@0m1X3K85=h&gCn zG{dQ7FIHQy3PN24E1yrK7*U9TwqTloRS>8Q?%yLxhV(>mdk-WS&=bM!-4mxzPXxDj YM~ogl5!_xNgU$%j-T;#HN5FO+0GKTEU;qFB diff --git a/skins/_old/myskin1/skin.inc b/skins/_old/myskin1/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/myskin1/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/myskin3/Tupfile.lua b/skins/_old/myskin3/Tupfile.lua deleted file mode 100644 index 47505c41d8..0000000000 --- a/skins/_old/myskin3/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "myskin3.skn") diff --git a/skins/_old/myskin3/base.bmp b/skins/_old/myskin3/base.bmp deleted file mode 100644 index 38fc96e93c96b28b41f489e3b6ffc45501c2bb77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$FT@SOU;!Yp$H^Kiy3vw(qa_PQ!Wlq8 z9H=_}23C|8d;=>=^}3Pjc>_v%-bjO@>v7K4pF diff --git a/skins/_old/myskin3/default.asm b/skins/_old/myskin3/default.asm deleted file mode 100644 index 322632e3ef..0000000000 --- a/skins/_old/myskin3/default.asm +++ /dev/null @@ -1,28 +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=0x3355dd:\ ; border inner color - bouter=0x1133dd:\ ; border outer color - bframe=0x6688dd],\ ; border frame color - colors inactive = [binner=0x3355dd:\ ; border inner color - bouter=0x1133dd:\ ; border outer color - bframe=0x6688dd],\ ; border frame color - dtp = 'myblue.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/myskin3/left.bmp b/skins/_old/myskin3/left.bmp deleted file mode 100644 index fb97cfc05c7bab080b0cff3b72622213f4a7a003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmZ|GziPrz6vy#fHy1~7ybg+!F$fjvpF*-Uf?^}C{uwIj;0tv1Ied_68?Z*j#X;2j zI6c3cR5TpJ=Ufi=dt)``F`>U_I&(B}nk3DWNYN?8i26DajJ}{_X_eJ%5}^IoT~o91 z|2r%}qm7~4XHRi-o3<54w+}~!>fthU)X+h@bnP3~r5i#!cV1X%r)H6bc6`gT&*GGd``(7p|M^;3|ioaaA!0_eE7lwQ5`WQ}>*)V*2_l<#rgMr~%Qy2pPo0k%m diff --git a/skins/_old/myskin3/oper.bmp b/skins/_old/myskin3/oper.bmp deleted file mode 100644 index 25636598910b803f523c53d0cca1b0be3b4e2fcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmchZJxc>Y5Qfjz!cr{P!jCF32nre%?iv-8c)>Pm5kU+8fNk(c88x7uicJd9?7xZQ zy_aFLcRL7o?D6g}AMebQGU3tPY><8%6j$l3(3__>6D&{+f)>qR=kU@7g@a3Jvk`kHBhy2dxexAJyz?IKl9H1q5;IaWiJPX!Doyi0b8tT{TAl@Na^ChVa4Gs1 H{jd8474_h7 diff --git a/skins/_old/myskin3/skin.inc b/skins/_old/myskin3/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/myskin3/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/myskin4/Tupfile.lua b/skins/_old/myskin4/Tupfile.lua deleted file mode 100644 index 8eaadc9ef4..0000000000 --- a/skins/_old/myskin4/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "myskin4.skn") diff --git a/skins/_old/myskin4/base.bmp b/skins/_old/myskin4/base.bmp deleted file mode 100644 index cf52d233fe4ee5b8bd2104342052c7817d315663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$FT@SOU;!ZU9|x$#0h(}tb{wDw2bhQh zOv3?Y;{XeAfTcLVDjeV}4sZzvxQ+wd!2urP0MBrM4>-VA9N-rYfFpYUm`9;tb|0gqP z_pRK;@-&RDdG1-xC})y0h-vPKReCf2O?QxM-RoOcSnnF2*ha#(61J1Dy@VYk>?mPp m39BTmmavP2T_x-$VRs38NZ3=tUJ~|}u#be5ujK!SSH|F5Fal zGf=Y$bCc=quI^K3=drhcyxv828F#q0xi-1hx-G`8J7E8ALst|SKIh6|3f{DuZ;JP5 z_HcW67ZY<5nFuXJX_S}OJE_TOWHm~xy;tS%56>ca1@XkjXm6PkYj5B8ocS{xqr-Uw zZ>E?xaX0Fw#M(OygOB|(;TRn*B6wL6pVv}jQ#2*k-s^Jca2dgC$QD(+)PJC8O02y% z<r= 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/nix/nix_big/Tupfile.lua b/skins/_old/nix/nix_big/Tupfile.lua deleted file mode 100644 index 19cd6c8fc5..0000000000 --- a/skins/_old/nix/nix_big/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("nix_big.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "nix_big.skn") diff --git a/skins/_old/nix/nix_big/active/base.bmp b/skins/_old/nix/nix_big/active/base.bmp deleted file mode 100644 index d7180535d15d0ffbfc578b44cb051e21f58292e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmZ?r-Npa`WpUc!PwV@Arc9L#K3w3Js9GHJQ)&0ycm+hd>B%~eHqds{1`H#{24N%1Hd>V X(x0KHB8y?!gnEYJ^f(4T4_5{NHh3am diff --git a/skins/_old/nix/nix_big/active/left.bmp b/skins/_old/nix/nix_big/active/left.bmp deleted file mode 100644 index 800ed0337c7725040379a5a26fd3db3f2647cb51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmaLTKMsO09ERZ%FX8Cu37B*-rJ%7b5To)(jL|5%y13~996W_b@O*yZ>mVVKJZ)Zn z1ky0kA5S!wk9~;M!x~_DqK{pOhkM@KxXna?8vB5Iw3Q=ZZ{iTxRT=@ij6-m3RcTeX z3#)+h!UWLm+yuaRtF_Fv@turT4mAEr+(<$&fyTuIH`{f+ihm{8QaczKI f=N8!KB8G0)nFY?Dw+pb}uRE}>rwZ8k)qws2H@;oO diff --git a/skins/_old/nix/nix_big/active/oper.bmp b/skins/_old/nix/nix_big/active/oper.bmp deleted file mode 100644 index 7ed01543edf915ceeb321f0a47a6cda2861a7546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5046 zcmd5=TW=dh7!ALH7kEJ8frp3}N@BZ?z25a@ulC-(w&V3Ru^T68+K?uSQUYq~fJ#My zS`>s(1ymH&K&eC@T8S5sc!*l5Re{h#Rc;j$v`D2~BtS|82d}d%wjmO-#9GIrZ_amS z=j_bv?ATH1%$xMpF$HZ zfyxl^upi#yv6i=j%DDkWjW6lE&XO$Q6QZOwZbhAU14>DuYzRr7VjSM`D(40iv_FSP zW68gHQ`o!WIE@YAaj@sq4aVT1tGArOx&c^Mg^qE{$xK(^MofuTB7Q#bV4N6i zgAg15W3VA>*qv8E!%RFPl3s3T8#F171Op&I6(mv+fN{2J4jrp81QYbwbLtd02gYpd_S z_x-I~YnLuQIy>d>zXw2oDoCUtfDB^0A=Xu1WwHIzj&ZZIZ9yXB88h_@=U0FK=g+Yh zpOeBqgCp&>=#CF;tMA=&^TxMmx4yo9_VlTJ^V0wVR6!yI0c2ZygZXYq5Cdab?ZUZ# z_jW|0yjXSi6);o$&;#{_nVUDhvF_=&Uw`@eryl_X7K0Q7kXh@&YK!^JD~w79>A;{6 z4O#C6nC}XmAxg=38L<$1PoUJhOIfYT^U@S1mZ{-c*VKIgWM+$Gp+G~SF8axG=vkSzg%qr2L z@IXI2I9*vWNTeWu%-QficuR65Zcw9xZLml@eVyL0Qzc06;C**Lb6|g`H;_m{0NIw_ zaPi(EB~ay*xUjqS?mK5Yy@5mu0?3^Gww_a(paUKu(mID&8)L6ZY*P~HS(=}|cJ-4^ zV-|xH1duiNwAKl&`xyxbfZhT3D3YGX7w5if?jai+8yC;7t{giGAV3xNkb(d*i0!UR zx=>CE1|Q}^+wHR@$Q}ZH$zk8}-r4J4ehwQy+`ip7Sf{=B0|-zBi4+8oHOH#eJKhu{ zMjYEXPyXc%OmC5w>0Kkkhw6(*k37{lu!LBP`T+!}fIP%hpuroS5!K;s924yVOqlAVsg^We<0zSp zTH|(TVbTqF`r)a@BfI7*8J#2T_4fMVeQvx&d?JrTNKn T)zlR(DsIjxX4aj+e_Ve6;lnCJ diff --git a/skins/_old/nix/nix_big/inactive/base.bmp b/skins/_old/nix/nix_big/inactive/base.bmp deleted file mode 100644 index 0fa0344f67add04cd8c4d7a264f2e68c3578e51b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmZ?r-Npa`WFfqal&F9$0IZ%1neA150IKNnjDe^)z(05>~^KzDnFAP)zIU{6Pe5Fm~X@ncAi PjbaE7^k?w%aAg1hyOkTw diff --git a/skins/_old/nix/nix_big/inactive/left.bmp b/skins/_old/nix/nix_big/inactive/left.bmp deleted file mode 100644 index befa12e299b165279701bd730b3ec9e612f7f2a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmb8rTMB|e7=~e`O?261EAUV`9!O{GU|B*Cc-2N)RqN};&n_Z}l4pM2@q}3HAHFvn z0dvlpux2dZn=(D`K3*R-<7ix2B>~ve)`U>kX^ijf(ipnutxe=i^m=Dx|LH0Tp=W<- zn}qoM&P}#}&TsQ2)VpE@b+b;OK9mOPV`ZRjZ3^|tWl*2%9O|ylq3*i|>RW$>`qCbt I=2wG$0($>Ypa1{> diff --git a/skins/_old/nix/nix_big/inactive/oper.bmp b/skins/_old/nix/nix_big/inactive/oper.bmp deleted file mode 100644 index ee61593987d759f82afa15bcd863b594dab80fc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5046 zcmdUz+jg2j6o%7h=uIzs*}JyOXd)sY2Zw`zD4yaun#8twh(1-HuOFh+phnW<1KWb1 zP_BxDX8j2_N39kIf+ETl&)Df!9AYqmnx8e|kNuHZ>Z5IYj zxqPUbP_AD<5?s4{4lMKZ*!q=KD_c^Dfz3K+RFVQCnJ00U#on144l!apL)o8iFL84k zHCLCPgRM!q$4~IUWKGnmFkq zfUs;xW*~?ul``Ejf6hQ&*3uRRWsO^Q4k(7FWhfBKaYIQ*lOo4tU65f38EE39i-4`* zd0F6Qyn|0>aK0;PoHd_of^T?7zzoR`DRlz2|x>N|v_ zZ1ris3m;0EvPv1IO}Ypm?D!KX_l@Lg(s?1|N@OS1{BggA5}Tg~2Vl^|Nf!Zx9p^<) z#Pm!peJ^+%;AaK%M?#+uV;;}t&7kXAr~xo&;-rg!r0z#~9hH~+Rcp_!rOW3983R-4 zx@O-Ov1bLA;%ZfZK@%rk1Q2$dmoVsM+yb+HcKC+uHP|XBQ^ii_-#Q_QQ_7sV)Gb{~ zhFH6rhL-Xc$dVpTe$x3Qz(7pNZ#L5X)@~}rL1@apQOmeRLM;y378^_s_PTX!tvHC9 zY_NJD^t7g3r%@bqD56#83o7LnJB{L?OA&?2J2&Mvje}w!ob|#{D7rS>cDkh>F#r6{ li)=lgpi*pWq1c@vgD5NrhMjioyZi 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/nix/nix_medium/Tupfile.lua b/skins/_old/nix/nix_medium/Tupfile.lua deleted file mode 100644 index daf4a249dc..0000000000 --- a/skins/_old/nix/nix_medium/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("nix_medium.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "nix_medium.skn") diff --git a/skins/_old/nix/nix_medium/active/base.bmp b/skins/_old/nix/nix_medium/active/base.bmp deleted file mode 100644 index d368470feaeaa12c225f04a15a21030ca9bf0cf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGWzAu%9a! zM*-<5Ul)c*C?sWe43is*8T>q4831#~ B8V>*f diff --git a/skins/_old/nix/nix_medium/active/left.bmp b/skins/_old/nix/nix_medium/active/left.bmp deleted file mode 100644 index 8500f7a82ac2c41f27688f13cda154ad5e5ce443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmZXQK?=e!5JgkGgiDv6pgT9EiM5!-iWE(QB8Z49!3*>bdSD-&B83cZhR4q=h7`8V z)KEEdNzdpxoefi|#rRJ2FIQ=^%7FxL>jK0t`wfW4-5N&sCVC^@c>|+6-8r3la2g~J zwgmB$Eg|*k{<*0@cBc1S4>d@BYqubNKROV91P|iR*g(4T?O!1Ir+31Z?+)S<8B=`L41g?!*7Ne_M7wVnK_J$J$l5TG!u-c zp`U_&4EiBuG#GXc!=kB?m`NW9n~`={IGQjRB8*E1B)^+=S}5GCcylRA)W^yG*{Bgp_Ik{D$^=e3^KLR;FS zUI%971))R#RzRjO87gCXPhINfPC)Wp8xr` zHZ@W5;T=d1%B{6J2>15(u3x*7i3yJ%ZmIhwhVrbV6DgrgS+~V=kY}9rGy#$73pZfv z4^2}eU9F7xu@0mM<>pFF{iGdX-}t2*XEz}wlqu^ndu%4lXV$h8oU<#zQ%Kq9iH^L5Nr=RTGV;?WkF=g&K7Cx8pG`}A*y}(s z8}Abeyk-1&$Ak5IV7R}(|Ka`HomVfvef_NZS4#syj|D~U2{8hJ{dxQT=doq&#_f&Y zp1Zr>D}x!Tvu(Y$sCr&56+(m+1@9GoK@z9z>f6^VGA)w~kRw@nrdpmX7a?kx#s|A2 zGu5%F%20noNC^~*oQe2F+Ckf`O5MV$WwH{N;)yV6mArVL$mArxJ3zuRN@IN?Z#K%J z$o&!r1@CpLo;iurfs64#%K6~J)!@+_@ vJ|2Mgo+EH2&s&qjI#8P~kESC&ms&$NCr5Q)d3t;#9b;VTeL}K2V=(*z$}0h% diff --git a/skins/_old/nix/nix_medium/inactive/base.bmp b/skins/_old/nix/nix_medium/inactive/base.bmp deleted file mode 100644 index 354be176a52202cb22d44929bb041b13124ad5e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGWe4K0;{9J4q0^IBv0^RKyf;}C9*nuHFJdhzSGK|5`!<7L5oi`OE diff --git a/skins/_old/nix/nix_medium/inactive/left.bmp b/skins/_old/nix/nix_medium/inactive/left.bmp deleted file mode 100644 index c730539428fb78f62f5580f9855c1a5da55760a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmZ{gO%8%E5Jn+h!lg@3fHYbPL`&-rk&r;#=>2cu3!fSj!sN~5W%|vg^=(L#sWRr4 zUeRkhoo143KJTo4)rOO|8L+`ak%K%s19K0~z&zg+IcUG+-tIt|CI7!YI|IsJsy)cB k^#SDV(SrQ$3y^n>19=}S_(G96fwZwQcDqD&sR@sPOgEI>}$ho1cuxrGv)wHYRcHJF7TR3UN~)@Jq=6| zmwM)18ZHw0JHpt}c`-0E-@4DDc^ptf_9kBvSH~1lk*)De$o|#SQ-?78dOkiLs$V$P zPsh3l9A6uC%LKD5;%}GJL%o}ZUSz4uB6&U^5S0;&a7=`-y=e2qYI^Y0!8|6AIqudR zHmCgtO1?Vm_+Tzl`q1q0=~Qi7oU1LO63>81$Hc%_2XJO*h=1LV$;(Aj64y*zqXz_G zKf4exF`h*PJ}uy1ukI1mak>E(82r%_EQleWYv7J`8W>;+j{G^Y)pNCjC$haX`+Ygb zOO$|TV$69W?q)yZOx7@`&cJezfi%<*e&7uAV#^^7g$W>9UkDw3!30hO%RWwpF( zHcM>p=_qEJ7ndgjJVo(qxC#~lqa>QUx&4O4g&qZX50X(OH%{=SnOaPkoVpGsr(B@g; VF8_bj+tq5COaq7IiB2#i=?7Zx?cx9c diff --git a/skins/_old/nix/nix_medium/nix_medium.asm b/skins/_old/nix/nix_medium/nix_medium.asm deleted file mode 100644 index 910bbaa1bc..0000000000 --- a/skins/_old/nix/nix_medium/nix_medium.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:18:2],\ ; margins [left:top:right:bottom] - colors active = [binner=0x363C46:\ ; border inner color - bouter=0x363C46:\ ; border outer color - bframe=0x363C46],\ ; border frame color - colors inactive = [binner=0x393C46:\ ; border inner color - bouter=0x393C46:\ ; border outer color - bframe=0x393C46],\ ; border frame color - dtp = 'nix_medium.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-19:6][12:12],\ ; buttons coordinates - minimize = [-33: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' diff --git a/skins/_old/nix/nix_medium/nix_medium.dtp b/skins/_old/nix/nix_medium/nix_medium.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/nix/nix_medium/skin.inc b/skins/_old/nix/nix_medium/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/nix/nix_medium/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 243ebafcaa..273e4e9da2 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -44,7 +44,6 @@ skinlist = { "_old/first_skin/first_skin.skn", "_old/Flyght/Flyght.skn", "_old/gliteskin/gliteskin_deepsky/gliteskin_deepsky.skn", -"_old/gliteskin/gliteskin_glider/gliteskin_glider.skn", "_old/gliteskin/gliteskin_red/gliteskin_red.skn", "_old/gnome_style/gnome_blue/gnome_blue.skn", "_old/gnome_style/gnome_green/gnome_green.skn", @@ -74,17 +73,11 @@ skinlist = { "_old/mist/mist.skn", "_old/mist_color/mist_color.skn", "_old/mursky/mursky.skn", -"_old/mygrey/mygrey.skn", -"_old/myskin1/myskin1.skn", -"_old/myskin3/myskin3.skn", -"_old/myskin4/myskin4.skn", "_old/MyTango/MyTango.skn", "_old/Nature/Nature.skn", "_old/neutral/neutral_blue/neutral_blue.skn", "_old/neutral/neutral_green/neutral_green.skn", "_old/neutral/neutral_lilac/neutral_lilac.skn", -"_old/nix/nix_big/nix_big.skn", -"_old/nix/nix_medium/nix_medium.skn", "_old/nix/nix_small/nix_small.skn", "_old/Nova_skins/Nova_blue/Nova_blue.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn",