diff --git a/skins/_old/Cyclops/2.Cyclops/2.Cyclops.asm b/skins/_old/Cyclops/2.Cyclops/2.Cyclops.asm deleted file mode 100644 index 851761c691..0000000000 --- a/skins/_old/Cyclops/2.Cyclops/2.Cyclops.asm +++ /dev/null @@ -1,36 +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=0x00081d:\ ; border inner color - bouter=0x00081d:\ ; border outer color - bframe=0xA2A2A1],\ ; border frame color - colors inactive = [binner=0x00081d:\ ; border inner color - bouter=0x00081d:\ ; border outer color - bframe=0x8A8A8A],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-23:4][17:17],\ ; buttons coordinates - minimize = [-39:5][15:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - diff --git a/skins/_old/Cyclops/2.Cyclops/Tupfile.lua b/skins/_old/Cyclops/2.Cyclops/Tupfile.lua deleted file mode 100644 index b47774f557..0000000000 --- a/skins/_old/Cyclops/2.Cyclops/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("2.Cyclops.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.Cyclops.skn") diff --git a/skins/_old/Cyclops/2.Cyclops/active/base.bmp b/skins/_old/Cyclops/2.Cyclops/active/base.bmp deleted file mode 100644 index 9cdfaee815..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/active/base.bmp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/active/left.bmp b/skins/_old/Cyclops/2.Cyclops/active/left.bmp deleted file mode 100644 index 9655eff516..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/active/left.bmp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/active/oper.bmp b/skins/_old/Cyclops/2.Cyclops/active/oper.bmp deleted file mode 100644 index a92da0f68c..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/default.dtp b/skins/_old/Cyclops/2.Cyclops/default.dtp deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/default.dtp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/inactive/base.bmp b/skins/_old/Cyclops/2.Cyclops/inactive/base.bmp deleted file mode 100644 index e3ae88bad8..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/inactive/left.bmp b/skins/_old/Cyclops/2.Cyclops/inactive/left.bmp deleted file mode 100644 index 0fb35568a7..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/inactive/oper.bmp b/skins/_old/Cyclops/2.Cyclops/inactive/oper.bmp deleted file mode 100644 index 0b83162a05..0000000000 Binary files a/skins/_old/Cyclops/2.Cyclops/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Cyclops/2.Cyclops/skin.inc b/skins/_old/Cyclops/2.Cyclops/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Cyclops/2.Cyclops/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/Devil_skins/Blue_devil/BLUE.DTP b/skins/_old/Devil_skins/Blue_devil/BLUE.DTP deleted file mode 100644 index 79f46d3c94..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/BLUE.DTP and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/Blue_devil.asm b/skins/_old/Devil_skins/Blue_devil/Blue_devil.asm deleted file mode 100644 index f11538722b..0000000000 --- a/skins/_old/Devil_skins/Blue_devil/Blue_devil.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=0x0B4D7B:\ ; border inner color - bouter=0x0B4D7B:\ ; border outer color - bframe=0x0C5E98],\ ; border frame color - colors inactive = [binner=0x0B4D7B:\ ; border inner color - bouter=0x0B4D7B:\ ; border outer color - bframe=0x54718B],\ ; border frame color - dtp = 'BLUE.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-33:5][26:14],\ ; buttons coordinates - minimize = [-52:5][20:14] ; [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/Devil_skins/Blue_devil/Screenshot.png b/skins/_old/Devil_skins/Blue_devil/Screenshot.png deleted file mode 100644 index c186ed368a..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/Screenshot.png and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/Tupfile.lua b/skins/_old/Devil_skins/Blue_devil/Tupfile.lua deleted file mode 100644 index 5f4626241f..0000000000 --- a/skins/_old/Devil_skins/Blue_devil/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Blue_devil.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Blue_devil.skn") diff --git a/skins/_old/Devil_skins/Blue_devil/active/base.bmp b/skins/_old/Devil_skins/Blue_devil/active/base.bmp deleted file mode 100644 index 75f12d30a7..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/active/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/active/left.bmp b/skins/_old/Devil_skins/Blue_devil/active/left.bmp deleted file mode 100644 index 89136188f3..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/active/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/active/oper.bmp b/skins/_old/Devil_skins/Blue_devil/active/oper.bmp deleted file mode 100644 index 3bf5f86c29..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/inactive/base.bmp b/skins/_old/Devil_skins/Blue_devil/inactive/base.bmp deleted file mode 100644 index 626f7a7e05..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/inactive/left.bmp b/skins/_old/Devil_skins/Blue_devil/inactive/left.bmp deleted file mode 100644 index cc389e6a5d..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/inactive/oper.bmp b/skins/_old/Devil_skins/Blue_devil/inactive/oper.bmp deleted file mode 100644 index 38a4e6d110..0000000000 Binary files a/skins/_old/Devil_skins/Blue_devil/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Blue_devil/skin.inc b/skins/_old/Devil_skins/Blue_devil/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Devil_skins/Blue_devil/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/Devil_skins/Green_devil/GREEN.DTP b/skins/_old/Devil_skins/Green_devil/GREEN.DTP deleted file mode 100644 index c7034bdbd2..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/GREEN.DTP and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/Green_devil.asm b/skins/_old/Devil_skins/Green_devil/Green_devil.asm deleted file mode 100644 index fd9e45a80b..0000000000 --- a/skins/_old/Devil_skins/Green_devil/Green_devil.asm +++ /dev/null @@ -1,36 +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=0x0E7B0D:\ ; border inner color - bouter=0x0E7B0D:\ ; border outer color - bframe=0x10980E],\ ; border frame color - colors inactive = [binner=0x0E7B0D:\ ; border inner color - bouter=0x0E7B0D:\ ; border outer color - bframe=0x578B55],\ ; border frame color - dtp = 'GREEN.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-33:5][26:14],\ ; buttons coordinates - minimize = [-52:5][20:14] ; [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/Devil_skins/Green_devil/Tupfile.lua b/skins/_old/Devil_skins/Green_devil/Tupfile.lua deleted file mode 100644 index e43c479221..0000000000 --- a/skins/_old/Devil_skins/Green_devil/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Green_devil.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Green_devil.skn") diff --git a/skins/_old/Devil_skins/Green_devil/active/base.bmp b/skins/_old/Devil_skins/Green_devil/active/base.bmp deleted file mode 100644 index 4478658105..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/active/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/active/left.bmp b/skins/_old/Devil_skins/Green_devil/active/left.bmp deleted file mode 100644 index 0a5a515d68..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/active/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/active/oper.bmp b/skins/_old/Devil_skins/Green_devil/active/oper.bmp deleted file mode 100644 index 8934982d1c..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/green.png b/skins/_old/Devil_skins/Green_devil/green.png deleted file mode 100644 index dc069b1de8..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/green.png and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/inactive/base.bmp b/skins/_old/Devil_skins/Green_devil/inactive/base.bmp deleted file mode 100644 index bc8b0e8ea3..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/inactive/left.bmp b/skins/_old/Devil_skins/Green_devil/inactive/left.bmp deleted file mode 100644 index 9e509c11a6..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/inactive/oper.bmp b/skins/_old/Devil_skins/Green_devil/inactive/oper.bmp deleted file mode 100644 index 7940005aed..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Green_devil/skin.inc b/skins/_old/Devil_skins/Green_devil/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Devil_skins/Green_devil/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/Devil_skins/Pink_devil/PINK.DTP b/skins/_old/Devil_skins/Pink_devil/PINK.DTP deleted file mode 100644 index 7ac6b59a0f..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/PINK.DTP and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/Pink_devil.asm b/skins/_old/Devil_skins/Pink_devil/Pink_devil.asm deleted file mode 100644 index 4e50183935..0000000000 --- a/skins/_old/Devil_skins/Pink_devil/Pink_devil.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=0x7B0F6B:\ ; border inner color - bouter=0x7B0F6B:\ ; border outer color - bframe=0x981084],\ ; border frame color - colors inactive = [binner=0x7B0F6B:\ ; border inner color - bouter=0x7B0F6B:\ ; border outer color - bframe=0x8B5784],\ ; border frame color - dtp = 'PINK.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-33:5][26:14],\ ; buttons coordinates - minimize = [-52:5][20:14] ; [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/Devil_skins/Pink_devil/Tupfile.lua b/skins/_old/Devil_skins/Pink_devil/Tupfile.lua deleted file mode 100644 index 2e82f1a628..0000000000 --- a/skins/_old/Devil_skins/Pink_devil/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Pink_devil.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Pink_devil.skn") diff --git a/skins/_old/Devil_skins/Pink_devil/active/base.bmp b/skins/_old/Devil_skins/Pink_devil/active/base.bmp deleted file mode 100644 index 787182c4a9..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/active/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/active/left.bmp b/skins/_old/Devil_skins/Pink_devil/active/left.bmp deleted file mode 100644 index 9d6cdbd1f9..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/active/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/active/oper.bmp b/skins/_old/Devil_skins/Pink_devil/active/oper.bmp deleted file mode 100644 index 32dd2478ee..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/inactive/base.bmp b/skins/_old/Devil_skins/Pink_devil/inactive/base.bmp deleted file mode 100644 index 35993eb850..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/inactive/left.bmp b/skins/_old/Devil_skins/Pink_devil/inactive/left.bmp deleted file mode 100644 index 2ed790ff9d..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/inactive/oper.bmp b/skins/_old/Devil_skins/Pink_devil/inactive/oper.bmp deleted file mode 100644 index b71260e127..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/pink.png b/skins/_old/Devil_skins/Pink_devil/pink.png deleted file mode 100644 index b7def81751..0000000000 Binary files a/skins/_old/Devil_skins/Pink_devil/pink.png and /dev/null differ diff --git a/skins/_old/Devil_skins/Pink_devil/skin.inc b/skins/_old/Devil_skins/Pink_devil/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Devil_skins/Pink_devil/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/Devil_skins/Red_devil/Red_devil.asm b/skins/_old/Devil_skins/Red_devil/Red_devil.asm deleted file mode 100644 index dcae28eddd..0000000000 --- a/skins/_old/Devil_skins/Red_devil/Red_devil.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=0x7B0C13:\ ; border inner color - bouter=0x7B0C13:\ ; border outer color - bframe=0x980D16],\ ; border frame color - colors inactive = [binner=0x7B0C13:\ ; border inner color - bouter=0x7B0C13:\ ; border outer color - bframe=0x8B5557],\ ; border frame color - dtp = 'red_devil.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-33:5][26:14],\ ; buttons coordinates - minimize = [-52:5][20:14] ; [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/Devil_skins/Red_devil/Tupfile.lua b/skins/_old/Devil_skins/Red_devil/Tupfile.lua deleted file mode 100644 index 034d6d4ad5..0000000000 --- a/skins/_old/Devil_skins/Red_devil/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Red_devil.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Red_devil.skn") diff --git a/skins/_old/Devil_skins/Red_devil/active/base.bmp b/skins/_old/Devil_skins/Red_devil/active/base.bmp deleted file mode 100644 index 55d4ab8bef..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/active/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/active/left.bmp b/skins/_old/Devil_skins/Red_devil/active/left.bmp deleted file mode 100644 index 76c4b7049a..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/active/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/active/oper.bmp b/skins/_old/Devil_skins/Red_devil/active/oper.bmp deleted file mode 100644 index 6c3b3d852a..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/inactive/base.bmp b/skins/_old/Devil_skins/Red_devil/inactive/base.bmp deleted file mode 100644 index 5b52840b2e..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/inactive/left.bmp b/skins/_old/Devil_skins/Red_devil/inactive/left.bmp deleted file mode 100644 index 2fe8e8668d..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/inactive/oper.bmp b/skins/_old/Devil_skins/Red_devil/inactive/oper.bmp deleted file mode 100644 index 8f5a1ae322..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/red.png b/skins/_old/Devil_skins/Red_devil/red.png deleted file mode 100644 index 8fcf35929e..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/red.png and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/red_devil.dtp b/skins/_old/Devil_skins/Red_devil/red_devil.dtp deleted file mode 100644 index 67eaaf51fc..0000000000 Binary files a/skins/_old/Devil_skins/Red_devil/red_devil.dtp and /dev/null differ diff --git a/skins/_old/Devil_skins/Red_devil/skin.inc b/skins/_old/Devil_skins/Red_devil/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Devil_skins/Red_devil/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/Devil_skins/Violet_devil/Tupfile.lua b/skins/_old/Devil_skins/Violet_devil/Tupfile.lua deleted file mode 100644 index a93e0c31be..0000000000 --- a/skins/_old/Devil_skins/Violet_devil/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Violet_devil.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Violet_devil.skn") diff --git a/skins/_old/Devil_skins/Violet_devil/VIOLET.DTP b/skins/_old/Devil_skins/Violet_devil/VIOLET.DTP deleted file mode 100644 index da3bba39c2..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/VIOLET.DTP and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/Violet_devil.asm b/skins/_old/Devil_skins/Violet_devil/Violet_devil.asm deleted file mode 100644 index 343f3b2bb1..0000000000 --- a/skins/_old/Devil_skins/Violet_devil/Violet_devil.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=0x510D7B:\ ; border inner color - bouter=0x510D7B:\ ; border outer color - bframe=0x630E98],\ ; border frame color - colors inactive = [binner=0x510D7B:\ ; border inner color - bouter=0x510D7B:\ ; border outer color - bframe=0x72558B],\ ; border frame color - dtp = 'VIOLET.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-33:5][26:14],\ ; buttons coordinates - minimize = [-52:5][20:14] ; [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/Devil_skins/Violet_devil/active/base.bmp b/skins/_old/Devil_skins/Violet_devil/active/base.bmp deleted file mode 100644 index ad7e99a755..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/active/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/active/left.bmp b/skins/_old/Devil_skins/Violet_devil/active/left.bmp deleted file mode 100644 index 8dce1df960..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/active/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/active/oper.bmp b/skins/_old/Devil_skins/Violet_devil/active/oper.bmp deleted file mode 100644 index 5d12d53789..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/inactive/base.bmp b/skins/_old/Devil_skins/Violet_devil/inactive/base.bmp deleted file mode 100644 index b15a689eee..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/inactive/left.bmp b/skins/_old/Devil_skins/Violet_devil/inactive/left.bmp deleted file mode 100644 index 03cc842042..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/inactive/oper.bmp b/skins/_old/Devil_skins/Violet_devil/inactive/oper.bmp deleted file mode 100644 index d42e794924..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Devil_skins/Violet_devil/skin.inc b/skins/_old/Devil_skins/Violet_devil/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Devil_skins/Violet_devil/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/Devil_skins/Violet_devil/violet.png b/skins/_old/Devil_skins/Violet_devil/violet.png deleted file mode 100644 index 0005d1526a..0000000000 Binary files a/skins/_old/Devil_skins/Violet_devil/violet.png and /dev/null differ diff --git a/skins/_old/Devil_skins/screenshot.png b/skins/_old/Devil_skins/screenshot.png deleted file mode 100644 index 8196c3e438..0000000000 Binary files a/skins/_old/Devil_skins/screenshot.png and /dev/null differ diff --git a/skins/_old/Glass_lime/BLUE.DTP b/skins/_old/Glass_lime/BLUE.DTP deleted file mode 100644 index 442d7dc575..0000000000 Binary files a/skins/_old/Glass_lime/BLUE.DTP and /dev/null differ diff --git a/skins/_old/Glass_lime/Glass_lime.asm b/skins/_old/Glass_lime/Glass_lime.asm deleted file mode 100644 index d727fa59db..0000000000 --- a/skins/_old/Glass_lime/Glass_lime.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=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x0545ED],\ ; border frame color - colors inactive = [binner=0x373737:\ ; border inner color - bouter=0x373737:\ ; border outer color - bframe=0x3B6CF0],\ ; border frame color - dtp = 'BLUE.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-28:4][22:15],\ ; buttons coordinates - minimize = [-51:4][22: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 ; -;================================; - -; 75F875 \ No newline at end of file diff --git a/skins/_old/Glass_lime/Tupfile.lua b/skins/_old/Glass_lime/Tupfile.lua deleted file mode 100644 index 1bf304dd31..0000000000 --- a/skins/_old/Glass_lime/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Glass_lime.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Glass_lime.skn") diff --git a/skins/_old/Glass_lime/active/base.bmp b/skins/_old/Glass_lime/active/base.bmp deleted file mode 100644 index 69d8635be0..0000000000 Binary files a/skins/_old/Glass_lime/active/base.bmp and /dev/null differ diff --git a/skins/_old/Glass_lime/active/left.bmp b/skins/_old/Glass_lime/active/left.bmp deleted file mode 100644 index 994f9c5086..0000000000 Binary files a/skins/_old/Glass_lime/active/left.bmp and /dev/null differ diff --git a/skins/_old/Glass_lime/active/oper.bmp b/skins/_old/Glass_lime/active/oper.bmp deleted file mode 100644 index 332d3cbb5f..0000000000 Binary files a/skins/_old/Glass_lime/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Glass_lime/inactive/base.bmp b/skins/_old/Glass_lime/inactive/base.bmp deleted file mode 100644 index edf67866f5..0000000000 Binary files a/skins/_old/Glass_lime/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Glass_lime/inactive/left.bmp b/skins/_old/Glass_lime/inactive/left.bmp deleted file mode 100644 index 9294605f23..0000000000 Binary files a/skins/_old/Glass_lime/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Glass_lime/inactive/oper.bmp b/skins/_old/Glass_lime/inactive/oper.bmp deleted file mode 100644 index a4a6547574..0000000000 Binary files a/skins/_old/Glass_lime/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Glass_lime/skin.inc b/skins/_old/Glass_lime/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Glass_lime/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 blue/GRAY.DTP b/skins/_old/WindowsXP/WinXP Classic blue/GRAY.DTP deleted file mode 100644 index 0c8da72a45..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/GRAY.DTP and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/Tupfile.lua b/skins/_old/WindowsXP/WinXP Classic blue/Tupfile.lua deleted file mode 100644 index 7c24b139a7..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic blue/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("WinXP_Classic_blue.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "WinXP Classic blue.skn") diff --git a/skins/_old/WindowsXP/WinXP Classic blue/WinXP_Classic_blue.asm b/skins/_old/WindowsXP/WinXP Classic blue/WinXP_Classic_blue.asm deleted file mode 100644 index 503f0d4d06..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic blue/WinXP_Classic_blue.asm +++ /dev/null @@ -1,31 +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=0x808080:\ ; border inner color - bouter=0x808080:\ ; border outer color - bframe=0xC0C0C0],\ ; border frame color - colors inactive = [binner=0x808080:\ ; border inner color - bouter=0x808080:\ ; border outer color - bframe=0x999999],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - 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 - 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/WindowsXP/WinXP Classic blue/active/base.bmp b/skins/_old/WindowsXP/WinXP Classic blue/active/base.bmp deleted file mode 100644 index 57a9f96058..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/active/base.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/active/left.bmp b/skins/_old/WindowsXP/WinXP Classic blue/active/left.bmp deleted file mode 100644 index afe081c0bb..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/active/left.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/active/oper.bmp b/skins/_old/WindowsXP/WinXP Classic blue/active/oper.bmp deleted file mode 100644 index 086624c59a..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/active/oper.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/inactive/base.bmp b/skins/_old/WindowsXP/WinXP Classic blue/inactive/base.bmp deleted file mode 100644 index a84ae5a501..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/inactive/left.bmp b/skins/_old/WindowsXP/WinXP Classic blue/inactive/left.bmp deleted file mode 100644 index aa763ea92a..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/inactive/oper.bmp b/skins/_old/WindowsXP/WinXP Classic blue/inactive/oper.bmp deleted file mode 100644 index a41262cc39..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic blue/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic blue/skin.inc b/skins/_old/WindowsXP/WinXP Classic blue/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic blue/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 violet/GRAY.DTP b/skins/_old/WindowsXP/WinXP Classic violet/GRAY.DTP deleted file mode 100644 index 0c8da72a45..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/GRAY.DTP and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/Tupfile.lua b/skins/_old/WindowsXP/WinXP Classic violet/Tupfile.lua deleted file mode 100644 index 66a80445a9..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic violet/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("WinXP_Classic_violet.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "WinXP Classic violet.skn") diff --git a/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm b/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm deleted file mode 100644 index 503f0d4d06..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic violet/WinXP_Classic_violet.asm +++ /dev/null @@ -1,31 +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=0x808080:\ ; border inner color - bouter=0x808080:\ ; border outer color - bframe=0xC0C0C0],\ ; border frame color - colors inactive = [binner=0x808080:\ ; border inner color - bouter=0x808080:\ ; border outer color - bframe=0x999999],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - 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 - 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/WindowsXP/WinXP Classic violet/active/base.bmp b/skins/_old/WindowsXP/WinXP Classic violet/active/base.bmp deleted file mode 100644 index f2e38de986..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/active/base.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/active/left.bmp b/skins/_old/WindowsXP/WinXP Classic violet/active/left.bmp deleted file mode 100644 index a445c02327..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/active/left.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/active/oper.bmp b/skins/_old/WindowsXP/WinXP Classic violet/active/oper.bmp deleted file mode 100644 index da021fbb6e..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/active/oper.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/inactive/base.bmp b/skins/_old/WindowsXP/WinXP Classic violet/inactive/base.bmp deleted file mode 100644 index 399a2b5910..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/inactive/left.bmp b/skins/_old/WindowsXP/WinXP Classic violet/inactive/left.bmp deleted file mode 100644 index 9b37c8ce70..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/inactive/oper.bmp b/skins/_old/WindowsXP/WinXP Classic violet/inactive/oper.bmp deleted file mode 100644 index 08661bc173..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic violet/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic violet/skin.inc b/skins/_old/WindowsXP/WinXP Classic violet/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic violet/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 yellow/GRAY.DTP b/skins/_old/WindowsXP/WinXP Classic yellow/GRAY.DTP deleted file mode 100644 index 3668c24016..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/GRAY.DTP and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/Tupfile.lua b/skins/_old/WindowsXP/WinXP Classic yellow/Tupfile.lua deleted file mode 100644 index 487c021e25..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic yellow/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("WinXP_Classic_yellow.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "WinXP Classic yellow.skn") diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm b/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm deleted file mode 100644 index 503f0d4d06..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic yellow/WinXP_Classic_yellow.asm +++ /dev/null @@ -1,31 +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=0x808080:\ ; border inner color - bouter=0x808080:\ ; border outer color - bframe=0xC0C0C0],\ ; border frame color - colors inactive = [binner=0x808080:\ ; border inner color - bouter=0x808080:\ ; border outer color - bframe=0x999999],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - 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 - 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/WindowsXP/WinXP Classic yellow/active/base.bmp b/skins/_old/WindowsXP/WinXP Classic yellow/active/base.bmp deleted file mode 100644 index 8bb180ccd3..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/active/base.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/active/left.bmp b/skins/_old/WindowsXP/WinXP Classic yellow/active/left.bmp deleted file mode 100644 index 94e6164d21..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/active/left.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/active/oper.bmp b/skins/_old/WindowsXP/WinXP Classic yellow/active/oper.bmp deleted file mode 100644 index 2116615624..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/active/oper.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/inactive/base.bmp b/skins/_old/WindowsXP/WinXP Classic yellow/inactive/base.bmp deleted file mode 100644 index 41ab52e4f3..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/inactive/left.bmp b/skins/_old/WindowsXP/WinXP Classic yellow/inactive/left.bmp deleted file mode 100644 index 7dbe2c1e9e..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/inactive/oper.bmp b/skins/_old/WindowsXP/WinXP Classic yellow/inactive/oper.bmp deleted file mode 100644 index e74dc452eb..0000000000 Binary files a/skins/_old/WindowsXP/WinXP Classic yellow/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/WindowsXP/WinXP Classic yellow/skin.inc b/skins/_old/WindowsXP/WinXP Classic yellow/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/WindowsXP/WinXP Classic yellow/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - _file equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - dd @f - $ - 4 - file _dtp - @@: -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} diff --git a/skins/_old/myskin2/Tupfile.lua b/skins/_old/myskin2/Tupfile.lua deleted file mode 100644 index 069222a835..0000000000 --- a/skins/_old/myskin2/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"), "myskin2.skn") diff --git a/skins/_old/myskin2/base.bmp b/skins/_old/myskin2/base.bmp deleted file mode 100644 index 3195f51da0..0000000000 Binary files a/skins/_old/myskin2/base.bmp and /dev/null differ diff --git a/skins/_old/myskin2/default.asm b/skins/_old/myskin2/default.asm deleted file mode 100644 index 587242e1f9..0000000000 --- a/skins/_old/myskin2/default.asm +++ /dev/null @@ -1,28 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x0000ff],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x0000ff],\ ; border frame color - dtp = 'myblue.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/myskin2/left.bmp b/skins/_old/myskin2/left.bmp deleted file mode 100644 index bf4039e479..0000000000 Binary files a/skins/_old/myskin2/left.bmp and /dev/null differ diff --git a/skins/_old/myskin2/myblue.dtp b/skins/_old/myskin2/myblue.dtp deleted file mode 100644 index 9e268cc7a7..0000000000 Binary files a/skins/_old/myskin2/myblue.dtp and /dev/null differ diff --git a/skins/_old/myskin2/oper.bmp b/skins/_old/myskin2/oper.bmp deleted file mode 100644 index e70270823b..0000000000 Binary files a/skins/_old/myskin2/oper.bmp and /dev/null differ diff --git a/skins/_old/myskin2/skin.inc b/skins/_old/myskin2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/myskin2/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/neutral/neutral/Tupfile.lua b/skins/_old/neutral/neutral/Tupfile.lua deleted file mode 100644 index ff0be2fd3d..0000000000 --- a/skins/_old/neutral/neutral/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"), "neutral.skn") diff --git a/skins/_old/neutral/neutral/base.bmp b/skins/_old/neutral/neutral/base.bmp deleted file mode 100644 index 87ef660f6d..0000000000 Binary files a/skins/_old/neutral/neutral/base.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral/base_1.bmp b/skins/_old/neutral/neutral/base_1.bmp deleted file mode 100644 index 12f6b5b796..0000000000 Binary files a/skins/_old/neutral/neutral/base_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral/default.asm b/skins/_old/neutral/neutral/default.asm deleted file mode 100644 index d8d2e7d03a..0000000000 --- a/skins/_old/neutral/neutral/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:36:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x4b6b8a],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0xc0c0c0],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-19:3][15:15],\ ; buttons coordinates - minimize = [-36:3][15:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'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/neutral/neutral/default.dtp b/skins/_old/neutral/neutral/default.dtp deleted file mode 100644 index f8df31e6a7..0000000000 Binary files a/skins/_old/neutral/neutral/default.dtp and /dev/null differ diff --git a/skins/_old/neutral/neutral/default.dtp.asm b/skins/_old/neutral/neutral/default.dtp.asm deleted file mode 100644 index cda97bac6c..0000000000 --- a/skins/_old/neutral/neutral/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x4b6b8a -grab dd 0x8aa2ba -grab_button dd 0xcecece -grab_button_text dd 0x000000 -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/neutral/neutral/dtp_build.bat b/skins/_old/neutral/neutral/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/neutral/neutral/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/neutral/neutral/left.bmp b/skins/_old/neutral/neutral/left.bmp deleted file mode 100644 index ec7e608d30..0000000000 Binary files a/skins/_old/neutral/neutral/left.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral/left_1.bmp b/skins/_old/neutral/neutral/left_1.bmp deleted file mode 100644 index 993f261b4c..0000000000 Binary files a/skins/_old/neutral/neutral/left_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral/oper.bmp b/skins/_old/neutral/neutral/oper.bmp deleted file mode 100644 index fa2f070439..0000000000 Binary files a/skins/_old/neutral/neutral/oper.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral/oper_1.bmp b/skins/_old/neutral/neutral/oper_1.bmp deleted file mode 100644 index ce490e8fe5..0000000000 Binary files a/skins/_old/neutral/neutral/oper_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral/pack_build.bat b/skins/_old/neutral/neutral/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/neutral/neutral/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/neutral/neutral/skin.inc b/skins/_old/neutral/neutral/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/neutral/neutral/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/neutral/neutral/skn_build.bat b/skins/_old/neutral/neutral/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/neutral/neutral/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/skinlist.lua b/skins/skinlist.lua index 37f128c41c..6ae108a9d8 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -40,20 +40,12 @@ skinlist = { "_old/CodeOpusC/Opus_G/Opus_G.skn", "_old/Crystal/Crystal.skn", "_old/Cyclops/1.Cyclops/1.Cyclops.skn", -"_old/Cyclops/2.Cyclops/2.Cyclops.skn", "_old/Dark_future/Dark_future.skn", "_old/dark_night/dark_night.skn", -"_old/Devil_skins/Blue_devil/Blue_devil.skn", -"_old/Devil_skins/Green_devil/Green_devil.skn", -"_old/Devil_skins/Pink_devil/Pink_devil.skn", -"_old/Devil_skins/Red_devil/Red_devil.skn", -"_old/Devil_skins/Violet_devil/Violet_devil.skn", "_old/Eyes/Eyes.skn", "_old/falloutskn/falloutskn.skn", "_old/first_skin/first_skin.skn", -"_old/Flowers/Flowers.skn", "_old/Flyght/Flyght.skn", -"_old/Glass_lime/Glass_lime.skn", "_old/gliteskin/gliteskin_deepsky/gliteskin_deepsky.skn", "_old/gliteskin/gliteskin_glider/gliteskin_glider.skn", "_old/gliteskin/gliteskin_red/gliteskin_red.skn", @@ -89,12 +81,10 @@ skinlist = { "_old/mursky/mursky.skn", "_old/mygrey/mygrey.skn", "_old/myskin1/myskin1.skn", -"_old/myskin2/myskin2.skn", "_old/myskin3/myskin3.skn", "_old/myskin4/myskin4.skn", "_old/MyTango/MyTango.skn", "_old/Nature/Nature.skn", -"_old/neutral/neutral/neutral.skn", "_old/neutral/neutral_blue/neutral_blue.skn", "_old/neutral/neutral_green/neutral_green.skn", "_old/neutral/neutral_lilac/neutral_lilac.skn", @@ -137,10 +127,7 @@ skinlist = { "_old/vista/vista.skn", "_old/WIN311/WIN311.skn", "_old/win8/win8.skn", -"_old/WindowsXP/WinXP Classic black/WinXP Classic black.skn", "_old/WindowsXP/WinXP Classic blue/WinXP Classic blue.skn", -"_old/WindowsXP/WinXP Classic violet/WinXP Classic violet.skn", -"_old/WindowsXP/WinXP Classic yellow/WinXP Classic yellow.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",