diff --git a/skins/Leency/Latte/Tupfile.lua b/skins/Leency/Latte/Tupfile.lua deleted file mode 100644 index cd78e842d4..0000000000 --- a/skins/Leency/Latte/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"), "Latte.skn") diff --git a/skins/Leency/Latte/build.bat b/skins/Leency/Latte/build.bat deleted file mode 100644 index de828567de..0000000000 --- a/skins/Leency/Latte/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -delete default.skn -fasm default.dtp.asm default.dtp -fasm default.asm default.skn -@pause \ No newline at end of file diff --git a/skins/Leency/Latte/center1.bmp b/skins/Leency/Latte/center1.bmp deleted file mode 100644 index 4f5cb9ff5a..0000000000 Binary files a/skins/Leency/Latte/center1.bmp and /dev/null differ diff --git a/skins/Leency/Latte/default.asm b/skins/Leency/Latte/default.asm deleted file mode 100644 index 1a2fae8197..0000000000 --- a/skins/Leency/Latte/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '../../skin.inc' - -SKIN_PARAMS \ - height = bmp_center1.height,\ ; skin height - margins = [5:2:40:0],\ ; margins [left:top:right:bottom] - colors active = [binner=0xCACACA:\ ; border inner color - bouter=0xA1A1A1:\ ; border outer color - bframe=0xCACACA],\ ; border frame color - colors inactive = [binner=0xCACACA:\ ; border inner color - bouter=0xA1A1A1:\ ; border outer color - bframe=0xCACACA],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-19:3][16:16],\ ; buttons coordinates - minimize = [-37:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers - left inactive = bmp_left2,\ - oper active = bmp_right1,\ - oper inactive = bmp_right2,\ - base active = bmp_center1,\ - base inactive = bmp_center2 - -BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps -BITMAP bmp_left2, 'left1.bmp' -BITMAP bmp_right1, 'right1.bmp' -BITMAP bmp_right2, 'right2.bmp' -BITMAP bmp_center1,'center1.bmp' -BITMAP bmp_center2,'center1.bmp' diff --git a/skins/Leency/Latte/default.dtp b/skins/Leency/Latte/default.dtp deleted file mode 100644 index 71136ab52d..0000000000 Binary files a/skins/Leency/Latte/default.dtp and /dev/null differ diff --git a/skins/Leency/Latte/default.dtp.asm b/skins/Leency/Latte/default.dtp.asm deleted file mode 100644 index 1f1e483451..0000000000 --- a/skins/Leency/Latte/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors -{ -.frame dd 0x006393 -.grab dd 0x0077b0 -.work_dark dd 0xA5A5A5 -.work_light dd 0xE4E4E4 -.title_text dd 0x444444 -.work dd 0xCACACA -.work_button dd 0xE9E9E9 -.work_button_text dd 0x000000 -.work_text dd 0x000000 -.work_graph dd 0x777777 -} -struct system_colors \ No newline at end of file diff --git a/skins/Leency/Latte/left1.bmp b/skins/Leency/Latte/left1.bmp deleted file mode 100644 index 02e4a56f0f..0000000000 Binary files a/skins/Leency/Latte/left1.bmp and /dev/null differ diff --git a/skins/Leency/Latte/right1.bmp b/skins/Leency/Latte/right1.bmp deleted file mode 100644 index 6e0344b03e..0000000000 Binary files a/skins/Leency/Latte/right1.bmp and /dev/null differ diff --git a/skins/Leency/Latte/right2.bmp b/skins/Leency/Latte/right2.bmp deleted file mode 100644 index 0b30becd89..0000000000 Binary files a/skins/Leency/Latte/right2.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.png b/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.png deleted file mode 100644 index 2c6d725825..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.png and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple_Alpha.asm b/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple_Alpha.asm deleted file mode 100644 index ed8da30207..0000000000 --- a/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple_Alpha.asm +++ /dev/null @@ -1,34 +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=0x00081d:\ ; border outer color - bframe=0x617598],\ ; border frame color - dtp = '1.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' - - - diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple_Alpha.dtp b/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple_Alpha.dtp deleted file mode 100644 index b65e9a2e26..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/1.5imple_Alpha.dtp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/Tupfile.lua b/skins/_old/5imple Alpha/1.5imple Alpha/Tupfile.lua deleted file mode 100644 index ad47d4d59c..0000000000 --- a/skins/_old/5imple Alpha/1.5imple Alpha/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("1.5imple_Alpha.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "1.5imple Alpha.skn") diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/active/base.bmp b/skins/_old/5imple Alpha/1.5imple Alpha/active/base.bmp deleted file mode 100644 index 475d43f828..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/active/base.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/active/left.bmp b/skins/_old/5imple Alpha/1.5imple Alpha/active/left.bmp deleted file mode 100644 index d39fa4f5ba..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/active/left.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/active/oper.bmp b/skins/_old/5imple Alpha/1.5imple Alpha/active/oper.bmp deleted file mode 100644 index f9c9abbe1c..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/active/oper.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/inactive/base.bmp b/skins/_old/5imple Alpha/1.5imple Alpha/inactive/base.bmp deleted file mode 100644 index ed46023cd3..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/inactive/left.bmp b/skins/_old/5imple Alpha/1.5imple Alpha/inactive/left.bmp deleted file mode 100644 index 8aba9c67d4..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/inactive/oper.bmp b/skins/_old/5imple Alpha/1.5imple Alpha/inactive/oper.bmp deleted file mode 100644 index e0c9a52893..0000000000 Binary files a/skins/_old/5imple Alpha/1.5imple Alpha/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/5imple Alpha/1.5imple Alpha/skin.inc b/skins/_old/5imple Alpha/1.5imple Alpha/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/5imple Alpha/1.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/MenuetOS/2.MenuetOS/GRAY.DTP b/skins/_old/MenuetOS/2.MenuetOS/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/MenuetOS.asm b/skins/_old/MenuetOS/2.MenuetOS/MenuetOS.asm deleted file mode 100644 index 4208686888..0000000000 --- a/skins/_old/MenuetOS/2.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=0x314C58:\ ; border inner color - bouter=0x011C28:\ ; border outer color - bframe=0x314C58],\ ; border frame color - colors inactive = [binner=0x6C7174:\ ; border inner color - bouter=0x011C28:\ ; border outer color - bframe=0x6C7174],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-18:6][12:12],\ ; buttons coordinates - minimize = [-34: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 ,'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/2.MenuetOS/Tupfile.lua b/skins/_old/MenuetOS/2.MenuetOS/Tupfile.lua deleted file mode 100644 index d8a7d699b6..0000000000 --- a/skins/_old/MenuetOS/2.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 2.skn") diff --git a/skins/_old/MenuetOS/2.MenuetOS/active/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/active/base.bmp deleted file mode 100644 index c815d68d46..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/active/left.bmp b/skins/_old/MenuetOS/2.MenuetOS/active/left.bmp deleted file mode 100644 index 74fcedfd08..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/active/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/active/oper.bmp deleted file mode 100644 index 26734d8049..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/inactive/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/inactive/base.bmp deleted file mode 100644 index 70ef410157..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/inactive/left.bmp b/skins/_old/MenuetOS/2.MenuetOS/inactive/left.bmp deleted file mode 100644 index 4f96750b1f..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/inactive/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/inactive/oper.bmp deleted file mode 100644 index e2b3c1855b..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/Tupfile.lua b/skins/_old/gnome_style/gnome_blue/Tupfile.lua deleted file mode 100644 index b1ddb8b97f..0000000000 --- a/skins/_old/gnome_style/gnome_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"), "gnome_blue.skn") diff --git a/skins/_old/gnome_style/gnome_blue/base.bmp b/skins/_old/gnome_style/gnome_blue/base.bmp deleted file mode 100644 index 6ed18444f1..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/base.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/base_1.bmp b/skins/_old/gnome_style/gnome_blue/base_1.bmp deleted file mode 100644 index d13f616dd3..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/base_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/default.asm b/skins/_old/gnome_style/gnome_blue/default.asm deleted file mode 100644 index dac81d2c21..0000000000 --- a/skins/_old/gnome_style/gnome_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:60:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x334C62:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0x4489CA],\ ; border frame color - colors inactive = [binner=0x827A6C:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0xE3E0D8],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:3][24:16],\ ; buttons coordinates - minimize = [-55:3][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/_old/gnome_style/gnome_blue/default.dtp b/skins/_old/gnome_style/gnome_blue/default.dtp deleted file mode 100644 index ab27f060d3..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/default.dtp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/default.dtp.asm b/skins/_old/gnome_style/gnome_blue/default.dtp.asm deleted file mode 100644 index 88f9f9fc93..0000000000 --- a/skins/_old/gnome_style/gnome_blue/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x4489CA -grab dd 0x83BAEE -grab_button dd 0x3B6A97 -grab_button_text dd 0xFFFFFF -grab_text dd 0xFFFFFF -work dd 0xEBE9E3 -work_button dd 0xEBE9E3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xCCC6BB \ No newline at end of file diff --git a/skins/_old/gnome_style/gnome_blue/dtp_build.bat b/skins/_old/gnome_style/gnome_blue/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gnome_style/gnome_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/gnome_style/gnome_blue/left.bmp b/skins/_old/gnome_style/gnome_blue/left.bmp deleted file mode 100644 index d68146b71e..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/left.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/left_1.bmp b/skins/_old/gnome_style/gnome_blue/left_1.bmp deleted file mode 100644 index 355827c388..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/left_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/oper.bmp b/skins/_old/gnome_style/gnome_blue/oper.bmp deleted file mode 100644 index a8a4429e41..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/oper.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/oper_1.bmp b/skins/_old/gnome_style/gnome_blue/oper_1.bmp deleted file mode 100644 index 8c76ed998f..0000000000 Binary files a/skins/_old/gnome_style/gnome_blue/oper_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_blue/pack_build.bat b/skins/_old/gnome_style/gnome_blue/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gnome_style/gnome_blue/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gnome_style/gnome_blue/skin.inc b/skins/_old/gnome_style/gnome_blue/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/gnome_style/gnome_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/gnome_style/gnome_blue/skn_build.bat b/skins/_old/gnome_style/gnome_blue/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gnome_style/gnome_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/gnome_style/gnome_ocean/Tupfile.lua b/skins/_old/gnome_style/gnome_ocean/Tupfile.lua deleted file mode 100644 index 580e4fb558..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/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"), "gnome_ocean.skn") diff --git a/skins/_old/gnome_style/gnome_ocean/base.bmp b/skins/_old/gnome_style/gnome_ocean/base.bmp deleted file mode 100644 index 742b5c7856..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/base.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/base_1.bmp b/skins/_old/gnome_style/gnome_ocean/base_1.bmp deleted file mode 100644 index de901bf388..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/base_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/default.asm b/skins/_old/gnome_style/gnome_ocean/default.asm deleted file mode 100644 index 534ff67c93..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/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:60:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x18191B:\ ; border inner color - bouter=0x18191B:\ ; border outer color - bframe=0x465E73],\ ; border frame color - colors inactive = [binner=0x3E3C39:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0xE3E0D8],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:3][24:16],\ ; buttons coordinates - minimize = [-55:3][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/_old/gnome_style/gnome_ocean/default.dtp b/skins/_old/gnome_style/gnome_ocean/default.dtp deleted file mode 100644 index 3205c5fcb8..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/default.dtp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/default.dtp.asm b/skins/_old/gnome_style/gnome_ocean/default.dtp.asm deleted file mode 100644 index 4c462c7213..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x465E73 -grab dd 0x527B9E -grab_button dd 0x3A4956 -grab_button_text dd 0xFFFFFF -grab_text dd 0xFFFFFF -work dd 0xEBE9E3 -work_button dd 0xEBE9E3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0x9E9A91 \ No newline at end of file diff --git a/skins/_old/gnome_style/gnome_ocean/dtp_build.bat b/skins/_old/gnome_style/gnome_ocean/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/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/gnome_style/gnome_ocean/left.bmp b/skins/_old/gnome_style/gnome_ocean/left.bmp deleted file mode 100644 index a49f83c6ce..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/left.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/left_1.bmp b/skins/_old/gnome_style/gnome_ocean/left_1.bmp deleted file mode 100644 index 40f553dd12..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/left_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/oper.bmp b/skins/_old/gnome_style/gnome_ocean/oper.bmp deleted file mode 100644 index 77359d59c6..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/oper.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/oper_1.bmp b/skins/_old/gnome_style/gnome_ocean/oper_1.bmp deleted file mode 100644 index 26d976460f..0000000000 Binary files a/skins/_old/gnome_style/gnome_ocean/oper_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_ocean/pack_build.bat b/skins/_old/gnome_style/gnome_ocean/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gnome_style/gnome_ocean/skin.inc b/skins/_old/gnome_style/gnome_ocean/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/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/gnome_style/gnome_ocean/skn_build.bat b/skins/_old/gnome_style/gnome_ocean/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gnome_style/gnome_ocean/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/gnome_style/gnome_olive/Tupfile.lua b/skins/_old/gnome_style/gnome_olive/Tupfile.lua deleted file mode 100644 index 909a99164e..0000000000 --- a/skins/_old/gnome_style/gnome_olive/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"), "gnome_olive.skn") diff --git a/skins/_old/gnome_style/gnome_olive/base.bmp b/skins/_old/gnome_style/gnome_olive/base.bmp deleted file mode 100644 index aee1c13979..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/base.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/base_1.bmp b/skins/_old/gnome_style/gnome_olive/base_1.bmp deleted file mode 100644 index 19f3566421..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/base_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/default.asm b/skins/_old/gnome_style/gnome_olive/default.asm deleted file mode 100644 index 9a8fca18f8..0000000000 --- a/skins/_old/gnome_style/gnome_olive/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:60:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x5A6649:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0xA3BA80],\ ; border frame color - colors inactive = [binner=0x827A6C:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0xE1DDC4],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:3][24:16],\ ; buttons coordinates - minimize = [-55:3][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/_old/gnome_style/gnome_olive/default.dtp b/skins/_old/gnome_style/gnome_olive/default.dtp deleted file mode 100644 index 896bb1a178..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/default.dtp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/default.dtp.asm b/skins/_old/gnome_style/gnome_olive/default.dtp.asm deleted file mode 100644 index 98fbc1182b..0000000000 --- a/skins/_old/gnome_style/gnome_olive/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xA3BA80 -grab dd 0xD0DFB9 -grab_button dd 0x80965E -grab_button_text dd 0xFFFFFF -grab_text dd 0xFFFFFF -work dd 0xECE9D8 -work_button dd 0xECE9D8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xCDC7A6 diff --git a/skins/_old/gnome_style/gnome_olive/dtp_build.bat b/skins/_old/gnome_style/gnome_olive/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gnome_style/gnome_olive/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/gnome_style/gnome_olive/left.bmp b/skins/_old/gnome_style/gnome_olive/left.bmp deleted file mode 100644 index e5e1b924c5..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/left.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/left_1.bmp b/skins/_old/gnome_style/gnome_olive/left_1.bmp deleted file mode 100644 index 672702ef1e..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/left_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/oper.bmp b/skins/_old/gnome_style/gnome_olive/oper.bmp deleted file mode 100644 index fefb34b955..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/oper.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/oper_1.bmp b/skins/_old/gnome_style/gnome_olive/oper_1.bmp deleted file mode 100644 index 4e0da91940..0000000000 Binary files a/skins/_old/gnome_style/gnome_olive/oper_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_olive/pack_build.bat b/skins/_old/gnome_style/gnome_olive/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gnome_style/gnome_olive/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gnome_style/gnome_olive/skin.inc b/skins/_old/gnome_style/gnome_olive/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/gnome_style/gnome_olive/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/gnome_style/gnome_olive/skn_build.bat b/skins/_old/gnome_style/gnome_olive/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gnome_style/gnome_olive/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/gnome_style/gnome_orange/Tupfile.lua b/skins/_old/gnome_style/gnome_orange/Tupfile.lua deleted file mode 100644 index 6cb16ebf01..0000000000 --- a/skins/_old/gnome_style/gnome_orange/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"), "gnome_orange.skn") diff --git a/skins/_old/gnome_style/gnome_orange/base.bmp b/skins/_old/gnome_style/gnome_orange/base.bmp deleted file mode 100644 index 65be45a490..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/base.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/base_1.bmp b/skins/_old/gnome_style/gnome_orange/base_1.bmp deleted file mode 100644 index d13f616dd3..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/base_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/default.asm b/skins/_old/gnome_style/gnome_orange/default.asm deleted file mode 100644 index e5497d86ab..0000000000 --- a/skins/_old/gnome_style/gnome_orange/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:60:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x644931:\ ; border inner color - bouter=0x393b3e:\ ; border outer color - bframe=0xd0843d],\ ; border frame color - colors inactive = [binner=0x827A6C:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0xE3E0D8],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:3][24:16],\ ; buttons coordinates - minimize = [-55:3][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/_old/gnome_style/gnome_orange/default.dtp b/skins/_old/gnome_style/gnome_orange/default.dtp deleted file mode 100644 index 7cd35923d8..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/default.dtp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/default.dtp.asm b/skins/_old/gnome_style/gnome_orange/default.dtp.asm deleted file mode 100644 index b195c0519d..0000000000 --- a/skins/_old/gnome_style/gnome_orange/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xd0843d -grab dd 0xf3b77e -grab_button dd 0x976332 -grab_button_text dd 0xFFFFFF -grab_text dd 0xFFFFFF -work dd 0xEBE9E3 -work_button dd 0xEBE9E3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xCCC6BB \ No newline at end of file diff --git a/skins/_old/gnome_style/gnome_orange/dtp_build.bat b/skins/_old/gnome_style/gnome_orange/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gnome_style/gnome_orange/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/gnome_style/gnome_orange/left.bmp b/skins/_old/gnome_style/gnome_orange/left.bmp deleted file mode 100644 index 8e84d358e0..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/left.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/left_1.bmp b/skins/_old/gnome_style/gnome_orange/left_1.bmp deleted file mode 100644 index 355827c388..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/left_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/oper.bmp b/skins/_old/gnome_style/gnome_orange/oper.bmp deleted file mode 100644 index 161841099c..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/oper.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/oper_1.bmp b/skins/_old/gnome_style/gnome_orange/oper_1.bmp deleted file mode 100644 index 8c76ed998f..0000000000 Binary files a/skins/_old/gnome_style/gnome_orange/oper_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_orange/pack_build.bat b/skins/_old/gnome_style/gnome_orange/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gnome_style/gnome_orange/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gnome_style/gnome_orange/skin.inc b/skins/_old/gnome_style/gnome_orange/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/gnome_style/gnome_orange/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/gnome_style/gnome_orange/skn_build.bat b/skins/_old/gnome_style/gnome_orange/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gnome_style/gnome_orange/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/gnome_style/gnome_red/Tupfile.lua b/skins/_old/gnome_style/gnome_red/Tupfile.lua deleted file mode 100644 index de3f475a8b..0000000000 --- a/skins/_old/gnome_style/gnome_red/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"), "gnome_red.skn") diff --git a/skins/_old/gnome_style/gnome_red/base.bmp b/skins/_old/gnome_style/gnome_red/base.bmp deleted file mode 100644 index c9d3c0c038..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/base.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/base_1.bmp b/skins/_old/gnome_style/gnome_red/base_1.bmp deleted file mode 100644 index d959c5a7dd..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/base_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/default.asm b/skins/_old/gnome_style/gnome_red/default.asm deleted file mode 100644 index e9ed7a2608..0000000000 --- a/skins/_old/gnome_style/gnome_red/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:60:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x492929:\ ; border inner color - bouter=0x201818:\ ; border outer color - bframe=0x9B3333],\ ; border frame color - colors inactive = [binner=0x827A6C:\ ; border inner color - bouter=0x3E3C39:\ ; border outer color - bframe=0xD7D0D0],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:3][24:16],\ ; buttons coordinates - minimize = [-55:3][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/_old/gnome_style/gnome_red/default.dtp b/skins/_old/gnome_style/gnome_red/default.dtp deleted file mode 100644 index b29c6ea502..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/default.dtp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/default.dtp.asm b/skins/_old/gnome_style/gnome_red/default.dtp.asm deleted file mode 100644 index c8e1a53506..0000000000 --- a/skins/_old/gnome_style/gnome_red/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x9B3333 -grab dd 0xD94040 -grab_button dd 0x723131 -grab_button_text dd 0xFFFFFF -grab_text dd 0xFFFFFF -work dd 0xE6E1E1 -work_button dd 0xE6E1E1 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xA59999 \ No newline at end of file diff --git a/skins/_old/gnome_style/gnome_red/dtp_build.bat b/skins/_old/gnome_style/gnome_red/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gnome_style/gnome_red/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/gnome_style/gnome_red/left.bmp b/skins/_old/gnome_style/gnome_red/left.bmp deleted file mode 100644 index 3416c83b68..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/left.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/left_1.bmp b/skins/_old/gnome_style/gnome_red/left_1.bmp deleted file mode 100644 index e3829c49b3..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/left_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/oper.bmp b/skins/_old/gnome_style/gnome_red/oper.bmp deleted file mode 100644 index b4aae67a2a..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/oper.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/oper_1.bmp b/skins/_old/gnome_style/gnome_red/oper_1.bmp deleted file mode 100644 index 1926089c3f..0000000000 Binary files a/skins/_old/gnome_style/gnome_red/oper_1.bmp and /dev/null differ diff --git a/skins/_old/gnome_style/gnome_red/pack_build.bat b/skins/_old/gnome_style/gnome_red/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gnome_style/gnome_red/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gnome_style/gnome_red/skin.inc b/skins/_old/gnome_style/gnome_red/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/gnome_style/gnome_red/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/gnome_style/gnome_red/skn_build.bat b/skins/_old/gnome_style/gnome_red/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gnome_style/gnome_red/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/gnome_style/pack_build.bat b/skins/_old/gnome_style/pack_build.bat deleted file mode 100644 index 87ad08c535..0000000000 --- a/skins/_old/gnome_style/pack_build.bat +++ /dev/null @@ -1,10 +0,0 @@ -kpack gliteskin_deepsky.skn gliteskin_deepsky.skn -kpack gliteskin_glider.skn gliteskin_glider.skn -kpack gliteskin_red.skn gliteskin_red.skn -kpack gnome_blue.skn gnome_blue.skn -kpack gnome_green.skn gnome_green.skn -kpack gnome_ocean.skn gnome_ocean.skn -kpack gnome_olive.skn gnome_olive.skn -kpack gnome_red.skn gnome_red.skn -kpack gnome_orange.skn gnome_orange.skn -pause \ No newline at end of file diff --git a/skins/_old/macos_l/default.dtp b/skins/_old/macos_l/default.dtp index c98066e798..25bbc217a2 100644 Binary files a/skins/_old/macos_l/default.dtp and b/skins/_old/macos_l/default.dtp differ diff --git a/skins/_old/macos_l/default.dtp.asm b/skins/_old/macos_l/default.dtp.asm index 1783f1dd3e..f36c17b5d8 100644 --- a/skins/_old/macos_l/default.dtp.asm +++ b/skins/_old/macos_l/default.dtp.asm @@ -1,11 +1,11 @@ ;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0xCACACA -grab dd 0xE8E8E8 -grab_button dd 0xCCCCCC -grab_button_text dd 0x000000 +unused1 dd 0xCACACA +unused2 dd 0xE8E8E8 +grab_button dd 0xC8C8C8 +grab_button_text dd 0xF8F8F8 grab_text dd 0x000000 work dd 0xE8E8E8 -work_button dd 0xE8E8E8 +work_button dd 0xF8F8F8 work_button_text dd 0x000000 work_text dd 0x000000 -work_graph dd 0xAAAAAA \ No newline at end of file +work_graph dd 0x7C7C7C \ No newline at end of file diff --git a/skins/_old/macos_l/pack_build.bat b/skins/_old/macos_l/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/macos_l/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 50248bae05..2e861fbfc5 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -12,7 +12,6 @@ skinlist = { "Leency/AreaSq/AreaSq.skn", "Leency/Florence/Florence.skn", "Leency/HydrogenOS/HydrogenOS.skn", -"Leency/Latte/Latte.skn", "Leency/Luna/Luna.skn", "Leency/ObsidianOS/ObsidianOS.skn", "Leency/Octo_flat/Octo_flat.skn", @@ -22,7 +21,6 @@ skinlist = { "maxcodehack/blacky/Blacky.skn", "loggy/loggy.skn", "night/night.skn", -"_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn", "_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn", "_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.skn", "_old/black-glass/black-glass/black-glass.skn", @@ -61,7 +59,6 @@ skinlist = { "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn", "_old/MenuetOS/1.MenuetOS/MenuetOS 1.skn", -"_old/MenuetOS/2.MenuetOS/MenuetOS 2.skn", "_old/MenuetOS/3.MenuetOS/MenuetOS 3.skn", "_old/MenuetOS/4.MenuetOS/MenuetOS 4.skn", "_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn",