diff --git a/skins/_old/MetalGearArrows/1.MetalGearArrows.DTP b/skins/_old/MetalGearArrows/1.MetalGearArrows.DTP deleted file mode 100644 index 74b285012c..0000000000 Binary files a/skins/_old/MetalGearArrows/1.MetalGearArrows.DTP and /dev/null differ diff --git a/skins/_old/MetalGearArrows/1.MetalGearArrows.asm b/skins/_old/MetalGearArrows/1.MetalGearArrows.asm deleted file mode 100644 index 130d82e4e3..0000000000 --- a/skins/_old/MetalGearArrows/1.MetalGearArrows.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x696969:\ ; border inner color - bouter=0x696969:\ ; border outer color - bframe=0x808080],\ ; border frame color - colors inactive = [binner=0x707070:\ ; border inner color - bouter=0x707070:\ ; border outer color - bframe=0x808080],\ ; border frame color - dtp = '1.MetalGearArrows.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:5][16:16],\ ; buttons coordinates - minimize = [-47:5][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 ,'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/MetalGearArrows/MetalGearArrows.png b/skins/_old/MetalGearArrows/MetalGearArrows.png deleted file mode 100644 index fdaa8c2ce7..0000000000 Binary files a/skins/_old/MetalGearArrows/MetalGearArrows.png and /dev/null differ diff --git a/skins/_old/MetalGearArrows/Tupfile.lua b/skins/_old/MetalGearArrows/Tupfile.lua deleted file mode 100644 index cb824ff6be..0000000000 --- a/skins/_old/MetalGearArrows/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("1.MetalGearArrows.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MetalGearArrows.skn") diff --git a/skins/_old/MetalGearArrows/active/base.bmp b/skins/_old/MetalGearArrows/active/base.bmp deleted file mode 100644 index abc3428898..0000000000 Binary files a/skins/_old/MetalGearArrows/active/base.bmp and /dev/null differ diff --git a/skins/_old/MetalGearArrows/active/left.bmp b/skins/_old/MetalGearArrows/active/left.bmp deleted file mode 100644 index 6c83a8170d..0000000000 Binary files a/skins/_old/MetalGearArrows/active/left.bmp and /dev/null differ diff --git a/skins/_old/MetalGearArrows/active/oper.bmp b/skins/_old/MetalGearArrows/active/oper.bmp deleted file mode 100644 index f40da90cb0..0000000000 Binary files a/skins/_old/MetalGearArrows/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MetalGearArrows/inactive/base.bmp b/skins/_old/MetalGearArrows/inactive/base.bmp deleted file mode 100644 index b797446d3e..0000000000 Binary files a/skins/_old/MetalGearArrows/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MetalGearArrows/inactive/left.bmp b/skins/_old/MetalGearArrows/inactive/left.bmp deleted file mode 100644 index d620a5213f..0000000000 Binary files a/skins/_old/MetalGearArrows/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MetalGearArrows/inactive/oper.bmp b/skins/_old/MetalGearArrows/inactive/oper.bmp deleted file mode 100644 index 5d442952f7..0000000000 Binary files a/skins/_old/MetalGearArrows/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MetalGearArrows/skin.inc b/skins/_old/MetalGearArrows/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MetalGearArrows/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/RoboTech/GRoboTech/GRoboTech.DTP b/skins/_old/RoboTech/GRoboTech/GRoboTech.DTP deleted file mode 100644 index ea56f16b31..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/GRoboTech.DTP and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/GRoboTech.asm b/skins/_old/RoboTech/GRoboTech/GRoboTech.asm deleted file mode 100644 index 8c8f305032..0000000000 --- a/skins/_old/RoboTech/GRoboTech/GRoboTech.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x4E4E4E:\ ; border inner color - bouter=0x4E4E4E:\ ; border outer color - bframe=0x6A6A6A],\ ; border frame color - colors inactive = [binner=0x575757:\ ; border inner color - bouter=0x575757:\ ; border outer color - bframe=0x6E6E6E],\ ; border frame color - dtp = 'GRoboTech.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:4][16:15],\ ; buttons coordinates - minimize = [-46:4][16:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/RoboTech/GRoboTech/Tupfile.lua b/skins/_old/RoboTech/GRoboTech/Tupfile.lua deleted file mode 100644 index 0387fed7d4..0000000000 --- a/skins/_old/RoboTech/GRoboTech/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("GRoboTech.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "GRoboTech.skn") diff --git a/skins/_old/RoboTech/GRoboTech/active/base.bmp b/skins/_old/RoboTech/GRoboTech/active/base.bmp deleted file mode 100644 index f455927e14..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/active/base.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/active/left.bmp b/skins/_old/RoboTech/GRoboTech/active/left.bmp deleted file mode 100644 index 04c81b02ba..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/active/left.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/active/oper.bmp b/skins/_old/RoboTech/GRoboTech/active/oper.bmp deleted file mode 100644 index cebf81b339..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/active/oper.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/inactive/base.bmp b/skins/_old/RoboTech/GRoboTech/inactive/base.bmp deleted file mode 100644 index e62ae6548a..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/inactive/left.bmp b/skins/_old/RoboTech/GRoboTech/inactive/left.bmp deleted file mode 100644 index 36683b7b43..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/inactive/oper.bmp b/skins/_old/RoboTech/GRoboTech/inactive/oper.bmp deleted file mode 100644 index 9fd9eaa2a7..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/screenshot.png b/skins/_old/RoboTech/GRoboTech/screenshot.png deleted file mode 100644 index 88dd50bca4..0000000000 Binary files a/skins/_old/RoboTech/GRoboTech/screenshot.png and /dev/null differ diff --git a/skins/_old/RoboTech/GRoboTech/skin.inc b/skins/_old/RoboTech/GRoboTech/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/RoboTech/GRoboTech/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/USSR_2/2.USSR_2/2.USSR_2.asm b/skins/_old/USSR_2/2.USSR_2/2.USSR_2.asm deleted file mode 100644 index 23012c159b..0000000000 --- a/skins/_old/USSR_2/2.USSR_2/2.USSR_2.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=0x6F0000:\ ; border inner color - bouter=0x6F0000:\ ; border outer color - bframe=0x880000],\ ; border frame color - colors inactive = [binner=0x6F0000:\ ; border inner color - bouter=0x6F0000:\ ; border outer color - bframe=0x885050],\ ; border frame color - dtp = 'RED.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-26:3][17:17],\ ; buttons coordinates - minimize = [-46:3][17: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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; \ No newline at end of file diff --git a/skins/_old/USSR_2/2.USSR_2/RED.DTP b/skins/_old/USSR_2/2.USSR_2/RED.DTP deleted file mode 100644 index 09d81075d7..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/RED.DTP and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/Tupfile.lua b/skins/_old/USSR_2/2.USSR_2/Tupfile.lua deleted file mode 100644 index 9f1b3adc4c..0000000000 --- a/skins/_old/USSR_2/2.USSR_2/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("2.USSR_2.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.USSR_2.skn") diff --git a/skins/_old/USSR_2/2.USSR_2/active/base.bmp b/skins/_old/USSR_2/2.USSR_2/active/base.bmp deleted file mode 100644 index e367cd5c95..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/active/base.bmp and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/active/left.bmp b/skins/_old/USSR_2/2.USSR_2/active/left.bmp deleted file mode 100644 index 9e3b09fa98..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/active/left.bmp and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/active/oper.bmp b/skins/_old/USSR_2/2.USSR_2/active/oper.bmp deleted file mode 100644 index fbbec20629..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/inactive/base.bmp b/skins/_old/USSR_2/2.USSR_2/inactive/base.bmp deleted file mode 100644 index 28684d373d..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/inactive/left.bmp b/skins/_old/USSR_2/2.USSR_2/inactive/left.bmp deleted file mode 100644 index 7545a45d76..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/inactive/oper.bmp b/skins/_old/USSR_2/2.USSR_2/inactive/oper.bmp deleted file mode 100644 index 6e6b09b984..0000000000 Binary files a/skins/_old/USSR_2/2.USSR_2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/USSR_2/2.USSR_2/skin.inc b/skins/_old/USSR_2/2.USSR_2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/USSR_2/2.USSR_2/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/skinlist.lua b/skins/skinlist.lua index 1ad12c7152..6229d593b7 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -76,7 +76,6 @@ skinlist = { "_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn", "_old/MetalColor/MCBlue/MCBlue.skn", "_old/MetalColor/MCRed/MCRed.skn", -"_old/MetalGearArrows/MetalGearArrows.skn", "_old/mist/mist.skn", "_old/mist_color/mist_color.skn", "_old/mursky/mursky.skn", @@ -97,7 +96,6 @@ skinlist = { "_old/Organics/Organics.skn", "_old/plum/plum.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", -"_old/RoboTech/GRoboTech/GRoboTech.skn", "_old/Russia/Russia.skn", "_old/Sad_grey/Sad_grey.skn", "_old/SashSkinPack_1_1/Src/Aqua/Aqua.skn", @@ -122,7 +120,6 @@ skinlist = { "_old/testtest/testtest.skn", "_old/USSR/USSR.skn", "_old/USSR_2/1.USSR_2/1.USSR_2.skn", -"_old/USSR_2/2.USSR_2/2.USSR_2.skn", "_old/Victory_1945/Victory_1945.skn", "_old/vista/vista.skn", "_old/WIN311/WIN311.skn",