diff --git a/skins/_old/Black_lace/2.Black_lace/Tupfile.lua b/skins/_old/Black_lace/2.Black_lace/Tupfile.lua index 0deb6ac91e..26978050d7 100644 --- a/skins/_old/Black_lace/2.Black_lace/Tupfile.lua +++ b/skins/_old/Black_lace/2.Black_lace/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("2.Black_lace.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.Black_lace.skn") +tup.rule("2.Black_lace.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Black_lace.skn") diff --git a/skins/_old/CodeOpusC/Opus_DA/Opus_DA.asm b/skins/_old/CodeOpusC/Opus_DA/Opus_DA.asm deleted file mode 100644 index fd73f25656..0000000000 --- a/skins/_old/CodeOpusC/Opus_DA/Opus_DA.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [8:3:10:2],\ ; margins [left:top:right:bottom] - colors active = [binner=0xD6D6D4:\ ; border inner color - bouter=0x8C908A:\ ; border outer color - bframe=0xD6D6D4],\ ; border frame color - colors inactive = [binner=0xD6D6D4:\ ; border inner color - bouter=0x8C908A:\ ; border outer color - bframe=0xD6D6D4],\ ; border frame color - dtp = 'Opus_DA.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:5][15:15],\ ; buttons coordinates - minimize = [-40:5][15:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' diff --git a/skins/_old/CodeOpusC/Opus_DA/Opus_DA.dtp b/skins/_old/CodeOpusC/Opus_DA/Opus_DA.dtp deleted file mode 100644 index a37a733888..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/Opus_DA.dtp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/Tupfile.lua b/skins/_old/CodeOpusC/Opus_DA/Tupfile.lua deleted file mode 100644 index 8389851f18..0000000000 --- a/skins/_old/CodeOpusC/Opus_DA/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Opus_DA.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Opus_DA.skn") diff --git a/skins/_old/CodeOpusC/Opus_DA/active/base.bmp b/skins/_old/CodeOpusC/Opus_DA/active/base.bmp deleted file mode 100644 index 0eba00caa2..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/active/base.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/active/left.bmp b/skins/_old/CodeOpusC/Opus_DA/active/left.bmp deleted file mode 100644 index 0a57d12a99..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/active/left.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/active/oper.bmp b/skins/_old/CodeOpusC/Opus_DA/active/oper.bmp deleted file mode 100644 index 300e8c53b6..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/active/oper.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/inactive/base.bmp b/skins/_old/CodeOpusC/Opus_DA/inactive/base.bmp deleted file mode 100644 index 1b71a6efa6..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/inactive/left.bmp b/skins/_old/CodeOpusC/Opus_DA/inactive/left.bmp deleted file mode 100644 index 39424c5ce2..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/inactive/oper.bmp b/skins/_old/CodeOpusC/Opus_DA/inactive/oper.bmp deleted file mode 100644 index 570273e96d..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_DA/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_DA/skin.inc b/skins/_old/CodeOpusC/Opus_DA/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/CodeOpusC/Opus_DA/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/MyTango/Tupfile.lua b/skins/_old/MyTango/Tupfile.lua deleted file mode 100644 index 589b12a1a8..0000000000 --- a/skins/_old/MyTango/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MyTango.skn") diff --git a/skins/_old/MyTango/active/base.bmp b/skins/_old/MyTango/active/base.bmp deleted file mode 100644 index 9e5ffdec59..0000000000 Binary files a/skins/_old/MyTango/active/base.bmp and /dev/null differ diff --git a/skins/_old/MyTango/active/left.bmp b/skins/_old/MyTango/active/left.bmp deleted file mode 100644 index a52623f1cc..0000000000 Binary files a/skins/_old/MyTango/active/left.bmp and /dev/null differ diff --git a/skins/_old/MyTango/active/oper.bmp b/skins/_old/MyTango/active/oper.bmp deleted file mode 100644 index 8a785190d0..0000000000 Binary files a/skins/_old/MyTango/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MyTango/default.asm b/skins/_old/MyTango/default.asm deleted file mode 100644 index 4204234785..0000000000 --- a/skins/_old/MyTango/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [8:1:47:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x4989CA:\ ; border inner color - bouter=0x2B5E92:\ ; border outer color - bframe=0x4989CA],\ ; border frame color - colors inactive = [binner=0xA3A3A3:\ ; border inner color - bouter=0x828282:\ ; border outer color - bframe=0xA3A3A3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-23:4][18:16],\ ; buttons coordinates - minimize = [-44:4][18:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' diff --git a/skins/_old/MyTango/default.dtp b/skins/_old/MyTango/default.dtp deleted file mode 100644 index 3fa9687885..0000000000 Binary files a/skins/_old/MyTango/default.dtp and /dev/null differ diff --git a/skins/_old/MyTango/inactive/base.bmp b/skins/_old/MyTango/inactive/base.bmp deleted file mode 100644 index 8a161c58da..0000000000 Binary files a/skins/_old/MyTango/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MyTango/inactive/left.bmp b/skins/_old/MyTango/inactive/left.bmp deleted file mode 100644 index 615f301d5b..0000000000 Binary files a/skins/_old/MyTango/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MyTango/inactive/oper.bmp b/skins/_old/MyTango/inactive/oper.bmp deleted file mode 100644 index 979a029a55..0000000000 Binary files a/skins/_old/MyTango/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MyTango/skin.inc b/skins/_old/MyTango/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MyTango/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/Nature/Nature.asm b/skins/_old/Nature/Nature.asm deleted file mode 100644 index fbbc7ad83a..0000000000 --- a/skins/_old/Nature/Nature.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x1D481D:\ ; border inner color - bouter=0x1D481D:\ ; border outer color - bframe=0x026302],\ ; border frame color - colors inactive = [binner=0x1D481D:\ ; border inner color - bouter=0x1D481D:\ ; border outer color - bframe=0x517251],\ ; border frame color - dtp = 'nature.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-24:4][16:16],\ ; buttons coordinates - minimize = [-45:4][16:16] ; [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/Nature/Screenshot.png b/skins/_old/Nature/Screenshot.png deleted file mode 100644 index ab88745736..0000000000 Binary files a/skins/_old/Nature/Screenshot.png and /dev/null differ diff --git a/skins/_old/Nature/Tupfile.lua b/skins/_old/Nature/Tupfile.lua deleted file mode 100644 index df22d8c6ca..0000000000 --- a/skins/_old/Nature/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Nature.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Nature.skn") diff --git a/skins/_old/Nature/active/base.bmp b/skins/_old/Nature/active/base.bmp deleted file mode 100644 index 135d3a11a7..0000000000 Binary files a/skins/_old/Nature/active/base.bmp and /dev/null differ diff --git a/skins/_old/Nature/active/left.bmp b/skins/_old/Nature/active/left.bmp deleted file mode 100644 index 725d7c657b..0000000000 Binary files a/skins/_old/Nature/active/left.bmp and /dev/null differ diff --git a/skins/_old/Nature/active/oper.bmp b/skins/_old/Nature/active/oper.bmp deleted file mode 100644 index 06071786f4..0000000000 Binary files a/skins/_old/Nature/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Nature/inactive/base.bmp b/skins/_old/Nature/inactive/base.bmp deleted file mode 100644 index 974eaee1cb..0000000000 Binary files a/skins/_old/Nature/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Nature/inactive/left.bmp b/skins/_old/Nature/inactive/left.bmp deleted file mode 100644 index 5a9a97f9a9..0000000000 Binary files a/skins/_old/Nature/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Nature/inactive/oper.bmp b/skins/_old/Nature/inactive/oper.bmp deleted file mode 100644 index 68a98e18d0..0000000000 Binary files a/skins/_old/Nature/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Nature/nature.dtp b/skins/_old/Nature/nature.dtp deleted file mode 100644 index cca4cdc95c..0000000000 Binary files a/skins/_old/Nature/nature.dtp and /dev/null differ diff --git a/skins/_old/Nature/skin.inc b/skins/_old/Nature/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Nature/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/USSR_2/1.USSR_2/Tupfile.lua b/skins/_old/USSR_2/1.USSR_2/Tupfile.lua index 1258891ad7..ae26f50b07 100644 --- a/skins/_old/USSR_2/1.USSR_2/Tupfile.lua +++ b/skins/_old/USSR_2/1.USSR_2/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("1.USSR_2.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "1.USSR_2.skn") +tup.rule("1.USSR_2.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "USSR2.skn") diff --git a/skins/_old/cherry/Tupfile.lua b/skins/_old/cherry/Tupfile.lua deleted file mode 100644 index 26ab1dacf9..0000000000 --- a/skins/_old/cherry/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "cherry.skn") diff --git a/skins/_old/cherry/base.bmp b/skins/_old/cherry/base.bmp deleted file mode 100644 index d3da3f2123..0000000000 Binary files a/skins/_old/cherry/base.bmp and /dev/null differ diff --git a/skins/_old/cherry/base_1.bmp b/skins/_old/cherry/base_1.bmp deleted file mode 100644 index d3da3f2123..0000000000 Binary files a/skins/_old/cherry/base_1.bmp and /dev/null differ diff --git a/skins/_old/cherry/default.asm b/skins/_old/cherry/default.asm deleted file mode 100644 index f63f33ed42..0000000000 --- a/skins/_old/cherry/default.asm +++ /dev/null @@ -1,33 +0,0 @@ -;SKIN (.SKN) - COMPILE WITH FASM - -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:53:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xafafaf:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - colors inactive = [binner=0xafafaf:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:6][12:11],\ ; buttons coordinates - minimize = [-41:6][12:11] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/cherry/default.dtp b/skins/_old/cherry/default.dtp deleted file mode 100644 index b8048f8d44..0000000000 Binary files a/skins/_old/cherry/default.dtp and /dev/null differ diff --git a/skins/_old/cherry/default.dtp.asm b/skins/_old/cherry/default.dtp.asm deleted file mode 100644 index 05d5323f15..0000000000 --- a/skins/_old/cherry/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xf3f3f3 -grab dd 0x525252 -grab_button dd 0x701919 -grab_button_text dd 0xffffff -grab_text dd 0xffffff -work dd 0xf3f3f3 -work_button dd 0xf3f3f3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xafafaf \ No newline at end of file diff --git a/skins/_old/cherry/dtp_build.bat b/skins/_old/cherry/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/cherry/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/cherry/left.bmp b/skins/_old/cherry/left.bmp deleted file mode 100644 index c0c581148a..0000000000 Binary files a/skins/_old/cherry/left.bmp and /dev/null differ diff --git a/skins/_old/cherry/left_1.bmp b/skins/_old/cherry/left_1.bmp deleted file mode 100644 index c0c581148a..0000000000 Binary files a/skins/_old/cherry/left_1.bmp and /dev/null differ diff --git a/skins/_old/cherry/oper.bmp b/skins/_old/cherry/oper.bmp deleted file mode 100644 index d58de63e9b..0000000000 Binary files a/skins/_old/cherry/oper.bmp and /dev/null differ diff --git a/skins/_old/cherry/oper_1.bmp b/skins/_old/cherry/oper_1.bmp deleted file mode 100644 index 5b3f8174ec..0000000000 Binary files a/skins/_old/cherry/oper_1.bmp and /dev/null differ diff --git a/skins/_old/cherry/pack_build.bat b/skins/_old/cherry/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/cherry/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/cherry/skin.inc b/skins/_old/cherry/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/cherry/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/cherry/skn_build.bat b/skins/_old/cherry/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/cherry/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/zRiver/zRiver1/BLUE.DTP b/skins/_old/zRiver/zRiver1/BLUE.DTP deleted file mode 100644 index 39d65bf21d..0000000000 Binary files a/skins/_old/zRiver/zRiver1/BLUE.DTP and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/Tupfile.lua b/skins/_old/zRiver/zRiver1/Tupfile.lua deleted file mode 100644 index e9ca753c37..0000000000 --- a/skins/_old/zRiver/zRiver1/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("zRiver1.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "zRiver1.skn") diff --git a/skins/_old/zRiver/zRiver1/active/base.bmp b/skins/_old/zRiver/zRiver1/active/base.bmp deleted file mode 100644 index 7889b3eac4..0000000000 Binary files a/skins/_old/zRiver/zRiver1/active/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/active/left.bmp b/skins/_old/zRiver/zRiver1/active/left.bmp deleted file mode 100644 index 9e3d8ebdeb..0000000000 Binary files a/skins/_old/zRiver/zRiver1/active/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/active/oper.bmp b/skins/_old/zRiver/zRiver1/active/oper.bmp deleted file mode 100644 index 3aad3802a7..0000000000 Binary files a/skins/_old/zRiver/zRiver1/active/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/inactive/base.bmp b/skins/_old/zRiver/zRiver1/inactive/base.bmp deleted file mode 100644 index 2485b10b63..0000000000 Binary files a/skins/_old/zRiver/zRiver1/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/inactive/left.bmp b/skins/_old/zRiver/zRiver1/inactive/left.bmp deleted file mode 100644 index 163000d1db..0000000000 Binary files a/skins/_old/zRiver/zRiver1/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/inactive/oper.bmp b/skins/_old/zRiver/zRiver1/inactive/oper.bmp deleted file mode 100644 index 1d4da84abb..0000000000 Binary files a/skins/_old/zRiver/zRiver1/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/zRiver/zRiver1/skin.inc b/skins/_old/zRiver/zRiver1/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/zRiver/zRiver1/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/zRiver1/zRiver1.asm b/skins/_old/zRiver/zRiver1/zRiver1.asm deleted file mode 100644 index 547faa2228..0000000000 --- a/skins/_old/zRiver/zRiver1/zRiver1.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=0x002D37:\ ; border inner color - bouter=0x002D37:\ ; border outer color - bframe=0x003E4E],\ ; border frame color - colors inactive = [binner=0x21424A:\ ; border inner color - bouter=0x21424A:\ ; border outer color - bframe=0x214F5B],\ ; border frame color - dtp = 'BLUE.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 add74ce31f..102a300f2c 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -26,13 +26,11 @@ 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/2.Black_lace/2.Black_lace.skn", +"_old/Black_lace/2.Black_lace/Black_lace.skn", "_old/Blended/Blended.skn", -"_old/cherry/cherry.skn", "_old/CodeOpusC/Opus_A/Opus_A.skn", "_old/CodeOpusC/Opus_B/Opus_B.skn", "_old/CodeOpusC/Opus_D/Opus_D.skn", -"_old/CodeOpusC/Opus_DA/Opus_DA.skn", "_old/CodeOpusC/Opus_G/Opus_G.skn", "_old/Cyclops/1.Cyclops/1.Cyclops.skn", "_old/dark_night/dark_night.skn", @@ -61,8 +59,6 @@ skinlist = { "_old/mist/mist.skn", "_old/mist_color/mist_color.skn", "_old/mursky/mursky.skn", -"_old/MyTango/MyTango.skn", -"_old/Nature/Nature.skn", "_old/nix/nix_small/nix_small.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", @@ -85,12 +81,11 @@ skinlist = { "_old/subsilv/subsilv.skn", "_old/testtest/testtest.skn", "_old/USSR/USSR.skn", -"_old/USSR_2/1.USSR_2/1.USSR_2.skn", +"_old/USSR_2/1.USSR_2/USSR2.skn", "_old/WIN311/WIN311.skn", "_old/win8/win8.skn", "_old/WindowsXP/WinXP Classic blue/WinXP Classic blue.skn", "_old/WindowsXP/WinXP Standard blue/WinXP Standard blue.skn", "_old/WindowsXP/WinXP Standard olive_green/WinXP Standard olive_green.skn", "_old/WindowsXP/WinXP Standard silver/WinXP Standard silver.skn", -"_old/zRiver/zRiver1/zRiver1.skn", }