From f8a191a6528ca63b760a70139b0cdb6d342e109c Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 13 Mar 2019 22:21:31 +0000 Subject: [PATCH] A lot of fixes in skins git-svn-id: svn://kolibrios.org@7608 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/Leency/AreaSq/build.bat | 1 + skins/Leency/AreaSq/default.dtp | Bin 40 -> 40 bytes skins/Leency/AreaSq/default.dtp.asm | 18 +- skins/_old/MetalColor/MCBlue/MCBlue.asm | 2 +- skins/_old/MetalColor/MCBlue/build.bat | 3 + skins/_old/Simple_gray/build.bat | 1 + skins/_old/Simple_gray/simple_gray.dtp | Bin 40 -> 40 bytes skins/_old/StyleXP/orqua/base_1.bmp | Bin 582 -> 0 bytes skins/_old/StyleXP/orqua/default.asm | 6 +- skins/_old/StyleXP/orqua/default.dtp | Bin 40 -> 40 bytes skins/_old/StyleXP/orqua/default.dtp.asm | 6 +- skins/_old/StyleXP/orqua/dtp_build.bat | 2 - skins/_old/StyleXP/orqua/left_1.bmp | Bin 406 -> 0 bytes skins/_old/StyleXP/orqua/pack_build.bat | 1 - skins/_old/StyleXP/orqua/skn_build.bat | 2 + skins/_old/StyleXP/pack_build.bat | 4 - skins/_old/StyleXP/panther/base_1.bmp | Bin 582 -> 0 bytes skins/_old/StyleXP/panther/default.asm | 6 +- skins/_old/StyleXP/panther/default.dtp | Bin 40 -> 40 bytes skins/_old/StyleXP/panther/dtp_build.bat | 2 - skins/_old/StyleXP/panther/left_1.bmp | Bin 406 -> 0 bytes skins/_old/StyleXP/panther/pack_build.bat | 1 - skins/_old/StyleXP/panther/skn_build.bat | 2 + skins/_old/StyleXP/{orqua => }/skin.inc | 0 skins/_old/StyleXP/wmpx/default.asm | 2 +- skins/_old/StyleXP/wmpx/default.dtp | Bin 40 -> 40 bytes skins/_old/StyleXP/wmpx/dtp_build.bat | 2 - skins/_old/StyleXP/wmpx/pack_build.bat | 1 - skins/_old/StyleXP/wmpx/skin.inc | 239 ------------------ skins/_old/StyleXP/wmpx/skn_build.bat | 2 + .../Humanoid_OSX_dark/default.asm | 4 +- .../Humanoid_OSX_dark/dtp_build.bat | 2 - .../humanoid_OSX/Humanoid_OSX_dark/left_1.bmp | Bin 406 -> 0 bytes .../Humanoid_OSX_dark/pack_build.bat | 1 - .../humanoid_OSX/Humanoid_OSX_dark/skin.inc | 239 ------------------ .../Humanoid_OSX_dark/skn_build.bat | 2 + .../Humanoid_OSX_dark_night/default.asm | 4 +- .../Humanoid_OSX_dark_night/dtp_build.bat | 2 - .../Humanoid_OSX_dark_night/left_1.bmp | Bin 406 -> 0 bytes .../Humanoid_OSX_dark_night/pack_build.bat | 1 - .../Humanoid_OSX_dark_night/skin.inc | 239 ------------------ .../Humanoid_OSX_dark_night/skn_build.bat | 2 + .../humanoid_OSX/humanoid_OSX_blue/base.bmp | Bin 142 -> 150 bytes .../humanoid_OSX/humanoid_OSX_blue/base_1.bmp | Bin 142 -> 150 bytes .../humanoid_OSX_blue/default.asm | 8 +- .../humanoid_OSX_blue/default.dtp | Bin 40 -> 40 bytes .../humanoid_OSX_blue/default.dtp.asm | 20 +- .../humanoid_OSX_blue/dtp_build.bat | 2 - .../humanoid_OSX/humanoid_OSX_blue/left.bmp | Bin 142 -> 150 bytes .../humanoid_OSX/humanoid_OSX_blue/left_1.bmp | Bin 142 -> 0 bytes .../humanoid_OSX/humanoid_OSX_blue/oper.bmp | Bin 2694 -> 2934 bytes .../humanoid_OSX/humanoid_OSX_blue/oper_1.bmp | Bin 2694 -> 2934 bytes .../humanoid_OSX_blue/pack_build.bat | 1 - .../humanoid_OSX/humanoid_OSX_blue/skin.inc | 239 ------------------ .../humanoid_OSX_blue/skn_build.bat | 2 + .../humanoid_OSX/humanoid_OSX_green/base.bmp | Bin 582 -> 150 bytes .../humanoid_OSX_green/base_1.bmp | Bin 582 -> 150 bytes .../humanoid_OSX_green/default.asm | 8 +- .../humanoid_OSX_green/default.dtp | Bin 40 -> 40 bytes .../humanoid_OSX_green/default.dtp.asm | 20 +- .../humanoid_OSX_green/dtp_build.bat | 2 - .../humanoid_OSX/humanoid_OSX_green/left.bmp | Bin 406 -> 150 bytes .../humanoid_OSX_green/left_1.bmp | Bin 406 -> 0 bytes .../humanoid_OSX/humanoid_OSX_green/oper.bmp | Bin 2694 -> 2934 bytes .../humanoid_OSX_green/oper_1.bmp | Bin 2694 -> 2934 bytes .../humanoid_OSX_green/pack_build.bat | 1 - .../humanoid_OSX/humanoid_OSX_green/skin.inc | 239 ------------------ .../humanoid_OSX_green/skn_build.bat | 2 + .../humanoid_OSX_orange/default.asm | 4 +- .../humanoid_OSX_orange/dtp_build.bat | 2 - .../humanoid_OSX_orange/left_1.bmp | Bin 406 -> 0 bytes .../humanoid_OSX_orange/pack_build.bat | 1 - .../humanoid_OSX/humanoid_OSX_orange/skin.inc | 239 ------------------ .../humanoid_OSX_orange/skn_build.bat | 2 + .../humanoid_OSX/humanoid_OSX_red/default.asm | 4 +- .../humanoid_OSX_red/dtp_build.bat | 2 - .../humanoid_OSX/humanoid_OSX_red/left_1.bmp | Bin 406 -> 0 bytes .../humanoid_OSX_red/pack_build.bat | 1 - .../humanoid_OSX/humanoid_OSX_red/skin.inc | 239 ------------------ .../humanoid_OSX_red/skn_build.bat | 2 + .../humanoid_OSX_yellow/default.asm | 4 +- .../humanoid_OSX_yellow/dtp_build.bat | 2 - .../humanoid_OSX_yellow/left_1.bmp | Bin 406 -> 0 bytes .../humanoid_OSX_yellow/pack_build.bat | 1 - .../humanoid_OSX/humanoid_OSX_yellow/skin.inc | 239 ------------------ .../humanoid_OSX_yellow/skn_build.bat | 2 + skins/_old/humanoid_OSX/pack_build.bat | 6 - .../panther => humanoid_OSX}/skin.inc | 0 88 files changed, 83 insertions(+), 2010 deletions(-) create mode 100644 skins/_old/MetalColor/MCBlue/build.bat delete mode 100644 skins/_old/StyleXP/orqua/base_1.bmp delete mode 100644 skins/_old/StyleXP/orqua/dtp_build.bat delete mode 100644 skins/_old/StyleXP/orqua/left_1.bmp delete mode 100644 skins/_old/StyleXP/orqua/pack_build.bat delete mode 100644 skins/_old/StyleXP/pack_build.bat delete mode 100644 skins/_old/StyleXP/panther/base_1.bmp delete mode 100644 skins/_old/StyleXP/panther/dtp_build.bat delete mode 100644 skins/_old/StyleXP/panther/left_1.bmp delete mode 100644 skins/_old/StyleXP/panther/pack_build.bat rename skins/_old/StyleXP/{orqua => }/skin.inc (100%) delete mode 100644 skins/_old/StyleXP/wmpx/dtp_build.bat delete mode 100644 skins/_old/StyleXP/wmpx/pack_build.bat delete mode 100644 skins/_old/StyleXP/wmpx/skin.inc delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark/skin.inc delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/skin.inc delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_blue/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_blue/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_blue/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_blue/skin.inc delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_green/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_green/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_green/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_green/skin.inc delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_orange/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_orange/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_orange/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_orange/skin.inc delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_red/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_red/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_red/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_red/skin.inc delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_yellow/dtp_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_yellow/left_1.bmp delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_yellow/pack_build.bat delete mode 100644 skins/_old/humanoid_OSX/humanoid_OSX_yellow/skin.inc delete mode 100644 skins/_old/humanoid_OSX/pack_build.bat rename skins/_old/{StyleXP/panther => humanoid_OSX}/skin.inc (100%) diff --git a/skins/Leency/AreaSq/build.bat b/skins/Leency/AreaSq/build.bat index 32faafdd9c..be6efc3d15 100644 --- a/skins/Leency/AreaSq/build.bat +++ b/skins/Leency/AreaSq/build.bat @@ -1,4 +1,5 @@ del default.skn +fasm default.dtp.asm default.dtp fasm default.asm default.skn kpack default.skn pause \ No newline at end of file diff --git a/skins/Leency/AreaSq/default.dtp b/skins/Leency/AreaSq/default.dtp index 59d16238062c0173326f30d1884c994cfc4e1b67..e1abfe69b9685fe20f9758b1b4fb981864e3b9a8 100644 GIT binary patch delta 26 icmdPU;BQNhVEFg%AH%U@#~6P9{ymXjl%=A+o&f-&?hFwC delta 26 icmdPU;5Rk1V=y;2XK?onV)+06|3rRKmW_M%FaQ8qw+L?l diff --git a/skins/Leency/AreaSq/default.dtp.asm b/skins/Leency/AreaSq/default.dtp.asm index a182bb44b3..e057164416 100644 --- a/skins/Leency/AreaSq/default.dtp.asm +++ b/skins/Leency/AreaSq/default.dtp.asm @@ -1,14 +1,14 @@ struc system_colors { - .frame dd 0x000000 - .grab dd 0x006393 - .grab_button dd 0xB1B1B1 - .grab_button_text dd 0x000000 - .grab_text dd 0xFFFFFF - .work dd 0xE8E8E8 - .work_button dd 0xB1B1B1 - .work_button_text dd 0x000000 + .unused1 dd 0x586786 + .unused2 dd 0xFEFEFE + .work_3d_dark dd 0xC6C6C6 + .work_3d_light dd 0xFBFBFB + .grab_text dd 0xF3F3F3 + .work dd 0xE4E4E4 + .work_button dd 0xCACAC1 + .work_button_text dd 0x2F2F2F .work_text dd 0x000000 - .work_graph dd 0x000000 + .work_graph dd 0x808079 } struct system_colors \ No newline at end of file diff --git a/skins/_old/MetalColor/MCBlue/MCBlue.asm b/skins/_old/MetalColor/MCBlue/MCBlue.asm index 9839e167fe..76272236cf 100644 --- a/skins/_old/MetalColor/MCBlue/MCBlue.asm +++ b/skins/_old/MetalColor/MCBlue/MCBlue.asm @@ -2,7 +2,7 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [7:2:7:4],\ ; margins [left:top:right:bottom] + margins = [4:4:67:4],\ ; margins [left:top:right:bottom] colors active = [binner=0x000000:\ ; border inner color bouter=0x000000:\ ; border outer color bframe=0xAFB1BE],\ ; border frame color diff --git a/skins/_old/MetalColor/MCBlue/build.bat b/skins/_old/MetalColor/MCBlue/build.bat new file mode 100644 index 0000000000..4162715244 --- /dev/null +++ b/skins/_old/MetalColor/MCBlue/build.bat @@ -0,0 +1,3 @@ +fasm MCBlue.asm default.skn +kpack default.skn default.skn +pause \ No newline at end of file diff --git a/skins/_old/Simple_gray/build.bat b/skins/_old/Simple_gray/build.bat index d7204fe3cb..5c620d79f3 100644 --- a/skins/_old/Simple_gray/build.bat +++ b/skins/_old/Simple_gray/build.bat @@ -1,2 +1,3 @@ fasm simple_gray.asm simple_gray.skn +kpack simple_gray.skn simple_gray.skn pause \ No newline at end of file diff --git a/skins/_old/Simple_gray/simple_gray.dtp b/skins/_old/Simple_gray/simple_gray.dtp index 633ad8239c05f3ff81b1b4e44a7d02bd987313a7..1078965260dabc74ac1b83ebac6f9ebd7b678058 100644 GIT binary patch delta 26 kcmV+#0OkKEC=ZmBlmOV?-T=qT%K-fR{*ezA1e%(i0H>o2jQ{`u delta 26 hcmdPU;GZ&O3d4u7th{T?>5^ b`Y!ZS=tk&P=uYTf=$FuMp+7H6%KF;2RK6_IFAEd!~rhj s0M~GU8#usC9N;z%a2E%-j{`iw0UqH1k8yw}IKVS1ffqOcj%Z&60O4A_A^-pY diff --git a/skins/_old/StyleXP/panther/default.asm b/skins/_old/StyleXP/panther/default.asm index 2372d35f0d..363e85bd9f 100644 --- a/skins/_old/StyleXP/panther/default.asm +++ b/skins/_old/StyleXP/panther/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' +BITMAP bmp_base1,'base.bmp' diff --git a/skins/_old/StyleXP/panther/default.dtp b/skins/_old/StyleXP/panther/default.dtp index 1259a114d22df5615ab5f569466991e549fa91c9..c265db5084a72ed0effd60367314d6c0a65441e9 100644 GIT binary patch delta 9 QcmdPUn4rS4YSk(R01bx&2LJ#7 delta 9 QcmdPUn4rQkXU-f301XKO-2eap diff --git a/skins/_old/StyleXP/panther/dtp_build.bat b/skins/_old/StyleXP/panther/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/StyleXP/panther/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/StyleXP/panther/left_1.bmp b/skins/_old/StyleXP/panther/left_1.bmp deleted file mode 100644 index c63d76d184742b40b9b791d2cad84f55220ad1b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcma*d!3n}Z6h+aWge3lIFy+?gqk z=PYIi?Y(BB*=e%KwIfb?FSp;BFSJrh)k5c0>)u_%uWrEa7jU=WzJmJ(?hf2NxCe0G W!TkXD6Wk-XU*LYjKm7s!r?qZ;>8OF5Qc$Ot5z`p0D5-_cK`qY delta 25 YcmdPUm>?qZ`SWK65Qc&E>(?^?0DlGu$N&HU diff --git a/skins/_old/StyleXP/wmpx/dtp_build.bat b/skins/_old/StyleXP/wmpx/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/StyleXP/wmpx/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/StyleXP/wmpx/pack_build.bat b/skins/_old/StyleXP/wmpx/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/StyleXP/wmpx/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/StyleXP/wmpx/skin.inc b/skins/_old/StyleXP/wmpx/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/StyleXP/wmpx/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/StyleXP/wmpx/skn_build.bat b/skins/_old/StyleXP/wmpx/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/StyleXP/wmpx/skn_build.bat +++ b/skins/_old/StyleXP/wmpx/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/default.asm b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/default.asm index d872e1f35f..4bbf274563 100644 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/default.asm +++ b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/dtp_build.bat b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/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/humanoid_OSX/Humanoid_OSX_dark/left_1.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/left_1.bmp deleted file mode 100644 index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZw6!3qK)6op}D(KaMw7>E=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/pack_build.bat b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/skin.inc b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/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/humanoid_OSX/Humanoid_OSX_dark/skn_build.bat b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark/skn_build.bat +++ b/skins/_old/humanoid_OSX/Humanoid_OSX_dark/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm index 5e9bf7fde9..c918410474 100644 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm +++ b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/dtp_build.bat b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/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/humanoid_OSX/Humanoid_OSX_dark_night/left_1.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/left_1.bmp deleted file mode 100644 index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZw6!3qK)6op}D(KaMw7>E=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/pack_build.bat b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/skin.inc b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/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/humanoid_OSX/Humanoid_OSX_dark_night/skn_build.bat b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/skn_build.bat +++ b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/base.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/base.bmp index 4036741e7d0d794e9611017ad1abbb4a5f5cbcd9..2c962bd4d142f255a7eb0909970fac0bce4c391b 100644 GIT binary patch literal 150 zcmY+#K?*`407cQ;4n#x*5kZVTiSQB0`h|n$?V(k*-ppvwgLB{g@#4GFxMkQ4X8xz} zoc)iKk{_iMT5F6kSZi_4;k_q>K#Y-Pe;_SKQcC2US=W_P3bj^RYh2D7*X=g--Vs9Z E2F$VytN;K2 literal 142 zcmY*~K?(vP005^Sh=>Rxf`TL>EFw}{cJ2fyfkLQ~oW9_^=E%kA;3a_L8 zky7$iDTUS=V+__>oO5{Z2_X<;B&9^onNkY1R<>=UwMOrqF$UMm&TYRl=R^p>2Xhh& AsQ>@~ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/base_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/base_1.bmp index 1f61604c6c2745c888ee65d31d1e78c1723fdf99..2c962bd4d142f255a7eb0909970fac0bce4c391b 100644 GIT binary patch literal 150 zcmY+#K?*`407cQ;4n#x*5kZVTiSQB0`h|n$?V(k*-ppvwgLB{g@#4GFxMkQ4X8xz} zoc)iKk{_iMT5F6kSZi_4;k_q>K#Y-Pe;_SKQcC2US=W_P3bj^RYh2D7*X=g--Vs9Z E2F$VytN;K2 literal 142 zcmXxVQ3?Vf07cQ;20~;IK}1lHM1(;^Y6?I4Z)K#Y-;5; EFZ5yz^8f$< diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.asm b/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.asm index 8dd688d64a..44c0f642ee 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.asm +++ b/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -14,8 +14,8 @@ SKIN_PARAMS \ dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-20:3][16:16],\ ; buttons coordinates - minimize = [-40:3][16:16] ; [left:top][width:height] + close = [-20:4][16:16],\ ; buttons coordinates + minimize = [-40:4][16:16] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' ;the same BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp index 6e632b274a9a5218f1f131fe962bad11ce07cc0d..4e0bba63167e7bfc01b2b9606148b18eda795445 100644 GIT binary patch literal 40 qcmZomk6`%s?;pd?ojVyGKYq+`aA7FJi4!LnZrr%R00Sk-2@C+EG!Wtd literal 40 mcmWd@7G|)svt#JZH)AkT5oB1@Xu)ve#0fBFfP%KRHU 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/humanoid_OSX/humanoid_OSX_blue/skn_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_blue/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_blue/skn_build.bat +++ b/skins/_old/humanoid_OSX/humanoid_OSX_blue/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/base.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_green/base.bmp index 114534674ff68f435fdd12ee0cbbedbfc4159ac9..2c962bd4d142f255a7eb0909970fac0bce4c391b 100644 GIT binary patch literal 150 zcmY+#K?*`407cQ;4n#x*5kZVTiSQB0`h|n$?V(k*-ppvwgLB{g@#4GFxMkQ4X8xz} zoc)iKk{_iMT5F6kSZi_4;k_q>K#Y-Pe;_SKQcC2US=W_P3bj^RYh2D7*X=g--Vs9Z E2F$VytN;K2 literal 582 zcmb8kK?{OF5C!1Plcx|@M37dnMK&S`3Aa={bm-Q<_J{cx!9(pk_%UyI%)Gy!NQn;H zAu*C82UTDzmEb=g*T?}Y-6;#vTIWPTl*EasgfZr))Wlg>Yqx?94RQJ7oWt!(+=x5T X5)Yyi-utbf!|T}xXXwY^OhiH~INDHG diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/base_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_green/base_1.bmp index 212ef276a9d1c57af86f03ed1b5668115c6bef85..2c962bd4d142f255a7eb0909970fac0bce4c391b 100644 GIT binary patch literal 150 zcmY+#K?*`407cQ;4n#x*5kZVTiSQB0`h|n$?V(k*-ppvwgLB{g@#4GFxMkQ4X8xz} zoc)iKk{_iMT5F6kSZi_4;k_q>K#Y-Pe;_SKQcC2US=W_P3bj^RYh2D7*X=g--Vs9Z E2F$VytN;K2 literal 582 zcmb8ku?oU47zE(xe&mkh&%7>sB?8(b z2c$%HszNJO;D0;D$N_cw(>X_LT@n>>A!@=}Ym7lhX*Yy(t`!(*<8UQz!h0VFI_^91 cAfCjFcoQLnPGF>s!}rr?-_VcQHxUK#13Jb~S^xk5 diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/default.asm b/skins/_old/humanoid_OSX/humanoid_OSX_green/default.asm index 8dd688d64a..44c0f642ee 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_green/default.asm +++ b/skins/_old/humanoid_OSX/humanoid_OSX_green/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -14,8 +14,8 @@ SKIN_PARAMS \ dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-20:3][16:16],\ ; buttons coordinates - minimize = [-40:3][16:16] ; [left:top][width:height] + close = [-20:4][16:16],\ ; buttons coordinates + minimize = [-40:4][16:16] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' ;the same BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/default.dtp b/skins/_old/humanoid_OSX/humanoid_OSX_green/default.dtp index cc8189ac34c5d69450e2abf83a5a86cf3286170a..c8013f587dbb20c600a1eb6bd86e838e9eb30b74 100644 GIT binary patch literal 40 qcmZomk6`%s?;pd?ojVyGKYq+$xuAgI#EBCOH*VZufPt#2Dh2?VKoF|{ literal 40 mcmWd@7G|)svtuysh+_~mlxMJ9P{45F#0fBFfP%KRHU!F diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/default.dtp.asm b/skins/_old/humanoid_OSX/humanoid_OSX_green/default.dtp.asm index a06c4e6cb7..13a0a12b9a 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_green/default.dtp.asm +++ b/skins/_old/humanoid_OSX/humanoid_OSX_green/default.dtp.asm @@ -1,11 +1,11 @@ ;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x131313 -grab dd 0x3E3E3E -grab_button dd 0x5e8833 -grab_button_text dd 0x1f3111 -grab_text dd 0x70a039 -work dd 0xc8c8c8 -work_button dd 0xc8c8c8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0x868686 \ No newline at end of file +unused1 dd 0x586786 +unused2 dd 0xFEFEFE +work_3d_dark dd 0xB9B9B9 +work_3d_light dd 0xE3E3E3 +title_text dd 0x70a039 +work dd 0xc8c8c8 +work_button dd 0xD8D8D8 +work_button_text dd 0x000000 +work_text dd 0x000000 +work_graph dd 0x7A7A7A \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/dtp_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_green/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_green/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/humanoid_OSX/humanoid_OSX_green/left.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_green/left.bmp index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..97efacdebef816cccfda8e3b272df9014a10725e 100644 GIT binary patch literal 150 lcmZ?royGtGWE=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/left_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_green/left_1.bmp deleted file mode 100644 index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZw6!3qK)6op}D(KaMw7>E=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_green/oper.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_green/oper.bmp index 94995c66e22e6f37258fabccb9093249fe15667a..d7f4ab9d115e8e1a0df4b286ef2578146c3172f6 100644 GIT binary patch delta 407 zcmZn@{U)a4XN3#~OX=`W!(dNsnj?DE|mKGoc gG|k$|hW@C2pezR3YX=0AmvW{}-oVK{nVYK`04W$!GXMYp delta 293 zcmew+)+VasDL`RXyvl;nhghhmfL@XN3#~OX=`W!(dNsnj?DE|mKGoc gG|k$|hW@C2pezR3YX=0AmvW{}-oVK{nVYK`04W$!GXMYp delta 293 zcmew+)+VasDL`RXyvl;nhghhmfL@ 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/humanoid_OSX/humanoid_OSX_green/skn_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_green/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_green/skn_build.bat +++ b/skins/_old/humanoid_OSX/humanoid_OSX_green/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_orange/default.asm b/skins/_old/humanoid_OSX/humanoid_OSX_orange/default.asm index 8dd688d64a..03eb10b35c 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_orange/default.asm +++ b/skins/_old/humanoid_OSX/humanoid_OSX_orange/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_orange/dtp_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_orange/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_orange/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/humanoid_OSX/humanoid_OSX_orange/left_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_orange/left_1.bmp deleted file mode 100644 index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZw6!3qK)6op}D(KaMw7>E=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_orange/pack_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_orange/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_orange/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_orange/skin.inc b/skins/_old/humanoid_OSX/humanoid_OSX_orange/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_orange/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/humanoid_OSX/humanoid_OSX_orange/skn_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_orange/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_orange/skn_build.bat +++ b/skins/_old/humanoid_OSX/humanoid_OSX_orange/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_red/default.asm b/skins/_old/humanoid_OSX/humanoid_OSX_red/default.asm index 8dd688d64a..03eb10b35c 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_red/default.asm +++ b/skins/_old/humanoid_OSX/humanoid_OSX_red/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_red/dtp_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_red/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_red/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/humanoid_OSX/humanoid_OSX_red/left_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_red/left_1.bmp deleted file mode 100644 index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZw6!3qK)6op}D(KaMw7>E=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_red/pack_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_red/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_red/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_red/skin.inc b/skins/_old/humanoid_OSX/humanoid_OSX_red/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_red/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/humanoid_OSX/humanoid_OSX_red/skn_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_red/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_red/skn_build.bat +++ b/skins/_old/humanoid_OSX/humanoid_OSX_red/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/default.asm b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/default.asm index 8dd688d64a..03eb10b35c 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/default.asm +++ b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/default.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include 'skin.inc' +include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height @@ -28,6 +28,6 @@ SKIN_BITMAPS \ 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_left1,'left.bmp' BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/dtp_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/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/humanoid_OSX/humanoid_OSX_yellow/left_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/left_1.bmp deleted file mode 100644 index 0e3357dfb5b7bc7ae521cebeb53b96b20366a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmZw6!3qK)6op}D(KaMw7>E=y!iXRutfrww``)3a>WO-=&M_R$q7UztUmwqRV~UKO zFcVCRX-tQ0%nSdY>2JydmbG>!{`I_a&hft$>`t&3g1r>%5Q6s}8`vwsjxnw)_C~O` mMM?=bdned?!9ED~QLs;fopU}{?CYf;5Bt^+<6++gTbVD5OD=l= diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/pack_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/skin.inc b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/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/humanoid_OSX/humanoid_OSX_yellow/skn_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/skn_build.bat index 2828114c6b..b7fe56b7b7 100644 --- a/skins/_old/humanoid_OSX/humanoid_OSX_yellow/skn_build.bat +++ b/skins/_old/humanoid_OSX/humanoid_OSX_yellow/skn_build.bat @@ -1,2 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn +kpack default.skn default.skn pause \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/pack_build.bat b/skins/_old/humanoid_OSX/pack_build.bat deleted file mode 100644 index 4253a4499a..0000000000 --- a/skins/_old/humanoid_OSX/pack_build.bat +++ /dev/null @@ -1,6 +0,0 @@ -kpack humanoid_OSX_blue.skn humanoid_OSX_blue.skn -kpack humanoid_OSX_green.skn humanoid_OSX_green.skn -kpack humanoid_OSX_orange.skn humanoid_OSX_orange.skn -kpack humanoid_OSX_red.skn humanoid_OSX_red.skn -kpack humanoid_OSX_yellow.skn humanoid_OSX_yellow.skn -pause \ No newline at end of file diff --git a/skins/_old/StyleXP/panther/skin.inc b/skins/_old/humanoid_OSX/skin.inc similarity index 100% rename from skins/_old/StyleXP/panther/skin.inc rename to skins/_old/humanoid_OSX/skin.inc