diff --git a/skins/_old/Black_lace/1.Black_lace/1.Black_lace.DTP b/skins/_old/Black_lace/1.Black_lace/1.Black_lace.DTP deleted file mode 100644 index 816738b316..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/1.Black_lace.DTP and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/1.Black_lace.asm b/skins/_old/Black_lace/1.Black_lace/1.Black_lace.asm deleted file mode 100644 index 63e6c7644d..0000000000 --- a/skins/_old/Black_lace/1.Black_lace/1.Black_lace.asm +++ /dev/null @@ -1,37 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [22:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x484848:\ ; border inner color - bouter=0x484848:\ ; border outer color - bframe=0x030303],\ ; border frame color - colors inactive = [binner=0x5D5D5D:\ ; border inner color - bouter=0x5D5D5D:\ ; border outer color - bframe=0x353535],\ ; border frame color - dtp = '1.Black_lace.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:4][15:15],\ ; buttons coordinates - minimize = [-45:4][15:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - - diff --git a/skins/_old/Black_lace/1.Black_lace/1.Black_lace.png b/skins/_old/Black_lace/1.Black_lace/1.Black_lace.png deleted file mode 100644 index e2b10e7bea..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/1.Black_lace.png and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/Tupfile.lua b/skins/_old/Black_lace/1.Black_lace/Tupfile.lua deleted file mode 100644 index 345005e180..0000000000 --- a/skins/_old/Black_lace/1.Black_lace/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("1.Black_lace.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "1.Black_lace.skn") diff --git a/skins/_old/Black_lace/1.Black_lace/active/base.bmp b/skins/_old/Black_lace/1.Black_lace/active/base.bmp deleted file mode 100644 index 5631079d0c..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/active/base.bmp and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/active/left.bmp b/skins/_old/Black_lace/1.Black_lace/active/left.bmp deleted file mode 100644 index 9da7857560..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/active/left.bmp and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/active/oper.bmp b/skins/_old/Black_lace/1.Black_lace/active/oper.bmp deleted file mode 100644 index 5ad02db355..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/inactive/base.bmp b/skins/_old/Black_lace/1.Black_lace/inactive/base.bmp deleted file mode 100644 index 1a36623d17..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/inactive/left.bmp b/skins/_old/Black_lace/1.Black_lace/inactive/left.bmp deleted file mode 100644 index e4cf287829..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/inactive/oper.bmp b/skins/_old/Black_lace/1.Black_lace/inactive/oper.bmp deleted file mode 100644 index 8080ff0579..0000000000 Binary files a/skins/_old/Black_lace/1.Black_lace/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Black_lace/1.Black_lace/skin.inc b/skins/_old/Black_lace/1.Black_lace/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Black_lace/1.Black_lace/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/Circles/2.Circles/2.Circles.asm b/skins/_old/Circles/2.Circles/2.Circles.asm deleted file mode 100644 index e9b3e63c31..0000000000 --- a/skins/_old/Circles/2.Circles/2.Circles.asm +++ /dev/null @@ -1,37 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x7A7A7A:\ ; border inner color - bouter=0x7A7A7A:\ ; border outer color - bframe=0x8A8A8A],\ ; border frame color - colors inactive = [binner=0x969696:\ ; border inner color - bouter=0x969696:\ ; border outer color - bframe=0xA3A3A3],\ ; border frame color - dtp = 'GREY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:2][19:19],\ ; buttons coordinates - minimize = [-47:2][19:19] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - -; \ No newline at end of file diff --git a/skins/_old/Circles/2.Circles/GREY.DTP b/skins/_old/Circles/2.Circles/GREY.DTP deleted file mode 100644 index ee9247634a..0000000000 Binary files a/skins/_old/Circles/2.Circles/GREY.DTP and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/Tupfile.lua b/skins/_old/Circles/2.Circles/Tupfile.lua deleted file mode 100644 index ce94842a3a..0000000000 --- a/skins/_old/Circles/2.Circles/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("2.Circles.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.Circles.skn") diff --git a/skins/_old/Circles/2.Circles/active/base.bmp b/skins/_old/Circles/2.Circles/active/base.bmp deleted file mode 100644 index 8265c5d21d..0000000000 Binary files a/skins/_old/Circles/2.Circles/active/base.bmp and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/active/left.bmp b/skins/_old/Circles/2.Circles/active/left.bmp deleted file mode 100644 index 03150843b4..0000000000 Binary files a/skins/_old/Circles/2.Circles/active/left.bmp and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/active/oper.bmp b/skins/_old/Circles/2.Circles/active/oper.bmp deleted file mode 100644 index 4833d7b1ca..0000000000 Binary files a/skins/_old/Circles/2.Circles/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/inactive/base.bmp b/skins/_old/Circles/2.Circles/inactive/base.bmp deleted file mode 100644 index 22943ef028..0000000000 Binary files a/skins/_old/Circles/2.Circles/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/inactive/left.bmp b/skins/_old/Circles/2.Circles/inactive/left.bmp deleted file mode 100644 index a56ede56d0..0000000000 Binary files a/skins/_old/Circles/2.Circles/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/inactive/oper.bmp b/skins/_old/Circles/2.Circles/inactive/oper.bmp deleted file mode 100644 index 9c39768f1e..0000000000 Binary files a/skins/_old/Circles/2.Circles/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Circles/2.Circles/skin.inc b/skins/_old/Circles/2.Circles/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Circles/2.Circles/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/Circles/3.Circles/3.Circles.asm b/skins/_old/Circles/3.Circles/3.Circles.asm deleted file mode 100644 index e9b3e63c31..0000000000 --- a/skins/_old/Circles/3.Circles/3.Circles.asm +++ /dev/null @@ -1,37 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x7A7A7A:\ ; border inner color - bouter=0x7A7A7A:\ ; border outer color - bframe=0x8A8A8A],\ ; border frame color - colors inactive = [binner=0x969696:\ ; border inner color - bouter=0x969696:\ ; border outer color - bframe=0xA3A3A3],\ ; border frame color - dtp = 'GREY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:2][19:19],\ ; buttons coordinates - minimize = [-47:2][19:19] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - -; \ No newline at end of file diff --git a/skins/_old/Circles/3.Circles/GREY.DTP b/skins/_old/Circles/3.Circles/GREY.DTP deleted file mode 100644 index ee9247634a..0000000000 Binary files a/skins/_old/Circles/3.Circles/GREY.DTP and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/Tupfile.lua b/skins/_old/Circles/3.Circles/Tupfile.lua deleted file mode 100644 index 93f6267c03..0000000000 --- a/skins/_old/Circles/3.Circles/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("3.Circles.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "3.Circles.skn") diff --git a/skins/_old/Circles/3.Circles/active/base.bmp b/skins/_old/Circles/3.Circles/active/base.bmp deleted file mode 100644 index 8265c5d21d..0000000000 Binary files a/skins/_old/Circles/3.Circles/active/base.bmp and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/active/left.bmp b/skins/_old/Circles/3.Circles/active/left.bmp deleted file mode 100644 index 03150843b4..0000000000 Binary files a/skins/_old/Circles/3.Circles/active/left.bmp and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/active/oper.bmp b/skins/_old/Circles/3.Circles/active/oper.bmp deleted file mode 100644 index 3b16ee6213..0000000000 Binary files a/skins/_old/Circles/3.Circles/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/inactive/base.bmp b/skins/_old/Circles/3.Circles/inactive/base.bmp deleted file mode 100644 index 22943ef028..0000000000 Binary files a/skins/_old/Circles/3.Circles/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/inactive/left.bmp b/skins/_old/Circles/3.Circles/inactive/left.bmp deleted file mode 100644 index a56ede56d0..0000000000 Binary files a/skins/_old/Circles/3.Circles/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/inactive/oper.bmp b/skins/_old/Circles/3.Circles/inactive/oper.bmp deleted file mode 100644 index 2b1e39391e..0000000000 Binary files a/skins/_old/Circles/3.Circles/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Circles/3.Circles/skin.inc b/skins/_old/Circles/3.Circles/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Circles/3.Circles/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/Circles/4.Circles/4.Circles.asm b/skins/_old/Circles/4.Circles/4.Circles.asm deleted file mode 100644 index e9b3e63c31..0000000000 --- a/skins/_old/Circles/4.Circles/4.Circles.asm +++ /dev/null @@ -1,37 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x7A7A7A:\ ; border inner color - bouter=0x7A7A7A:\ ; border outer color - bframe=0x8A8A8A],\ ; border frame color - colors inactive = [binner=0x969696:\ ; border inner color - bouter=0x969696:\ ; border outer color - bframe=0xA3A3A3],\ ; border frame color - dtp = 'GREY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:2][19:19],\ ; buttons coordinates - minimize = [-47:2][19:19] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - -; \ No newline at end of file diff --git a/skins/_old/Circles/4.Circles/GREY.DTP b/skins/_old/Circles/4.Circles/GREY.DTP deleted file mode 100644 index ee9247634a..0000000000 Binary files a/skins/_old/Circles/4.Circles/GREY.DTP and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/Tupfile.lua b/skins/_old/Circles/4.Circles/Tupfile.lua deleted file mode 100644 index e71b79a515..0000000000 --- a/skins/_old/Circles/4.Circles/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("4.Circles.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "4.Circles.skn") diff --git a/skins/_old/Circles/4.Circles/active/base.bmp b/skins/_old/Circles/4.Circles/active/base.bmp deleted file mode 100644 index 8265c5d21d..0000000000 Binary files a/skins/_old/Circles/4.Circles/active/base.bmp and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/active/left.bmp b/skins/_old/Circles/4.Circles/active/left.bmp deleted file mode 100644 index 03150843b4..0000000000 Binary files a/skins/_old/Circles/4.Circles/active/left.bmp and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/active/oper.bmp b/skins/_old/Circles/4.Circles/active/oper.bmp deleted file mode 100644 index f0fdf80518..0000000000 Binary files a/skins/_old/Circles/4.Circles/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/inactive/base.bmp b/skins/_old/Circles/4.Circles/inactive/base.bmp deleted file mode 100644 index 22943ef028..0000000000 Binary files a/skins/_old/Circles/4.Circles/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/inactive/left.bmp b/skins/_old/Circles/4.Circles/inactive/left.bmp deleted file mode 100644 index a56ede56d0..0000000000 Binary files a/skins/_old/Circles/4.Circles/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/inactive/oper.bmp b/skins/_old/Circles/4.Circles/inactive/oper.bmp deleted file mode 100644 index 8bc43a9b56..0000000000 Binary files a/skins/_old/Circles/4.Circles/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Circles/4.Circles/skin.inc b/skins/_old/Circles/4.Circles/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Circles/4.Circles/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/WindowsXP/WinXP Classic black/WinXP_Classic_black.asm b/skins/_old/WindowsXP/WinXP Classic black/WinXP_Classic_black.asm index 5a599f67d3..503f0d4d06 100644 --- a/skins/_old/WindowsXP/WinXP Classic black/WinXP_Classic_black.asm +++ b/skins/_old/WindowsXP/WinXP Classic black/WinXP_Classic_black.asm @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'GRAY.DTP' ; dtp colors SKIN_BUTTONS \ - close = [-21:6][15:13],\ ; buttons coordinates - minimize = [-39:6][15:13] ; [left:top][width:height] + close = [-21:6][16:14],\ ; buttons coordinates + minimize = [-39:6][16:14] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers diff --git a/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm b/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm index 5a599f67d3..503f0d4d06 100644 --- a/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm +++ b/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'GRAY.DTP' ; dtp colors SKIN_BUTTONS \ - close = [-21:6][15:13],\ ; buttons coordinates - minimize = [-39:6][15:13] ; [left:top][width:height] + close = [-21:6][16:14],\ ; buttons coordinates + minimize = [-39:6][16:14] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm b/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm index 5a599f67d3..503f0d4d06 100644 --- a/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm +++ b/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'GRAY.DTP' ; dtp colors SKIN_BUTTONS \ - close = [-21:6][15:13],\ ; buttons coordinates - minimize = [-39:6][15:13] ; [left:top][width:height] + close = [-21:6][16:14],\ ; buttons coordinates + minimize = [-39:6][16:14] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers diff --git a/skins/_old/zRiver/zRiver2/ORANGE.DTP b/skins/_old/zRiver/zRiver2/ORANGE.DTP deleted file mode 100644 index 0568544f2d..0000000000 Binary files a/skins/_old/zRiver/zRiver2/ORANGE.DTP and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/Tupfile.lua b/skins/_old/zRiver/zRiver2/Tupfile.lua deleted file mode 100644 index 4f7c8dc26c..0000000000 --- a/skins/_old/zRiver/zRiver2/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("zRiver2.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "zRiver2.skn") diff --git a/skins/_old/zRiver/zRiver2/active/base.bmp b/skins/_old/zRiver/zRiver2/active/base.bmp deleted file mode 100644 index 4500052ead..0000000000 Binary files a/skins/_old/zRiver/zRiver2/active/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/active/left.bmp b/skins/_old/zRiver/zRiver2/active/left.bmp deleted file mode 100644 index 98803a5009..0000000000 Binary files a/skins/_old/zRiver/zRiver2/active/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/active/oper.bmp b/skins/_old/zRiver/zRiver2/active/oper.bmp deleted file mode 100644 index 744289913e..0000000000 Binary files a/skins/_old/zRiver/zRiver2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/inactive/base.bmp b/skins/_old/zRiver/zRiver2/inactive/base.bmp deleted file mode 100644 index cd702e078e..0000000000 Binary files a/skins/_old/zRiver/zRiver2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/inactive/left.bmp b/skins/_old/zRiver/zRiver2/inactive/left.bmp deleted file mode 100644 index 58dd8b1381..0000000000 Binary files a/skins/_old/zRiver/zRiver2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/inactive/oper.bmp b/skins/_old/zRiver/zRiver2/inactive/oper.bmp deleted file mode 100644 index e572de0de6..0000000000 Binary files a/skins/_old/zRiver/zRiver2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver2/skin.inc b/skins/_old/zRiver/zRiver2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/zRiver/zRiver2/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/zRiver/zRiver2/zRiver2.asm b/skins/_old/zRiver/zRiver2/zRiver2.asm deleted file mode 100644 index 7811f65e3d..0000000000 --- a/skins/_old/zRiver/zRiver2/zRiver2.asm +++ /dev/null @@ -1,45 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x370B00:\ ; border inner color - bouter=0x370B00:\ ; border outer color - bframe=0x4E1100],\ ; border frame color - colors inactive = [binner=0x4A2921:\ ; border inner color - bouter=0x4A2921:\ ; border outer color - bframe=0x5B2F21],\ ; border frame color - dtp = 'ORANGE.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-30:3][25:17],\ ; buttons coordinates - minimize = [-57:3][25: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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - -;AC2600 -;A72500 -;9B1F00 -;8C1C00 -;751800 -;601500 - - - diff --git a/skins/_old/zRiver/zRiver3/GREEN.DTP b/skins/_old/zRiver/zRiver3/GREEN.DTP deleted file mode 100644 index bd97b586df..0000000000 Binary files a/skins/_old/zRiver/zRiver3/GREEN.DTP and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/Tupfile.lua b/skins/_old/zRiver/zRiver3/Tupfile.lua deleted file mode 100644 index 5c62148bde..0000000000 --- a/skins/_old/zRiver/zRiver3/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("zRiver3.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "zRiver3.skn") diff --git a/skins/_old/zRiver/zRiver3/active/base.bmp b/skins/_old/zRiver/zRiver3/active/base.bmp deleted file mode 100644 index 037ff399f6..0000000000 Binary files a/skins/_old/zRiver/zRiver3/active/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/active/left.bmp b/skins/_old/zRiver/zRiver3/active/left.bmp deleted file mode 100644 index 8219883b54..0000000000 Binary files a/skins/_old/zRiver/zRiver3/active/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/active/oper.bmp b/skins/_old/zRiver/zRiver3/active/oper.bmp deleted file mode 100644 index 22ac7b8746..0000000000 Binary files a/skins/_old/zRiver/zRiver3/active/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/inactive/base.bmp b/skins/_old/zRiver/zRiver3/inactive/base.bmp deleted file mode 100644 index 60ece3b4e3..0000000000 Binary files a/skins/_old/zRiver/zRiver3/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/inactive/left.bmp b/skins/_old/zRiver/zRiver3/inactive/left.bmp deleted file mode 100644 index 41e91758ac..0000000000 Binary files a/skins/_old/zRiver/zRiver3/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/inactive/oper.bmp b/skins/_old/zRiver/zRiver3/inactive/oper.bmp deleted file mode 100644 index 9e16be17fc..0000000000 Binary files a/skins/_old/zRiver/zRiver3/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver3/skin.inc b/skins/_old/zRiver/zRiver3/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/zRiver/zRiver3/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/zRiver/zRiver3/zRiver3.asm b/skins/_old/zRiver/zRiver3/zRiver3.asm deleted file mode 100644 index f24de193eb..0000000000 --- a/skins/_old/zRiver/zRiver3/zRiver3.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x00371F:\ ; border inner color - bouter=0x00371F:\ ; border outer color - bframe=0x004E2E],\ ; border frame color - colors inactive = [binner=0x214A38:\ ; border inner color - bouter=0x214A38:\ ; border outer color - bframe=0x215B43],\ ; border frame color - dtp = 'GREEN.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-30:3][25:17],\ ; buttons coordinates - minimize = [-57:3][25: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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/zRiver/zRiver4/BROWN.DTP b/skins/_old/zRiver/zRiver4/BROWN.DTP deleted file mode 100644 index 8429c4a574..0000000000 Binary files a/skins/_old/zRiver/zRiver4/BROWN.DTP and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/Tupfile.lua b/skins/_old/zRiver/zRiver4/Tupfile.lua deleted file mode 100644 index c68568c7c4..0000000000 --- a/skins/_old/zRiver/zRiver4/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("zRiver4.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "zRiver4.skn") diff --git a/skins/_old/zRiver/zRiver4/active/base.bmp b/skins/_old/zRiver/zRiver4/active/base.bmp deleted file mode 100644 index 442b78fdf1..0000000000 Binary files a/skins/_old/zRiver/zRiver4/active/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/active/left.bmp b/skins/_old/zRiver/zRiver4/active/left.bmp deleted file mode 100644 index 2f61c57d13..0000000000 Binary files a/skins/_old/zRiver/zRiver4/active/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/active/oper.bmp b/skins/_old/zRiver/zRiver4/active/oper.bmp deleted file mode 100644 index a621d2dbc6..0000000000 Binary files a/skins/_old/zRiver/zRiver4/active/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/inactive/base.bmp b/skins/_old/zRiver/zRiver4/inactive/base.bmp deleted file mode 100644 index b7371ea402..0000000000 Binary files a/skins/_old/zRiver/zRiver4/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/inactive/left.bmp b/skins/_old/zRiver/zRiver4/inactive/left.bmp deleted file mode 100644 index 7d14a9b784..0000000000 Binary files a/skins/_old/zRiver/zRiver4/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/inactive/oper.bmp b/skins/_old/zRiver/zRiver4/inactive/oper.bmp deleted file mode 100644 index be6ef8086d..0000000000 Binary files a/skins/_old/zRiver/zRiver4/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver4/skin.inc b/skins/_old/zRiver/zRiver4/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/zRiver/zRiver4/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/zRiver/zRiver4/zRiver4.asm b/skins/_old/zRiver/zRiver4/zRiver4.asm deleted file mode 100644 index 0e6a0cb592..0000000000 --- a/skins/_old/zRiver/zRiver4/zRiver4.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x371B00:\ ; border inner color - bouter=0x371B00:\ ; border outer color - bframe=0x4E2900],\ ; border frame color - colors inactive = [binner=0x4A3621:\ ; border inner color - bouter=0x4A3621:\ ; border outer color - bframe=0x5B3F21],\ ; border frame color - dtp = 'BROWN.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-30:3][25:17],\ ; buttons coordinates - minimize = [-57:3][25: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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/zRiver/zRiver5/PINK.DTP b/skins/_old/zRiver/zRiver5/PINK.DTP deleted file mode 100644 index ea42021b6b..0000000000 Binary files a/skins/_old/zRiver/zRiver5/PINK.DTP and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/Tupfile.lua b/skins/_old/zRiver/zRiver5/Tupfile.lua deleted file mode 100644 index de89e59b95..0000000000 --- a/skins/_old/zRiver/zRiver5/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("zRiver5.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "zRiver5.skn") diff --git a/skins/_old/zRiver/zRiver5/active/base.bmp b/skins/_old/zRiver/zRiver5/active/base.bmp deleted file mode 100644 index 7d93830552..0000000000 Binary files a/skins/_old/zRiver/zRiver5/active/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/active/left.bmp b/skins/_old/zRiver/zRiver5/active/left.bmp deleted file mode 100644 index 7d139321c4..0000000000 Binary files a/skins/_old/zRiver/zRiver5/active/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/active/oper.bmp b/skins/_old/zRiver/zRiver5/active/oper.bmp deleted file mode 100644 index 7bd2f803b6..0000000000 Binary files a/skins/_old/zRiver/zRiver5/active/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/inactive/base.bmp b/skins/_old/zRiver/zRiver5/inactive/base.bmp deleted file mode 100644 index e432331cd1..0000000000 Binary files a/skins/_old/zRiver/zRiver5/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/inactive/left.bmp b/skins/_old/zRiver/zRiver5/inactive/left.bmp deleted file mode 100644 index 898c76ea8c..0000000000 Binary files a/skins/_old/zRiver/zRiver5/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/inactive/oper.bmp b/skins/_old/zRiver/zRiver5/inactive/oper.bmp deleted file mode 100644 index 2909cccbd6..0000000000 Binary files a/skins/_old/zRiver/zRiver5/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver5/skin.inc b/skins/_old/zRiver/zRiver5/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/zRiver/zRiver5/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/zRiver/zRiver5/zRiver5.asm b/skins/_old/zRiver/zRiver5/zRiver5.asm deleted file mode 100644 index 5e0dc49c22..0000000000 --- a/skins/_old/zRiver/zRiver5/zRiver5.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x370031:\ ; border inner color - bouter=0x370031:\ ; border outer color - bframe=0x4E0043],\ ; border frame color - colors inactive = [binner=0x4A2145:\ ; border inner color - bouter=0x4A2145:\ ; border outer color - bframe=0x5B2153],\ ; border frame color - dtp = 'PINK.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-30:3][25:17],\ ; buttons coordinates - minimize = [-57:3][25: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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/zRiver/zRiver6/BLACK.DTP b/skins/_old/zRiver/zRiver6/BLACK.DTP deleted file mode 100644 index 0c32f4b338..0000000000 Binary files a/skins/_old/zRiver/zRiver6/BLACK.DTP and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/Tupfile.lua b/skins/_old/zRiver/zRiver6/Tupfile.lua deleted file mode 100644 index 929e42eca8..0000000000 --- a/skins/_old/zRiver/zRiver6/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("zRiver6.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "zRiver6.skn") diff --git a/skins/_old/zRiver/zRiver6/active/base.bmp b/skins/_old/zRiver/zRiver6/active/base.bmp deleted file mode 100644 index d02e72be8d..0000000000 Binary files a/skins/_old/zRiver/zRiver6/active/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/active/left.bmp b/skins/_old/zRiver/zRiver6/active/left.bmp deleted file mode 100644 index 2552bca96d..0000000000 Binary files a/skins/_old/zRiver/zRiver6/active/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/active/oper.bmp b/skins/_old/zRiver/zRiver6/active/oper.bmp deleted file mode 100644 index 9d90d7478a..0000000000 Binary files a/skins/_old/zRiver/zRiver6/active/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/inactive/base.bmp b/skins/_old/zRiver/zRiver6/inactive/base.bmp deleted file mode 100644 index f0bc808be2..0000000000 Binary files a/skins/_old/zRiver/zRiver6/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/inactive/left.bmp b/skins/_old/zRiver/zRiver6/inactive/left.bmp deleted file mode 100644 index 52c1bcf07d..0000000000 Binary files a/skins/_old/zRiver/zRiver6/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/inactive/oper.bmp b/skins/_old/zRiver/zRiver6/inactive/oper.bmp deleted file mode 100644 index 6607f2aaf5..0000000000 Binary files a/skins/_old/zRiver/zRiver6/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver6/skin.inc b/skins/_old/zRiver/zRiver6/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/zRiver/zRiver6/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/zRiver/zRiver6/zRiver6.asm b/skins/_old/zRiver/zRiver6/zRiver6.asm deleted file mode 100644 index 18830b9c29..0000000000 --- a/skins/_old/zRiver/zRiver6/zRiver6.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x69696A:\ ; border inner color - bouter=0x69696A:\ ; border outer color - bframe=0x0D0D0F],\ ; border frame color - colors inactive = [binner=0x6E6E6F:\ ; border inner color - bouter=0x6E6E6F:\ ; border outer color - bframe=0x2B2B2D],\ ; border frame color - dtp = 'BLACK.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-30:3][25:17],\ ; buttons coordinates - minimize = [-57:3][25: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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 3a4db3f605..37f128c41c 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -27,16 +27,12 @@ skinlist = { "_old/black-glass/black-glass/black-glass.skn", "_old/black-glass/black-glass_light/black-glass_light.skn", "_old/blackskin/blackskin.skn", -"_old/Black_lace/1.Black_lace/1.Black_lace.skn", "_old/Black_lace/2.Black_lace/2.Black_lace.skn", "_old/Blended/Blended.skn", "_old/BrownLustre/BrownLustre/BrownLustre.skn", "_old/BrownLustre/BrownLustre_2/BrownLustre_2.skn", "_old/cherry/cherry.skn", "_old/Circles/1.Circles/1.Circles.skn", -"_old/Circles/2.Circles/2.Circles.skn", -"_old/Circles/3.Circles/3.Circles.skn", -"_old/Circles/4.Circles/4.Circles.skn", "_old/CodeOpusC/Opus_A/Opus_A.skn", "_old/CodeOpusC/Opus_B/Opus_B.skn", "_old/CodeOpusC/Opus_D/Opus_D.skn", @@ -150,9 +146,4 @@ skinlist = { "_old/WindowsXP/WinXP Standard silver/WinXP Standard silver.skn", "_old/winflat/winflat.skn", "_old/zRiver/zRiver1/zRiver1.skn", -"_old/zRiver/zRiver2/zRiver2.skn", -"_old/zRiver/zRiver3/zRiver3.skn", -"_old/zRiver/zRiver4/zRiver4.skn", -"_old/zRiver/zRiver5/zRiver5.skn", -"_old/zRiver/zRiver6/zRiver6.skn", }