diff --git a/skins/_old/Organics/ORANGE.DTP b/skins/_old/Organics/ORANGE.DTP deleted file mode 100644 index 58d9278d87..0000000000 Binary files a/skins/_old/Organics/ORANGE.DTP and /dev/null differ diff --git a/skins/_old/Organics/Organics.asm b/skins/_old/Organics/Organics.asm deleted file mode 100644 index 7c1f13c82d..0000000000 --- a/skins/_old/Organics/Organics.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=0xA46200:\ ; border inner color - bouter=0xA46200:\ ; border outer color - bframe=0xFF9900],\ ; border frame color - colors inactive = [binner=0xB17926:\ ; border inner color - bouter=0xB17926:\ ; border outer color - bframe=0xFFA826],\ ; border frame color - dtp = 'ORANGE.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-28:4][19:15],\ ; buttons coordinates - minimize = [-53:4][19: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 ; -;================================; - -; FFA900 \ No newline at end of file diff --git a/skins/_old/Organics/Tupfile.lua b/skins/_old/Organics/Tupfile.lua deleted file mode 100644 index 71b2732b7a..0000000000 --- a/skins/_old/Organics/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Organics.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Organics.skn") diff --git a/skins/_old/Organics/active/base.bmp b/skins/_old/Organics/active/base.bmp deleted file mode 100644 index 0a62712185..0000000000 Binary files a/skins/_old/Organics/active/base.bmp and /dev/null differ diff --git a/skins/_old/Organics/active/left.bmp b/skins/_old/Organics/active/left.bmp deleted file mode 100644 index 12fdc8f77c..0000000000 Binary files a/skins/_old/Organics/active/left.bmp and /dev/null differ diff --git a/skins/_old/Organics/active/oper.bmp b/skins/_old/Organics/active/oper.bmp deleted file mode 100644 index ab376a9282..0000000000 Binary files a/skins/_old/Organics/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Organics/inactive/base.bmp b/skins/_old/Organics/inactive/base.bmp deleted file mode 100644 index b9428aa369..0000000000 Binary files a/skins/_old/Organics/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Organics/inactive/left.bmp b/skins/_old/Organics/inactive/left.bmp deleted file mode 100644 index 98d72dbf1a..0000000000 Binary files a/skins/_old/Organics/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Organics/inactive/oper.bmp b/skins/_old/Organics/inactive/oper.bmp deleted file mode 100644 index dcd46d0af7..0000000000 Binary files a/skins/_old/Organics/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Organics/skin.inc b/skins/_old/Organics/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Organics/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/SashSkinPack_1_1/Src/Metal/Metal.asm b/skins/_old/SashSkinPack_1_1/Src/Metal/Metal.asm deleted file mode 100644 index 46a3f66689..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Metal/Metal.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=0x7f86a6:\ ; border inner color - bouter=0xb3b8bb:\ ; border outer color - bframe=0x7f86a6],\ ; border frame color - colors inactive = [binner=0x4d5060:\ ; border inner color - bouter=0x6a6c6e:\ ; border outer color - bframe=0x4d5060],\ ; border frame color - dtp = 'colors.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-22:3][18:18],\ ; buttons coordinates - minimize = [-40:3][18:18] ; [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/SashSkinPack_1_1/Src/Metal/Tupfile.lua b/skins/_old/SashSkinPack_1_1/Src/Metal/Tupfile.lua deleted file mode 100644 index 175215386a..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Metal/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Metal.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Metal.skn") diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/active/base.bmp b/skins/_old/SashSkinPack_1_1/Src/Metal/active/base.bmp deleted file mode 100644 index 205054dfbc..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/active/base.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/active/left.bmp b/skins/_old/SashSkinPack_1_1/Src/Metal/active/left.bmp deleted file mode 100644 index e68adeb60e..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/active/left.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/active/oper.bmp b/skins/_old/SashSkinPack_1_1/Src/Metal/active/oper.bmp deleted file mode 100644 index 4460095eff..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/active/oper.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/colors.dtp b/skins/_old/SashSkinPack_1_1/Src/Metal/colors.dtp deleted file mode 100644 index b1c87b72eb..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/colors.dtp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/base.bmp b/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/base.bmp deleted file mode 100644 index 10696a705c..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/left.bmp b/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/left.bmp deleted file mode 100644 index 70a92de5a9..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/oper.bmp b/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/oper.bmp deleted file mode 100644 index b0cf9610cd..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Metal/skin.inc b/skins/_old/SashSkinPack_1_1/Src/Metal/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Metal/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/StyleVista/vista_dark/Tupfile.lua b/skins/_old/StyleVista/vista_dark/Tupfile.lua deleted file mode 100644 index 9c8a16047f..0000000000 --- a/skins/_old/StyleVista/vista_dark/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"), "vista_dark.skn") diff --git a/skins/_old/StyleVista/vista_dark/base.bmp b/skins/_old/StyleVista/vista_dark/base.bmp deleted file mode 100644 index 6afccc32aa..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/base.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/base_1.bmp b/skins/_old/StyleVista/vista_dark/base_1.bmp deleted file mode 100644 index 6afccc32aa..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/base_1.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/default.asm b/skins/_old/StyleVista/vista_dark/default.asm deleted file mode 100644 index d288e5869b..0000000000 --- a/skins/_old/StyleVista/vista_dark/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:78:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xafafaf:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - colors inactive = [binner=0xafafaf:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-47:1][43:17],\ ; buttons coordinates - minimize = [-72:1][26:17] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/StyleVista/vista_dark/default.dtp b/skins/_old/StyleVista/vista_dark/default.dtp deleted file mode 100644 index ef5bb24718..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/default.dtp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/default.dtp.asm b/skins/_old/StyleVista/vista_dark/default.dtp.asm deleted file mode 100644 index 27a36bacc3..0000000000 --- a/skins/_old/StyleVista/vista_dark/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xf3f3f3 -grab dd 0x525252 -grab_button dd 0xAA2711 -grab_button_text dd 0xffffff -grab_text dd 0xffffff -work dd 0xf3f3f3 -work_button dd 0xd8d8d8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xafafaf \ No newline at end of file diff --git a/skins/_old/StyleVista/vista_dark/dtp_build.bat b/skins/_old/StyleVista/vista_dark/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/StyleVista/vista_dark/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/StyleVista/vista_dark/left.bmp b/skins/_old/StyleVista/vista_dark/left.bmp deleted file mode 100644 index b43282c433..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/left.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/left_1.bmp b/skins/_old/StyleVista/vista_dark/left_1.bmp deleted file mode 100644 index b43282c433..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/left_1.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/oper.bmp b/skins/_old/StyleVista/vista_dark/oper.bmp deleted file mode 100644 index 0dbc7e093c..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/oper.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/oper_1.bmp b/skins/_old/StyleVista/vista_dark/oper_1.bmp deleted file mode 100644 index 84d1adc1b9..0000000000 Binary files a/skins/_old/StyleVista/vista_dark/oper_1.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista_dark/pack_build.bat b/skins/_old/StyleVista/vista_dark/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/StyleVista/vista_dark/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/StyleVista/vista_dark/skin.inc b/skins/_old/StyleVista/vista_dark/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/StyleVista/vista_dark/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - _file equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - dd @f - $ - 4 - file _dtp - @@: -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} diff --git a/skins/_old/StyleVista/vista_dark/skn_build.bat b/skins/_old/StyleVista/vista_dark/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/StyleVista/vista_dark/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/Syllable/Syllable.asm b/skins/_old/Syllable/Syllable.asm deleted file mode 100644 index a2663182f4..0000000000 --- a/skins/_old/Syllable/Syllable.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=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0xC0C0C0],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0xC0C0C0],\ ; border frame color - dtp = 'Syllable.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-17:4][14:13],\ ; buttons coordinates - minimize = [-32:4][14:13] ; [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/Syllable/Syllable.dtp b/skins/_old/Syllable/Syllable.dtp deleted file mode 100644 index df767f0191..0000000000 Binary files a/skins/_old/Syllable/Syllable.dtp and /dev/null differ diff --git a/skins/_old/Syllable/Tupfile.lua b/skins/_old/Syllable/Tupfile.lua deleted file mode 100644 index 5fe46e641f..0000000000 --- a/skins/_old/Syllable/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Syllable.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Syllable.skn") diff --git a/skins/_old/Syllable/active/base.bmp b/skins/_old/Syllable/active/base.bmp deleted file mode 100644 index 0416bf842a..0000000000 Binary files a/skins/_old/Syllable/active/base.bmp and /dev/null differ diff --git a/skins/_old/Syllable/active/left.bmp b/skins/_old/Syllable/active/left.bmp deleted file mode 100644 index 2258997414..0000000000 Binary files a/skins/_old/Syllable/active/left.bmp and /dev/null differ diff --git a/skins/_old/Syllable/active/oper.bmp b/skins/_old/Syllable/active/oper.bmp deleted file mode 100644 index 3c233b6869..0000000000 Binary files a/skins/_old/Syllable/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Syllable/inactive/base.bmp b/skins/_old/Syllable/inactive/base.bmp deleted file mode 100644 index 0416bf842a..0000000000 Binary files a/skins/_old/Syllable/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Syllable/inactive/left.bmp b/skins/_old/Syllable/inactive/left.bmp deleted file mode 100644 index 2258997414..0000000000 Binary files a/skins/_old/Syllable/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Syllable/inactive/oper.bmp b/skins/_old/Syllable/inactive/oper.bmp deleted file mode 100644 index 3c233b6869..0000000000 Binary files a/skins/_old/Syllable/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Syllable/skin.inc b/skins/_old/Syllable/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Syllable/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - _file equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - dd @f - $ - 4 - file _dtp - @@: -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/Tupfile.lua b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/Tupfile.lua index 00aa4a68b6..6d6327d269 100644 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/Tupfile.lua +++ b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Humanoid_OSX_dark_night.skn") +tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "humanoid_OSX_blue.skn") diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base.bmp index 114534674f..2c962bd4d1 100644 Binary files a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base.bmp and b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base.bmp differ diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base_1.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base_1.bmp index 212ef276a9..2c962bd4d1 100644 Binary files a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base_1.bmp and b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/base_1.bmp differ diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm index c918410474..44c0f642ee 100644 --- a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm +++ b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/default.asm @@ -4,18 +4,18 @@ include '../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [5:1:72:1],\ ; margins [left:top:right:bottom] + margins = [5:1:45:1],\ ; margins [left:top:right:bottom] colors active = [binner=0x101010:\ ; border inner color bouter=0x101010:\ ; border outer color - bframe=0x3E3E3E],\ ; border frame color + bframe=0x131313],\ ; border frame color colors inactive = [binner=0x101010:\ ; border inner color bouter=0x101010:\ ; border outer color - bframe=0x3E3E3E],\ ; border frame color + bframe=0x131313],\ ; border frame color dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-20:3][16:16],\ ; buttons coordinates - minimize = [-40:3][16:16] ; [left:top][width:height] + close = [-20:4][16:16],\ ; buttons coordinates + minimize = [-40:4][16:16] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers @@ -28,6 +28,6 @@ SKIN_BITMAPS \ BITMAP bmp_left ,'left.bmp' ; skin bitmaps BITMAP bmp_oper ,'oper.bmp' BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left.bmp' +BITMAP bmp_left1,'left.bmp' ;the same BITMAP bmp_oper1,'oper_1.bmp' BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/left.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/left.bmp index 0e3357dfb5..97efacdebe 100644 Binary files a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/left.bmp and b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/left.bmp differ diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper.bmp index 824be5e230..f845fbd448 100644 Binary files a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper.bmp and b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper.bmp differ diff --git a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper_1.bmp b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper_1.bmp index c87bb54515..680e00fc6e 100644 Binary files a/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper_1.bmp and b/skins/_old/humanoid_OSX/Humanoid_OSX_dark_night/oper_1.bmp differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/Tupfile.lua b/skins/_old/humanoid_OSX/humanoid_OSX_blue/Tupfile.lua deleted file mode 100644 index 6d6327d269..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_blue/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"), "humanoid_OSX_blue.skn") diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/base.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/base.bmp deleted file mode 100644 index 2c962bd4d1..0000000000 Binary files a/skins/_old/humanoid_OSX/humanoid_OSX_blue/base.bmp and /dev/null differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/base_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/base_1.bmp deleted file mode 100644 index 2c962bd4d1..0000000000 Binary files a/skins/_old/humanoid_OSX/humanoid_OSX_blue/base_1.bmp and /dev/null differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.asm b/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.asm deleted file mode 100644 index 44c0f642ee..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_blue/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:45:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x101010:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0x131313],\ ; border frame color - colors inactive = [binner=0x101010:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0x131313],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:4][16:16],\ ; buttons coordinates - minimize = [-40:4][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - 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.bmp' ;the same -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp deleted file mode 100644 index 4e0bba6316..0000000000 Binary files a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp and /dev/null differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp.asm b/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp.asm deleted file mode 100644 index 8a14b1e713..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_blue/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -unused1 dd 0x586786 -unused2 dd 0xFEFEFE -work_3d_dark dd 0xB9B9B9 -work_3d_light dd 0xE3E3E3 -title_text dd 0x55A1C1 -work dd 0xc8c8c8 -work_button dd 0xD8D8D8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0x606374 \ No newline at end of file diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/left.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/left.bmp deleted file mode 100644 index 97efacdebe..0000000000 Binary files a/skins/_old/humanoid_OSX/humanoid_OSX_blue/left.bmp and /dev/null differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/oper.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/oper.bmp deleted file mode 100644 index f845fbd448..0000000000 Binary files a/skins/_old/humanoid_OSX/humanoid_OSX_blue/oper.bmp and /dev/null differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/oper_1.bmp b/skins/_old/humanoid_OSX/humanoid_OSX_blue/oper_1.bmp deleted file mode 100644 index 680e00fc6e..0000000000 Binary files a/skins/_old/humanoid_OSX/humanoid_OSX_blue/oper_1.bmp and /dev/null differ diff --git a/skins/_old/humanoid_OSX/humanoid_OSX_blue/skn_build.bat b/skins/_old/humanoid_OSX/humanoid_OSX_blue/skn_build.bat deleted file mode 100644 index b7fe56b7b7..0000000000 --- a/skins/_old/humanoid_OSX/humanoid_OSX_blue/skn_build.bat +++ /dev/null @@ -1,4 +0,0 @@ -fasm default.dtp.asm default.dtp -fasm default.asm default.skn -kpack default.skn default.skn -pause \ No newline at end of file diff --git a/skins/_old/neutral/neutral_blue/Tupfile.lua b/skins/_old/neutral/neutral_blue/Tupfile.lua deleted file mode 100644 index b0fe0daf1d..0000000000 --- a/skins/_old/neutral/neutral_blue/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_blue.skn") diff --git a/skins/_old/neutral/neutral_blue/base.bmp b/skins/_old/neutral/neutral_blue/base.bmp deleted file mode 100644 index 87ef660f6d..0000000000 Binary files a/skins/_old/neutral/neutral_blue/base.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/base_1.bmp b/skins/_old/neutral/neutral_blue/base_1.bmp deleted file mode 100644 index 12f6b5b796..0000000000 Binary files a/skins/_old/neutral/neutral_blue/base_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/default.asm b/skins/_old/neutral/neutral_blue/default.asm deleted file mode 100644 index 20e8a227db..0000000000 --- a/skins/_old/neutral/neutral_blue/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:41: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_blue/default.dtp b/skins/_old/neutral/neutral_blue/default.dtp deleted file mode 100644 index 0569636639..0000000000 Binary files a/skins/_old/neutral/neutral_blue/default.dtp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/default.dtp.asm b/skins/_old/neutral/neutral_blue/default.dtp.asm deleted file mode 100644 index 1727d96967..0000000000 --- a/skins/_old/neutral/neutral_blue/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 0xE8E8E8 -work_button dd 0xE8E8E8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xAAAAAA \ No newline at end of file diff --git a/skins/_old/neutral/neutral_blue/dtp_build.bat b/skins/_old/neutral/neutral_blue/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/neutral/neutral_blue/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_blue/left.bmp b/skins/_old/neutral/neutral_blue/left.bmp deleted file mode 100644 index ec7e608d30..0000000000 Binary files a/skins/_old/neutral/neutral_blue/left.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/left_1.bmp b/skins/_old/neutral/neutral_blue/left_1.bmp deleted file mode 100644 index 993f261b4c..0000000000 Binary files a/skins/_old/neutral/neutral_blue/left_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/oper.bmp b/skins/_old/neutral/neutral_blue/oper.bmp deleted file mode 100644 index fa2f070439..0000000000 Binary files a/skins/_old/neutral/neutral_blue/oper.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/oper_1.bmp b/skins/_old/neutral/neutral_blue/oper_1.bmp deleted file mode 100644 index ce490e8fe5..0000000000 Binary files a/skins/_old/neutral/neutral_blue/oper_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_blue/pack_build.bat b/skins/_old/neutral/neutral_blue/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/neutral/neutral_blue/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/neutral/neutral_blue/skin.inc b/skins/_old/neutral/neutral_blue/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/neutral/neutral_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/neutral/neutral_blue/skn_build.bat b/skins/_old/neutral/neutral_blue/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/neutral/neutral_blue/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/neutral/neutral_green/Tupfile.lua b/skins/_old/neutral/neutral_green/Tupfile.lua deleted file mode 100644 index 1a1df670d6..0000000000 --- a/skins/_old/neutral/neutral_green/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_green.skn") diff --git a/skins/_old/neutral/neutral_green/base.bmp b/skins/_old/neutral/neutral_green/base.bmp deleted file mode 100644 index 6ab0fbeb02..0000000000 Binary files a/skins/_old/neutral/neutral_green/base.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/base_1.bmp b/skins/_old/neutral/neutral_green/base_1.bmp deleted file mode 100644 index 12f6b5b796..0000000000 Binary files a/skins/_old/neutral/neutral_green/base_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/default.asm b/skins/_old/neutral/neutral_green/default.asm deleted file mode 100644 index 7cebb3b4c3..0000000000 --- a/skins/_old/neutral/neutral_green/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:41:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x6a8a4b],\ ; 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_green/default.dtp b/skins/_old/neutral/neutral_green/default.dtp deleted file mode 100644 index 6d8d8f2d6a..0000000000 Binary files a/skins/_old/neutral/neutral_green/default.dtp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/default.dtp.asm b/skins/_old/neutral/neutral_green/default.dtp.asm deleted file mode 100644 index deb40dd8bf..0000000000 --- a/skins/_old/neutral/neutral_green/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x6a8a4b -grab dd 0xa1ba8a -grab_button dd 0xcecece -grab_button_text dd 0x000000 -grab_text dd 0xffffff -work dd 0xE8E8E8 -work_button dd 0xE8E8E8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xAAAAAA \ No newline at end of file diff --git a/skins/_old/neutral/neutral_green/dtp_build.bat b/skins/_old/neutral/neutral_green/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/neutral/neutral_green/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/neutral/neutral_green/left.bmp b/skins/_old/neutral/neutral_green/left.bmp deleted file mode 100644 index 38d8be7763..0000000000 Binary files a/skins/_old/neutral/neutral_green/left.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/left_1.bmp b/skins/_old/neutral/neutral_green/left_1.bmp deleted file mode 100644 index 993f261b4c..0000000000 Binary files a/skins/_old/neutral/neutral_green/left_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/oper.bmp b/skins/_old/neutral/neutral_green/oper.bmp deleted file mode 100644 index 2cf1b02ad3..0000000000 Binary files a/skins/_old/neutral/neutral_green/oper.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/oper_1.bmp b/skins/_old/neutral/neutral_green/oper_1.bmp deleted file mode 100644 index ce490e8fe5..0000000000 Binary files a/skins/_old/neutral/neutral_green/oper_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_green/pack_build.bat b/skins/_old/neutral/neutral_green/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/neutral/neutral_green/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/neutral/neutral_green/skin.inc b/skins/_old/neutral/neutral_green/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/neutral/neutral_green/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_green/skn_build.bat b/skins/_old/neutral/neutral_green/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/neutral/neutral_green/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/neutral/neutral_lilac/Tupfile.lua b/skins/_old/neutral/neutral_lilac/Tupfile.lua deleted file mode 100644 index fa20640670..0000000000 --- a/skins/_old/neutral/neutral_lilac/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_lilac.skn") diff --git a/skins/_old/neutral/neutral_lilac/base.bmp b/skins/_old/neutral/neutral_lilac/base.bmp deleted file mode 100644 index 751921dea5..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/base.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/base_1.bmp b/skins/_old/neutral/neutral_lilac/base_1.bmp deleted file mode 100644 index 12f6b5b796..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/base_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/default.asm b/skins/_old/neutral/neutral_lilac/default.asm deleted file mode 100644 index 4f9ae135bc..0000000000 --- a/skins/_old/neutral/neutral_lilac/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:41:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x6b4b8a],\ ; 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_lilac/default.dtp b/skins/_old/neutral/neutral_lilac/default.dtp deleted file mode 100644 index 5c81923d1c..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/default.dtp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/default.dtp.asm b/skins/_old/neutral/neutral_lilac/default.dtp.asm deleted file mode 100644 index 958159d938..0000000000 --- a/skins/_old/neutral/neutral_lilac/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x6b4b8a -grab dd 0xa38aba -grab_button dd 0xcecece -grab_button_text dd 0x000000 -grab_text dd 0xffffff -work dd 0xE8E8E8 -work_button dd 0xcecece -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xAAAAAA \ No newline at end of file diff --git a/skins/_old/neutral/neutral_lilac/dtp_build.bat b/skins/_old/neutral/neutral_lilac/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/neutral/neutral_lilac/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_lilac/left.bmp b/skins/_old/neutral/neutral_lilac/left.bmp deleted file mode 100644 index f909f188e7..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/left.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/left_1.bmp b/skins/_old/neutral/neutral_lilac/left_1.bmp deleted file mode 100644 index 993f261b4c..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/left_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/oper.bmp b/skins/_old/neutral/neutral_lilac/oper.bmp deleted file mode 100644 index 50ea254c87..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/oper.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/oper_1.bmp b/skins/_old/neutral/neutral_lilac/oper_1.bmp deleted file mode 100644 index ce490e8fe5..0000000000 Binary files a/skins/_old/neutral/neutral_lilac/oper_1.bmp and /dev/null differ diff --git a/skins/_old/neutral/neutral_lilac/pack_build.bat b/skins/_old/neutral/neutral_lilac/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/neutral/neutral_lilac/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/neutral/neutral_lilac/skin.inc b/skins/_old/neutral/neutral_lilac/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/neutral/neutral_lilac/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_lilac/skn_build.bat b/skins/_old/neutral/neutral_lilac/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/neutral/neutral_lilac/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/neutral/pack_build.bat b/skins/_old/neutral/pack_build.bat deleted file mode 100644 index 993c3d1f29..0000000000 --- a/skins/_old/neutral/pack_build.bat +++ /dev/null @@ -1,4 +0,0 @@ -kpack neutral_blue.skn neutral_blue.skn -kpack neutral_green.skn neutral_green.skn -kpack neutral_lilac.skn neutral_lilac.skn -pause \ No newline at end of file diff --git a/skins/_old/plum/Tupfile.lua b/skins/_old/plum/Tupfile.lua deleted file mode 100644 index bef574fcaa..0000000000 --- a/skins/_old/plum/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"), "plum.skn") diff --git a/skins/_old/plum/base.bmp b/skins/_old/plum/base.bmp deleted file mode 100644 index d3da3f2123..0000000000 Binary files a/skins/_old/plum/base.bmp and /dev/null differ diff --git a/skins/_old/plum/base_1.bmp b/skins/_old/plum/base_1.bmp deleted file mode 100644 index d3da3f2123..0000000000 Binary files a/skins/_old/plum/base_1.bmp and /dev/null differ diff --git a/skins/_old/plum/default.asm b/skins/_old/plum/default.asm deleted file mode 100644 index f63f33ed42..0000000000 --- a/skins/_old/plum/default.asm +++ /dev/null @@ -1,33 +0,0 @@ -;SKIN (.SKN) - COMPILE WITH FASM - -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:53:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xafafaf:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - colors inactive = [binner=0xafafaf:\ ; border inner color - bouter=0x101010:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:6][12:11],\ ; buttons coordinates - minimize = [-41:6][12:11] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/plum/default.dtp b/skins/_old/plum/default.dtp deleted file mode 100644 index 5e92ea445d..0000000000 Binary files a/skins/_old/plum/default.dtp and /dev/null differ diff --git a/skins/_old/plum/default.dtp.asm b/skins/_old/plum/default.dtp.asm deleted file mode 100644 index 73ae28b79d..0000000000 --- a/skins/_old/plum/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xf3f3f3 -grab dd 0x525252 -grab_button dd 0x0166AC -grab_button_text dd 0xffffff -grab_text dd 0xffffff -work dd 0xf3f3f3 -work_button dd 0xf3f3f3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xafafaf \ No newline at end of file diff --git a/skins/_old/plum/dtp_build.bat b/skins/_old/plum/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/plum/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/plum/left.bmp b/skins/_old/plum/left.bmp deleted file mode 100644 index c0c581148a..0000000000 Binary files a/skins/_old/plum/left.bmp and /dev/null differ diff --git a/skins/_old/plum/left_1.bmp b/skins/_old/plum/left_1.bmp deleted file mode 100644 index c0c581148a..0000000000 Binary files a/skins/_old/plum/left_1.bmp and /dev/null differ diff --git a/skins/_old/plum/oper.bmp b/skins/_old/plum/oper.bmp deleted file mode 100644 index 65683c6e46..0000000000 Binary files a/skins/_old/plum/oper.bmp and /dev/null differ diff --git a/skins/_old/plum/oper_1.bmp b/skins/_old/plum/oper_1.bmp deleted file mode 100644 index 5b3f8174ec..0000000000 Binary files a/skins/_old/plum/oper_1.bmp and /dev/null differ diff --git a/skins/_old/plum/pack_build.bat b/skins/_old/plum/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/plum/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/plum/skin.inc b/skins/_old/plum/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/plum/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/plum/skn_build.bat b/skins/_old/plum/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/plum/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 07ba5eb522..add74ce31f 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -44,7 +44,6 @@ skinlist = { "_old/gliteskin/gliteskin_red/gliteskin_red.skn", "_old/gnome_style/gnome_green/gnome_green.skn", "_old/Grey/Grey.skn", -"_old/humanoid_OSX/humanoid_OSX_blue/humanoid_OSX_blue.skn", "_old/humanoid_OSX/Humanoid_OSX_dark_night/Humanoid_OSX_dark_night.skn", "_old/humanoid_OSX/humanoid_OSX_green/humanoid_OSX_green.skn", "_old/humanoid_OSX/humanoid_OSX_col/humanoid_OSX_col.skn", @@ -64,18 +63,12 @@ skinlist = { "_old/mursky/mursky.skn", "_old/MyTango/MyTango.skn", "_old/Nature/Nature.skn", -"_old/neutral/neutral_blue/neutral_blue.skn", -"_old/neutral/neutral_green/neutral_green.skn", -"_old/neutral/neutral_lilac/neutral_lilac.skn", "_old/nix/nix_small/nix_small.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn", -"_old/Organics/Organics.skn", -"_old/plum/plum.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", "_old/Sad_grey/Sad_grey.skn", "_old/SashSkinPack_1_1/Src/Aqua/Aqua.skn", "_old/SashSkinPack_1_1/Src/Cold/Cold.skn", -"_old/SashSkinPack_1_1/Src/Metal/Metal.skn", "_old/sea/sea.skn", "_old/Simple_gray/Simple_gray.skn", "_old/skin_feol/skin_feol.skn", @@ -86,12 +79,10 @@ skinlist = { "_old/StyleVista/vista/StyleVista_vista.skn", "_old/StyleVista/vista_basic/vista_basic.skn", "_old/StyleVista/vista_basic_black/vista_basic_black.skn", -"_old/StyleVista/vista_dark/vista_dark.skn", "_old/StyleXP/orqua/orqua.skn", "_old/StyleXP/panther/panther.skn", "_old/StyleXP/wmpx/wmpx.skn", "_old/subsilv/subsilv.skn", -"_old/Syllable/Syllable.skn", "_old/testtest/testtest.skn", "_old/USSR/USSR.skn", "_old/USSR_2/1.USSR_2/1.USSR_2.skn",