diff --git a/skins/_old/Devil_skins/Green_devil/inactive/Thumbs.db b/skins/_old/Devil_skins/Green_devil/inactive/Thumbs.db deleted file mode 100644 index e4dfc591ff..0000000000 Binary files a/skins/_old/Devil_skins/Green_devil/inactive/Thumbs.db and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/DESKTOP b/skins/_old/Nature/Sandwich/src/DESKTOP deleted file mode 100644 index 9ae13e48cc..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/DESKTOP and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/Thumbs.db b/skins/_old/Nature/Sandwich/src/Thumbs.db deleted file mode 100644 index 93e6a39ec5..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/Thumbs.db and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/Tupfile.lua b/skins/_old/Nature/Sandwich/src/Tupfile.lua deleted file mode 100644 index 3a516907de..0000000000 --- a/skins/_old/Nature/Sandwich/src/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"), "src.skn") diff --git a/skins/_old/Nature/Sandwich/src/build.bat b/skins/_old/Nature/Sandwich/src/build.bat deleted file mode 100644 index 250602f7b4..0000000000 --- a/skins/_old/Nature/Sandwich/src/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -..\..\fasm default.asm default.skn -..\..\kpack default.skn -copy default.skn d:\000\kolibri\default.skn -pause \ No newline at end of file diff --git a/skins/_old/Nature/Sandwich/src/center1.bmp b/skins/_old/Nature/Sandwich/src/center1.bmp deleted file mode 100644 index 0bba64b7b6..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/center1.bmp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/center2.bmp b/skins/_old/Nature/Sandwich/src/center2.bmp deleted file mode 100644 index 0bba64b7b6..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/center2.bmp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/default.asm b/skins/_old/Nature/Sandwich/src/default.asm deleted file mode 100644 index 583091eaf5..0000000000 --- a/skins/_old/Nature/Sandwich/src/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_center1.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xE1E1E1:\ ; border inner color - bouter=0x3E3635:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0x3E3635:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-18:4][13:14],\ ; buttons coordinates - minimize = [-36:4][13:14] ; [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, 'left2.bmp' -BITMAP bmp_right1, 'right1.bmp' -BITMAP bmp_right2, 'right2.bmp' -BITMAP bmp_center1,'center1.bmp' -BITMAP bmp_center2,'center2.bmp' diff --git a/skins/_old/Nature/Sandwich/src/default.dtp b/skins/_old/Nature/Sandwich/src/default.dtp deleted file mode 100644 index 9e19447b76..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/default.dtp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/default.dtp.asm b/skins/_old/Nature/Sandwich/src/default.dtp.asm deleted file mode 100644 index a182bb44b3..0000000000 --- a/skins/_old/Nature/Sandwich/src/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors - { - .frame dd 0x000000 - .grab dd 0x006393 - .grab_button dd 0xB1B1B1 - .grab_button_text dd 0x000000 - .grab_text dd 0xFFFFFF - .work dd 0xE8E8E8 - .work_button dd 0xB1B1B1 - .work_button_text dd 0x000000 - .work_text dd 0x000000 - .work_graph dd 0x000000 - } -struct system_colors \ No newline at end of file diff --git a/skins/_old/Nature/Sandwich/src/left1.bmp b/skins/_old/Nature/Sandwich/src/left1.bmp deleted file mode 100644 index 438b841bc2..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/left1.bmp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/left2.bmp b/skins/_old/Nature/Sandwich/src/left2.bmp deleted file mode 100644 index 438b841bc2..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/left2.bmp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/right1.bmp b/skins/_old/Nature/Sandwich/src/right1.bmp deleted file mode 100644 index 294b94c567..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/right1.bmp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/right2.bmp b/skins/_old/Nature/Sandwich/src/right2.bmp deleted file mode 100644 index 996a2a57a4..0000000000 Binary files a/skins/_old/Nature/Sandwich/src/right2.bmp and /dev/null differ diff --git a/skins/_old/Nature/Sandwich/src/skin.inc b/skins/_old/Nature/Sandwich/src/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Nature/Sandwich/src/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 702fea8b97..f6bb4358e4 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -111,7 +111,6 @@ skinlist = { "_old/myskin4/myskin4.skn", "_old/MyTango/MyTango.skn", "_old/Nature/Nature.skn", -"_old/Nature/Sandwich/src/src.skn", "_old/neutral/neutral/neutral.skn", "_old/neutral/neutral_blue/neutral_blue.skn", "_old/neutral/neutral_green/neutral_green.skn",