diff --git a/skins/Leency/Luna/base.bmp b/skins/Leency/Luna/base.bmp index 4b1d05bb4f..1a547df7e6 100644 Binary files a/skins/Leency/Luna/base.bmp and b/skins/Leency/Luna/base.bmp differ diff --git a/skins/Leency/Luna/base_1.bmp b/skins/Leency/Luna/base_1.bmp index 8a0aed0fc6..1a547df7e6 100644 Binary files a/skins/Leency/Luna/base_1.bmp and b/skins/Leency/Luna/base_1.bmp differ diff --git a/skins/Leency/Luna/default.asm b/skins/Leency/Luna/default.asm index ee74898973..448ab4459a 100644 --- a/skins/Leency/Luna/default.asm +++ b/skins/Leency/Luna/default.asm @@ -2,18 +2,18 @@ include '../../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [5:2:43:0],\ ; margins [left:top:right:bottom] - colors active = [binner=0x375181:\ ; border inner color - bouter=0x444430:\ ; border outer color - bframe=0x7794CA],\ ; border frame color - colors inactive = [binner=0x73839D:\ ; border inner color - bouter=0x73736E:\ ; border outer color - bframe=0xA6B2CB],\ ; border frame color + 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 = [-21:4][17:17],\ ; buttons coordinates - minimize = [-41:4][17:17] ; [left:top][width:height] + 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 diff --git a/skins/Leency/Luna/default.dtp.asm b/skins/Leency/Luna/default.dtp.asm index 7d72c04fe2..773cb995dd 100644 --- a/skins/Leency/Luna/default.dtp.asm +++ b/skins/Leency/Luna/default.dtp.asm @@ -1,14 +1,11 @@ -struc system_colors - { - .null1 dd 0x000000 - .null2 dd 0x006393 - .dark dd 0xD1CFC7 - .light dd 0xF2F2F0 - .grab_text dd 0xFFFFFF - .work dd 0xE3E2DD - .button dd 0x7794CA - .button_text dd 0xFFFfff - .work_text dd 0x000000 - .graph dd 0x6380B1 - } -struct system_colors \ No newline at end of file +;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 index 79cbb1a161..a4a12efdf8 100644 Binary files a/skins/Leency/Luna/left.bmp and b/skins/Leency/Luna/left.bmp differ diff --git a/skins/Leency/Luna/left_1.bmp b/skins/Leency/Luna/left_1.bmp index 43a6e763eb..a4a12efdf8 100644 Binary files a/skins/Leency/Luna/left_1.bmp and b/skins/Leency/Luna/left_1.bmp differ diff --git a/skins/Leency/Luna/oper.bmp b/skins/Leency/Luna/oper.bmp index 0fbf33b7eb..69f3f57241 100644 Binary files a/skins/Leency/Luna/oper.bmp and b/skins/Leency/Luna/oper.bmp differ diff --git a/skins/Leency/Luna/oper_1.bmp b/skins/Leency/Luna/oper_1.bmp index 3e889511d1..377e2bcafb 100644 Binary files a/skins/Leency/Luna/oper_1.bmp and b/skins/Leency/Luna/oper_1.bmp differ diff --git a/skins/_old/StyleVista/vista/Tupfile.lua b/skins/_old/StyleVista/vista/Tupfile.lua deleted file mode 100644 index 29f95cb4e6..0000000000 --- a/skins/_old/StyleVista/vista/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"), "StyleVista_vista.skn") diff --git a/skins/_old/StyleVista/vista/base.bmp b/skins/_old/StyleVista/vista/base.bmp deleted file mode 100644 index 6afccc32aa..0000000000 Binary files a/skins/_old/StyleVista/vista/base.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/base_1.bmp b/skins/_old/StyleVista/vista/base_1.bmp deleted file mode 100644 index 6afccc32aa..0000000000 Binary files a/skins/_old/StyleVista/vista/base_1.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/default.asm b/skins/_old/StyleVista/vista/default.asm deleted file mode 100644 index d288e5869b..0000000000 --- a/skins/_old/StyleVista/vista/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/default.dtp b/skins/_old/StyleVista/vista/default.dtp deleted file mode 100644 index 5fc7ee741a..0000000000 Binary files a/skins/_old/StyleVista/vista/default.dtp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/default.dtp.asm b/skins/_old/StyleVista/vista/default.dtp.asm deleted file mode 100644 index 03a4a4f693..0000000000 --- a/skins/_old/StyleVista/vista/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xf3f3f3 -grab dd 0x525252 -grab_button dd 0xb8432c -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/dtp_build.bat b/skins/_old/StyleVista/vista/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/StyleVista/vista/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/left.bmp b/skins/_old/StyleVista/vista/left.bmp deleted file mode 100644 index b43282c433..0000000000 Binary files a/skins/_old/StyleVista/vista/left.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/left_1.bmp b/skins/_old/StyleVista/vista/left_1.bmp deleted file mode 100644 index b43282c433..0000000000 Binary files a/skins/_old/StyleVista/vista/left_1.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/oper.bmp b/skins/_old/StyleVista/vista/oper.bmp deleted file mode 100644 index 6728575a05..0000000000 Binary files a/skins/_old/StyleVista/vista/oper.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/oper_1.bmp b/skins/_old/StyleVista/vista/oper_1.bmp deleted file mode 100644 index 7e3631e3d5..0000000000 Binary files a/skins/_old/StyleVista/vista/oper_1.bmp and /dev/null differ diff --git a/skins/_old/StyleVista/vista/pack_build.bat b/skins/_old/StyleVista/vista/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/StyleVista/vista/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/khrome2/Tupfile.lua b/skins/_old/khrome2/Tupfile.lua deleted file mode 100644 index 2c4df40932..0000000000 --- a/skins/_old/khrome2/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"), "khrome2.skn") diff --git a/skins/_old/khrome2/base.bmp b/skins/_old/khrome2/base.bmp deleted file mode 100644 index f4ac0dd77b..0000000000 Binary files a/skins/_old/khrome2/base.bmp and /dev/null differ diff --git a/skins/_old/khrome2/base_1.bmp b/skins/_old/khrome2/base_1.bmp deleted file mode 100644 index e5bbfb1140..0000000000 Binary files a/skins/_old/khrome2/base_1.bmp and /dev/null differ diff --git a/skins/_old/khrome2/default.asm b/skins/_old/khrome2/default.asm deleted file mode 100644 index 5fc8de4712..0000000000 --- a/skins/_old/khrome2/default.asm +++ /dev/null @@ -1,38 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -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=0x1e6db6],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x1e6db6],\ ; border frame color - dtp = 'myblue.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_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/khrome2/left.bmp b/skins/_old/khrome2/left.bmp deleted file mode 100644 index 7b8c4cee4e..0000000000 Binary files a/skins/_old/khrome2/left.bmp and /dev/null differ diff --git a/skins/_old/khrome2/left_1.bmp b/skins/_old/khrome2/left_1.bmp deleted file mode 100644 index 0918a05019..0000000000 Binary files a/skins/_old/khrome2/left_1.bmp and /dev/null differ diff --git a/skins/_old/khrome2/myblue.dtp b/skins/_old/khrome2/myblue.dtp deleted file mode 100644 index 835f700d80..0000000000 Binary files a/skins/_old/khrome2/myblue.dtp and /dev/null differ diff --git a/skins/_old/khrome2/oper.bmp b/skins/_old/khrome2/oper.bmp deleted file mode 100644 index 80f45ccb4a..0000000000 Binary files a/skins/_old/khrome2/oper.bmp and /dev/null differ diff --git a/skins/_old/khrome2/oper_1.bmp b/skins/_old/khrome2/oper_1.bmp deleted file mode 100644 index 6c02ea632d..0000000000 Binary files a/skins/_old/khrome2/oper_1.bmp and /dev/null differ diff --git a/skins/_old/khrome2/skin.inc b/skins/_old/khrome2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/khrome2/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/nix/nix_small/Tupfile.lua b/skins/_old/nix/Tupfile.lua similarity index 80% rename from skins/_old/nix/nix_small/Tupfile.lua rename to skins/_old/nix/Tupfile.lua index 2df37debb4..12322e716d 100644 --- a/skins/_old/nix/nix_small/Tupfile.lua +++ b/skins/_old/nix/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("nix_small.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "nix_small.skn") +tup.rule("nix_small.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "nix.skn") diff --git a/skins/_old/nix/active/base.bmp b/skins/_old/nix/active/base.bmp new file mode 100644 index 0000000000..babd758683 Binary files /dev/null and b/skins/_old/nix/active/base.bmp differ diff --git a/skins/_old/nix/active/left.bmp b/skins/_old/nix/active/left.bmp new file mode 100644 index 0000000000..7172f26d87 Binary files /dev/null and b/skins/_old/nix/active/left.bmp differ diff --git a/skins/_old/nix/active/oper.bmp b/skins/_old/nix/active/oper.bmp new file mode 100644 index 0000000000..875a4429e3 Binary files /dev/null and b/skins/_old/nix/active/oper.bmp differ diff --git a/skins/_old/nix/build.bat b/skins/_old/nix/build.bat new file mode 100644 index 0000000000..3c9db9bf0b --- /dev/null +++ b/skins/_old/nix/build.bat @@ -0,0 +1 @@ +fasm nix_small.asm default.skn \ No newline at end of file diff --git a/skins/_old/nix/inactive/base.bmp b/skins/_old/nix/inactive/base.bmp new file mode 100644 index 0000000000..17db553b60 Binary files /dev/null and b/skins/_old/nix/inactive/base.bmp differ diff --git a/skins/_old/nix/inactive/left.bmp b/skins/_old/nix/inactive/left.bmp new file mode 100644 index 0000000000..50659fd0aa Binary files /dev/null and b/skins/_old/nix/inactive/left.bmp differ diff --git a/skins/_old/nix/inactive/oper.bmp b/skins/_old/nix/inactive/oper.bmp new file mode 100644 index 0000000000..a0c57bd7fb Binary files /dev/null and b/skins/_old/nix/inactive/oper.bmp differ diff --git a/skins/_old/nix/nix_small/nix_small.asm b/skins/_old/nix/nix_small.asm similarity index 81% rename from skins/_old/nix/nix_small/nix_small.asm rename to skins/_old/nix/nix_small.asm index ff6ce41364..603e57d713 100644 --- a/skins/_old/nix/nix_small/nix_small.asm +++ b/skins/_old/nix/nix_small.asm @@ -2,7 +2,7 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [5:1:18:3],\ ; margins [left:top:right:bottom] + margins = [5:4:36:4],\ ; margins [left:top:right:bottom] colors active = [binner=0x363C46:\ ; border inner color bouter=0x363C46:\ ; border outer color bframe=0x363C46],\ ; border frame color @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'nix_small.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-15:5][9:9],\ ; buttons coordinates - minimize = [-25:5][9:9] ; [left:top][width:height] + close = [-20:4][16:16],\ ; buttons coordinates + minimize = [-36:4][16:16] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers diff --git a/skins/_old/nix/nix_small/nix_small.dtp b/skins/_old/nix/nix_small.dtp similarity index 100% rename from skins/_old/nix/nix_small/nix_small.dtp rename to skins/_old/nix/nix_small.dtp diff --git a/skins/_old/nix/nix_small/active/base.bmp b/skins/_old/nix/nix_small/active/base.bmp deleted file mode 100644 index 0d8ff0e100..0000000000 Binary files a/skins/_old/nix/nix_small/active/base.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_small/active/left.bmp b/skins/_old/nix/nix_small/active/left.bmp deleted file mode 100644 index 6f4ae53a4d..0000000000 Binary files a/skins/_old/nix/nix_small/active/left.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_small/active/oper.bmp b/skins/_old/nix/nix_small/active/oper.bmp deleted file mode 100644 index 87fc86192b..0000000000 Binary files a/skins/_old/nix/nix_small/active/oper.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_small/inactive/base.bmp b/skins/_old/nix/nix_small/inactive/base.bmp deleted file mode 100644 index 040da31ae2..0000000000 Binary files a/skins/_old/nix/nix_small/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_small/inactive/left.bmp b/skins/_old/nix/nix_small/inactive/left.bmp deleted file mode 100644 index 444b1c16c5..0000000000 Binary files a/skins/_old/nix/nix_small/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_small/inactive/oper.bmp b/skins/_old/nix/nix_small/inactive/oper.bmp deleted file mode 100644 index 3918a68346..0000000000 Binary files a/skins/_old/nix/nix_small/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_small/nix_small.bin b/skins/_old/nix/nix_small/nix_small.bin deleted file mode 100644 index 6ec44f0bca..0000000000 Binary files a/skins/_old/nix/nix_small/nix_small.bin and /dev/null differ diff --git a/skins/_old/nix/nix_small/skin.inc b/skins/_old/nix/nix_small/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/nix/nix_small/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/skin.inc b/skins/_old/nix/skin.inc similarity index 100% rename from skins/_old/StyleVista/vista/skin.inc rename to skins/_old/nix/skin.inc diff --git a/skins/_old/subsilv/Mistificator1.DTP b/skins/_old/subsilv/Mistificator1.DTP index dc65da9713..b5cbc95ebc 100644 Binary files a/skins/_old/subsilv/Mistificator1.DTP and b/skins/_old/subsilv/Mistificator1.DTP differ diff --git a/skins/_old/subsilv/active/base.bmp b/skins/_old/subsilv/active/base.bmp index 51e6a43ac9..fb98fd3bc3 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 6c3c567f49..64cfecbdc2 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 e4e5297def..6ae7b96210 100644 Binary files a/skins/_old/subsilv/active/oper.bmp and b/skins/_old/subsilv/active/oper.bmp differ diff --git a/skins/_old/StyleVista/vista/skn_build.bat b/skins/_old/subsilv/build.bat similarity index 100% rename from skins/_old/StyleVista/vista/skn_build.bat rename to skins/_old/subsilv/build.bat diff --git a/skins/_old/subsilv/default.asm b/skins/_old/subsilv/default.asm index 0026aaea5c..6c19f21f8b 100644 --- a/skins/_old/subsilv/default.asm +++ b/skins/_old/subsilv/default.asm @@ -3,17 +3,17 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height margins = [8:1:53:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x006A9D:\ ; border inner color - bouter=0x006A9D:\ ; border outer color + colors active = [binner=0x335669:\ ; border inner color + bouter=0x335669:\ ; border outer color bframe=0xB0BAC4],\ ; border frame color - colors inactive = [binner=0x006A9D:\ ; border inner color - bouter=0x006A9D:\ ; border outer color + colors inactive = [binner=0x335669:\ ; border inner color + bouter=0x335669:\ ; border outer color bframe=0xE0E4E9],\ ; border frame color dtp = 'Mistificator1.DTP' ; dtp colors SKIN_BUTTONS \ - close = [-23:4][19:18],\ ; buttons coordinates - minimize = [-45:4][19:18] ; [left:top][width:height] + close = [-22:4][18:17],\ ; buttons coordinates + minimize = [-44:4][18:17] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers diff --git a/skins/_old/subsilv/inactive/base.bmp b/skins/_old/subsilv/inactive/base.bmp index 5e4fbd7a65..9ce8fea154 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 5f702cf6e2..3c3e0fc7d9 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 a4b64f5710..82a8a254cf 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 ca2a52ee73..16033e118c 100644 --- a/skins/authors.txt +++ b/skins/authors.txt @@ -6,10 +6,7 @@ Black_lace Rock_maniak_forever blackskin Aqwas Blacky maxcodehack Blended Aqwas -Brick Rock_maniak_forever -BrownLustre Rock_maniak_forever cherry Aqwas -Circles Rock_maniak_forever CodeOpusC mike.dld Crystal Aqwas Cyclops Rock_maniak_forever @@ -19,8 +16,6 @@ dark_night Aqwas Devil_Skins Rock_maniak_forever Eyes Rock_maniak_forever falloutskn G@K -Fever Rock_maniak_forever -Flowers Rock_maniak_forever Flyght Rock_maniak_forever glass Aqwas Glass_Lite Rock_maniak_forever @@ -43,10 +38,6 @@ MetalGearArrows Rock_maniak_forever mist Aqwas mursky dunkaist, Mario mygrey trolly -myskin1 trolly -myskin2 trolly -myskin3 trolly -myskin4 trolly MyTango Veliant Nature Rock_maniak_forever neutral Aqwas @@ -54,13 +45,9 @@ night Aqwas nix Sorcerer Nova_skins Rock_maniak_forever OpusOs_Blue Veliant -Orange_aureole Rock_maniak_forever -Orange_Silence Rock_maniak_forever Organics Rock_maniak_forever plum Aqwas -Rednex Rock_maniak_forever RoboTech Rock_maniak_forever -Russia Mario79 Sad_grey Aqwas SashSkinPack_1_1 Sash sea Aqwas @@ -77,10 +64,9 @@ testtest dunkaist tinynjoy Sorcerer USSR Rock_maniak_forever USSR_2 Rock_maniak_forever -Victory_1945 Rock_maniak_forever Vista nillsoft WIN311 Veliant winflat mistif(ator WindowsXP Rock_maniak_forever WinXP_Standart Mario79 -zRiver Rock_maniak_forever + diff --git a/skins/skinlist.lua b/skins/skinlist.lua index b3f8298cf4..f5e312d4ff 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -45,7 +45,6 @@ skinlist = { "_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", -"_old/khrome2/khrome2.skn", "_old/lightskin/lightskin.skn", "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn", @@ -56,7 +55,7 @@ skinlist = { "_old/MetalColor/MCRed/MCRed.skn", "_old/mist/mist.skn", "_old/mist_color/mist_color.skn", -"_old/nix/nix_small/nix_small.skn", +"_old/nix/nix.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", "_old/Sad_grey/Sad_grey.skn", @@ -66,7 +65,6 @@ skinlist = { "_old/skin_ser/skin_ser.skn", "_old/skin_vhl/skin_vhl.skn", "_old/sshock/sshock.skn", -"_old/StyleVista/vista/StyleVista_vista.skn", "_old/StyleVista/vista_basic/vista_basic.skn", "_old/StyleVista/vista_basic_black/vista_basic_black.skn", "_old/StyleXP/orqua/orqua.skn",