diff --git a/skins/Leency/Luna/Tupfile.lua b/skins/Leency/Luna/Tupfile.lua deleted file mode 100644 index 76374b740f..0000000000 --- a/skins/Leency/Luna/Tupfile.lua +++ /dev/null @@ -1,3 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"default.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Luna.skn") diff --git a/skins/Leency/Luna/base.bmp b/skins/Leency/Luna/base.bmp deleted file mode 100644 index 1a547df7e6..0000000000 Binary files a/skins/Leency/Luna/base.bmp and /dev/null differ diff --git a/skins/Leency/Luna/base_1.bmp b/skins/Leency/Luna/base_1.bmp deleted file mode 100644 index 1a547df7e6..0000000000 Binary files a/skins/Leency/Luna/base_1.bmp and /dev/null differ diff --git a/skins/Leency/Luna/build.bat b/skins/Leency/Luna/build.bat deleted file mode 100644 index 6c4ab5e7f8..0000000000 --- a/skins/Leency/Luna/build.bat +++ /dev/null @@ -1,5 +0,0 @@ -fasm default.dtp.asm default.dtp -fasm default.asm default.skn -kpack default.skn -del default.dtp -pause \ No newline at end of file diff --git a/skins/Leency/Luna/default.asm b/skins/Leency/Luna/default.asm deleted file mode 100644 index 448ab4459a..0000000000 --- a/skins/Leency/Luna/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '../../skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:2:54:0],\ ; margins [left:top:right:bottom] - colors active = [binner=0x3E4E68:\ ; border inner color - bouter=0x3E4E68:\ ; border outer color - bframe=0xDFE3ED],\ ; border frame color - colors inactive = [binner=0x3E4E68:\ ; border inner color - bouter=0x3E4E68:\ ; border outer color - bframe=0xDFE3ED],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:1][24:16],\ ; buttons coordinates - minimize = [-54:1][24: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_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/Leency/Luna/default.dtp.asm b/skins/Leency/Luna/default.dtp.asm deleted file mode 100644 index 773cb995dd..0000000000 --- a/skins/Leency/Luna/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xCACACA -grab dd 0xE8E8E8 -grab_button dd 0xCCCCCC -grab_button_text dd 0xF7F5F5 -grab_text dd 0x000000 -work dd 0xE8E8E8 -work_button dd 0xD5CFD8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xAAAAAA \ No newline at end of file diff --git a/skins/Leency/Luna/left.bmp b/skins/Leency/Luna/left.bmp deleted file mode 100644 index a4a12efdf8..0000000000 Binary files a/skins/Leency/Luna/left.bmp and /dev/null differ diff --git a/skins/Leency/Luna/left_1.bmp b/skins/Leency/Luna/left_1.bmp deleted file mode 100644 index a4a12efdf8..0000000000 Binary files a/skins/Leency/Luna/left_1.bmp and /dev/null differ diff --git a/skins/Leency/Luna/oper.bmp b/skins/Leency/Luna/oper.bmp deleted file mode 100644 index 69f3f57241..0000000000 Binary files a/skins/Leency/Luna/oper.bmp and /dev/null differ diff --git a/skins/Leency/Luna/oper_1.bmp b/skins/Leency/Luna/oper_1.bmp deleted file mode 100644 index 377e2bcafb..0000000000 Binary files a/skins/Leency/Luna/oper_1.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/2.5imple Alpha/Tupfile.lua b/skins/_old/5imple Alpha/2.5imple Alpha/Tupfile.lua index e71b149c04..0e63966a3b 100644 --- a/skins/_old/5imple Alpha/2.5imple Alpha/Tupfile.lua +++ b/skins/_old/5imple Alpha/2.5imple Alpha/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("2.5imple_Alpha.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.5imple Alpha.skn") +tup.rule("2.5imple_Alpha.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Simple Alpha.skn") diff --git a/skins/_old/5imple Alpha/2.5imple Alpha/inactive/left.bmp b/skins/_old/5imple Alpha/2.5imple Alpha/inactive/left.bmp index 8aba9c67d4..3395080d04 100644 Binary files a/skins/_old/5imple Alpha/2.5imple Alpha/inactive/left.bmp and b/skins/_old/5imple Alpha/2.5imple Alpha/inactive/left.bmp differ diff --git a/skins/_old/5imple Alpha/2.5imple Alpha/inactive/oper.bmp b/skins/_old/5imple Alpha/2.5imple Alpha/inactive/oper.bmp index d7eef39d14..47921468ac 100644 Binary files a/skins/_old/5imple Alpha/2.5imple Alpha/inactive/oper.bmp and b/skins/_old/5imple Alpha/2.5imple Alpha/inactive/oper.bmp differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.png b/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.png deleted file mode 100644 index c7bef32f33..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.png and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.asm b/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.asm deleted file mode 100644 index 16194b5b40..0000000000 --- a/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.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=0x4F70A5],\ ; border frame color - colors inactive = [binner=0x323232:\ ; border inner color - bouter=0x323232:\ ; border outer color - bframe=0x617598],\ ; border frame color - dtp = '3.5imple_Alpha.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-27:0][23:16],\ ; buttons coordinates - minimize = [-50:0][23:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; - diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.dtp b/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.dtp deleted file mode 100644 index b65e9a2e26..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.dtp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/Tupfile.lua b/skins/_old/5imple Alpha/3.5imple Alpha/Tupfile.lua deleted file mode 100644 index b5e0927750..0000000000 --- a/skins/_old/5imple Alpha/3.5imple Alpha/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("3.5imple_Alpha.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "3.5imple Alpha.skn") diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/active/base.bmp b/skins/_old/5imple Alpha/3.5imple Alpha/active/base.bmp deleted file mode 100644 index 475d43f828..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/active/base.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/active/left.bmp b/skins/_old/5imple Alpha/3.5imple Alpha/active/left.bmp deleted file mode 100644 index d39fa4f5ba..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/active/left.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/active/oper.bmp b/skins/_old/5imple Alpha/3.5imple Alpha/active/oper.bmp deleted file mode 100644 index bbc29c1151..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/active/oper.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/inactive/base.bmp b/skins/_old/5imple Alpha/3.5imple Alpha/inactive/base.bmp deleted file mode 100644 index ed46023cd3..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/inactive/left.bmp b/skins/_old/5imple Alpha/3.5imple Alpha/inactive/left.bmp deleted file mode 100644 index 3395080d04..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/inactive/oper.bmp b/skins/_old/5imple Alpha/3.5imple Alpha/inactive/oper.bmp deleted file mode 100644 index 47921468ac..0000000000 Binary files a/skins/_old/5imple Alpha/3.5imple Alpha/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/3.5imple Alpha/skin.inc b/skins/_old/5imple Alpha/3.5imple Alpha/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/5imple Alpha/3.5imple Alpha/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/5imple Alpha/5imple_alpha.png b/skins/_old/5imple Alpha/5imple_alpha.png deleted file mode 100644 index c1ddf1bed8..0000000000 Binary files a/skins/_old/5imple Alpha/5imple_alpha.png and /dev/null differ diff --git a/skins/_old/Blended/Tupfile.lua b/skins/_old/Blended/Tupfile.lua deleted file mode 100644 index 2d9c9dd1b9..0000000000 --- a/skins/_old/Blended/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"), "Blended.skn") diff --git a/skins/_old/Blended/base.bmp b/skins/_old/Blended/base.bmp deleted file mode 100644 index 44d4a1275b..0000000000 Binary files a/skins/_old/Blended/base.bmp and /dev/null differ diff --git a/skins/_old/Blended/base_1.bmp b/skins/_old/Blended/base_1.bmp deleted file mode 100644 index 44d4a1275b..0000000000 Binary files a/skins/_old/Blended/base_1.bmp and /dev/null differ diff --git a/skins/_old/Blended/default.asm b/skins/_old/Blended/default.asm deleted file mode 100644 index b424755cfa..0000000000 --- a/skins/_old/Blended/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:54:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xC7CACC:\ ; border inner color - bouter=0xA3A6AA:\ ; border outer color - bframe=0xF5F5F5],\ ; border frame color - colors inactive = [binner=0xC7CACC:\ ; border inner color - bouter=0xA3A6AA:\ ; border outer color - bframe=0xF5F5F5],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:3][25:17],\ ; buttons coordinates - minimize = [-55:3][25:17] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'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/Blended/default.dtp b/skins/_old/Blended/default.dtp deleted file mode 100644 index 6bf5c33d4c..0000000000 Binary files a/skins/_old/Blended/default.dtp and /dev/null differ diff --git a/skins/_old/Blended/default.dtp.asm b/skins/_old/Blended/default.dtp.asm deleted file mode 100644 index 118e93dbeb..0000000000 --- a/skins/_old/Blended/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xF5F5F5 -grab dd 0xF1F1F2 -grab_button dd 0x969A9E -grab_button_text dd 0x4F4F50 -grab_text dd 0x515151 -work dd 0xECEDEE -work_button dd 0xECEDEE -work_button_text dd 0x474747 -work_text dd 0x474747 -work_graph dd 0xC7CACC diff --git a/skins/_old/Blended/dtp_build.bat b/skins/_old/Blended/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/Blended/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/Blended/left.bmp b/skins/_old/Blended/left.bmp deleted file mode 100644 index 31dd492fc5..0000000000 Binary files a/skins/_old/Blended/left.bmp and /dev/null differ diff --git a/skins/_old/Blended/left_1.bmp b/skins/_old/Blended/left_1.bmp deleted file mode 100644 index 31dd492fc5..0000000000 Binary files a/skins/_old/Blended/left_1.bmp and /dev/null differ diff --git a/skins/_old/Blended/oper.bmp b/skins/_old/Blended/oper.bmp deleted file mode 100644 index cb1e3b0823..0000000000 Binary files a/skins/_old/Blended/oper.bmp and /dev/null differ diff --git a/skins/_old/Blended/oper_1.bmp b/skins/_old/Blended/oper_1.bmp deleted file mode 100644 index 8827522ccf..0000000000 Binary files a/skins/_old/Blended/oper_1.bmp and /dev/null differ diff --git a/skins/_old/Blended/pack_build.bat b/skins/_old/Blended/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/Blended/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/Blended/skin.inc b/skins/_old/Blended/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Blended/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/Blended/skn_build.bat b/skins/_old/Blended/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/Blended/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/MenuetOS/3.MenuetOS/GRAY.DTP b/skins/_old/MenuetOS/3.MenuetOS/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/MenuetOS.asm b/skins/_old/MenuetOS/3.MenuetOS/MenuetOS.asm deleted file mode 100644 index e3f086c8a6..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/MenuetOS.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=0x1D2325:\ ; border inner color - bouter=0x1D2325:\ ; border outer color - bframe=0x3B454A],\ ; border frame color - colors inactive = [binner=0x1D2325:\ ; border inner color - bouter=0x1D2325:\ ; border outer color - bframe=0x65686A],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][15:15],\ ; buttons coordinates - minimize = [-39: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 ,'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/MenuetOS/3.MenuetOS/Tupfile.lua b/skins/_old/MenuetOS/3.MenuetOS/Tupfile.lua deleted file mode 100644 index 24bdb2169e..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 3.skn") diff --git a/skins/_old/MenuetOS/3.MenuetOS/active/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/active/base.bmp deleted file mode 100644 index 9b2d8d23c4..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/active/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/active/left.bmp deleted file mode 100644 index 9de64cfde7..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/active/oper.bmp b/skins/_old/MenuetOS/3.MenuetOS/active/oper.bmp deleted file mode 100644 index 4453adca31..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/inactive/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/inactive/base.bmp deleted file mode 100644 index 182e36b0d2..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/inactive/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/inactive/left.bmp deleted file mode 100644 index c54b5a6076..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/inactive/oper.bmp b/skins/_old/MenuetOS/3.MenuetOS/inactive/oper.bmp deleted file mode 100644 index a0c5602fac..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/skin.inc b/skins/_old/MenuetOS/3.MenuetOS/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/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/mist/default.dtp b/skins/_old/mist/default.dtp index 3a0275341d..03f4249360 100644 Binary files a/skins/_old/mist/default.dtp and b/skins/_old/mist/default.dtp differ diff --git a/skins/_old/mist/default.dtp.asm b/skins/_old/mist/default.dtp.asm index 6e7e334170..203d027b62 100644 --- a/skins/_old/mist/default.dtp.asm +++ b/skins/_old/mist/default.dtp.asm @@ -1,11 +1,11 @@ ;SYSTEM COLORS (.DTP) - COMPILE WITH FASM frame dd 0xf4f4f4 -grab dd 0xf4f4f4 -grab_button dd 0xebebeb +grab dd 0xFFFfff +grab_button dd 0xb1b1b1 grab_button_text dd 0x606060 grab_text dd 0x606060 work dd 0xf4f4f4 work_button dd 0xebebeb work_button_text dd 0x606060 work_text dd 0x606060 -work_graph dd 0xb1b1b1 \ No newline at end of file +work_graph dd 0xBBBbbb \ No newline at end of file diff --git a/skins/_old/mist_color/Tupfile.lua b/skins/_old/mist_color/Tupfile.lua deleted file mode 100644 index 8bba8a1047..0000000000 --- a/skins/_old/mist_color/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"), "mist_color.skn") diff --git a/skins/_old/mist_color/base.bmp b/skins/_old/mist_color/base.bmp deleted file mode 100644 index 187c10033f..0000000000 Binary files a/skins/_old/mist_color/base.bmp and /dev/null differ diff --git a/skins/_old/mist_color/base_1.bmp b/skins/_old/mist_color/base_1.bmp deleted file mode 100644 index 187c10033f..0000000000 Binary files a/skins/_old/mist_color/base_1.bmp and /dev/null differ diff --git a/skins/_old/mist_color/default.asm b/skins/_old/mist_color/default.asm deleted file mode 100644 index d7d9e568c6..0000000000 --- a/skins/_old/mist_color/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:66:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xb1b1b1:\ ; border inner color - bouter=0xb1b1b1:\ ; border outer color - bframe=0xf4f4f4],\ ; border frame color - colors inactive = [binner=0xb1b1b1:\ ; border inner color - bouter=0xb1b1b1:\ ; border outer color - bframe=0xf4f4f4],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-19:6][12:12],\ ; buttons coordinates - minimize = [-38:6][12:12] ; [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/mist_color/default.dtp b/skins/_old/mist_color/default.dtp deleted file mode 100644 index 3a0275341d..0000000000 Binary files a/skins/_old/mist_color/default.dtp and /dev/null differ diff --git a/skins/_old/mist_color/default.dtp.asm b/skins/_old/mist_color/default.dtp.asm deleted file mode 100644 index 6e7e334170..0000000000 --- a/skins/_old/mist_color/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xf4f4f4 -grab dd 0xf4f4f4 -grab_button dd 0xebebeb -grab_button_text dd 0x606060 -grab_text dd 0x606060 -work dd 0xf4f4f4 -work_button dd 0xebebeb -work_button_text dd 0x606060 -work_text dd 0x606060 -work_graph dd 0xb1b1b1 \ No newline at end of file diff --git a/skins/_old/mist_color/dtp_build.bat b/skins/_old/mist_color/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/mist_color/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/mist_color/left.bmp b/skins/_old/mist_color/left.bmp deleted file mode 100644 index 08580c4aec..0000000000 Binary files a/skins/_old/mist_color/left.bmp and /dev/null differ diff --git a/skins/_old/mist_color/left_1.bmp b/skins/_old/mist_color/left_1.bmp deleted file mode 100644 index 08580c4aec..0000000000 Binary files a/skins/_old/mist_color/left_1.bmp and /dev/null differ diff --git a/skins/_old/mist_color/oper.bmp b/skins/_old/mist_color/oper.bmp deleted file mode 100644 index f77ff3b7e5..0000000000 Binary files a/skins/_old/mist_color/oper.bmp and /dev/null differ diff --git a/skins/_old/mist_color/oper_1.bmp b/skins/_old/mist_color/oper_1.bmp deleted file mode 100644 index 06fddfacbb..0000000000 Binary files a/skins/_old/mist_color/oper_1.bmp and /dev/null differ diff --git a/skins/_old/mist_color/pack_build.bat b/skins/_old/mist_color/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/mist_color/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/mist_color/skin.inc b/skins/_old/mist_color/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/mist_color/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/mist_color/skn_build.bat b/skins/_old/mist_color/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/mist_color/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/skin_feol/colors.dtp b/skins/_old/skin_feol/colors.dtp index 7f799d2754..8be68e7ee9 100644 Binary files a/skins/_old/skin_feol/colors.dtp and b/skins/_old/skin_feol/colors.dtp differ diff --git a/skins/_old/subsilv/active/base.bmp b/skins/_old/subsilv/active/base.bmp index fb98fd3bc3..b3a405ee7b 100644 Binary files a/skins/_old/subsilv/active/base.bmp and b/skins/_old/subsilv/active/base.bmp differ diff --git a/skins/_old/subsilv/active/left.bmp b/skins/_old/subsilv/active/left.bmp index 64cfecbdc2..f3756363bc 100644 Binary files a/skins/_old/subsilv/active/left.bmp and b/skins/_old/subsilv/active/left.bmp differ diff --git a/skins/_old/subsilv/active/oper.bmp b/skins/_old/subsilv/active/oper.bmp index 6ae7b96210..3fc063eb1f 100644 Binary files a/skins/_old/subsilv/active/oper.bmp and b/skins/_old/subsilv/active/oper.bmp differ diff --git a/skins/_old/subsilv/inactive/base.bmp b/skins/_old/subsilv/inactive/base.bmp index 9ce8fea154..004fedcd8d 100644 Binary files a/skins/_old/subsilv/inactive/base.bmp and b/skins/_old/subsilv/inactive/base.bmp differ diff --git a/skins/_old/subsilv/inactive/left.bmp b/skins/_old/subsilv/inactive/left.bmp index 3c3e0fc7d9..096d3942ae 100644 Binary files a/skins/_old/subsilv/inactive/left.bmp and b/skins/_old/subsilv/inactive/left.bmp differ diff --git a/skins/_old/subsilv/inactive/oper.bmp b/skins/_old/subsilv/inactive/oper.bmp index 82a8a254cf..e91904bcb8 100644 Binary files a/skins/_old/subsilv/inactive/oper.bmp and b/skins/_old/subsilv/inactive/oper.bmp differ diff --git a/skins/authors.txt b/skins/authors.txt index 16033e118c..50b060b592 100644 --- a/skins/authors.txt +++ b/skins/authors.txt @@ -5,7 +5,6 @@ black-glass ChE Black_lace Rock_maniak_forever blackskin Aqwas Blacky maxcodehack -Blended Aqwas cherry Aqwas CodeOpusC mike.dld Crystal Aqwas diff --git a/skins/skinlist.lua b/skins/skinlist.lua index f5e312d4ff..2324a5d2f4 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -14,7 +14,6 @@ skinlist = { "Leency/AreaSq/AreaSq.skn", "Leency/Florence/Florence.skn", "Leency/HydrogenOS/HydrogenOS.skn", -"Leency/Luna/Luna.skn", "Leency/Oasis/Oasis.skn", "Leency/ObsidianOS/ObsidianOS.skn", "Leency/Octo_flat/Octo_flat.skn", @@ -24,7 +23,7 @@ skinlist = { "maxcodehack/blacky/Blacky.skn", "loggy/loggy.skn", "night/night.skn", -"_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn", +"_old/5imple Alpha/2.5imple Alpha/Simple Alpha.skn", "_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.skn", "_old/black-glass/black-glass/black-glass.skn", "_old/black-glass/black-glass_light/black-glass_light.skn", @@ -49,12 +48,10 @@ skinlist = { "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn", "_old/MenuetOS/1.MenuetOS/MenuetOS 1.skn", -"_old/MenuetOS/3.MenuetOS/MenuetOS 3.skn", "_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn", "_old/MetalColor/MCBlue/MCBlue.skn", "_old/MetalColor/MCRed/MCRed.skn", "_old/mist/mist.skn", -"_old/mist_color/mist_color.skn", "_old/nix/nix.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn",