diff --git a/skins/Leency/Blueberries/default.asm b/skins/Leency/Blueberries/default.asm index decb82186c..25ce5d2415 100644 --- a/skins/Leency/Blueberries/default.asm +++ b/skins/Leency/Blueberries/default.asm @@ -9,21 +9,21 @@ SKIN_PARAMS \ colors inactive = [binner=0x626262:\ ; border inner bouter=0x33383A:\ ; border outer bframe=0x626262],\ ; border middle - dtp = 'default.dtp' ; dtp colors + dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ close = [-30:1][26:18],\ ; buttons coordinates minimize = [-57:1][26:18] ; [left:top][width:height] SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers + 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_left1, 'left1.bmp' ; skin bitmaps BITMAP bmp_left2, 'left2.bmp' BITMAP bmp_right1, 'right1.bmp' BITMAP bmp_right2, 'right2.bmp' diff --git a/skins/Leency/Florence/Tupfile.lua b/skins/Leency/Florence/Tupfile.lua new file mode 100644 index 0000000000..28fde69939 --- /dev/null +++ b/skins/Leency/Florence/Tupfile.lua @@ -0,0 +1,3 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("col.dtp.asm", 'fasm "%f" "%o"', "col.dtp") +tup.rule({"florence.asm", extra_inputs = {"col.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Florence.skn") diff --git a/skins/Leency/Florence/build.bat b/skins/Leency/Florence/build.bat new file mode 100644 index 0000000000..eab5abd2e4 --- /dev/null +++ b/skins/Leency/Florence/build.bat @@ -0,0 +1,4 @@ +@fasm col.dtp.asm col.dtp +@fasm florence.asm florence.skn +@del col.dtp +@pause \ No newline at end of file diff --git a/skins/Leency/Florence/ca.bmp b/skins/Leency/Florence/ca.bmp new file mode 100644 index 0000000000..79d8dfed87 Binary files /dev/null and b/skins/Leency/Florence/ca.bmp differ diff --git a/skins/Leency/Florence/ci.bmp b/skins/Leency/Florence/ci.bmp new file mode 100644 index 0000000000..74d06350ce Binary files /dev/null and b/skins/Leency/Florence/ci.bmp differ diff --git a/skins/Leency/Florence/col.dtp.asm b/skins/Leency/Florence/col.dtp.asm new file mode 100644 index 0000000000..270b67a77b --- /dev/null +++ b/skins/Leency/Florence/col.dtp.asm @@ -0,0 +1,14 @@ +struc system_colors + { + .unused1 dd 0xAAAaaa + .unused2 dd 0xFFFfff + .dark dd 0x505050 + .light dd 0x828282 + .window_title dd 0xE3E3E3 + .work dd 0x626262 + .button dd 0x4E4E4E + .button_text dd 0xFFC189 + .work_text dd 0xF5EEee + .graph dd 0x222222 + } +struct system_colors \ No newline at end of file diff --git a/skins/Leency/Florence/florence.asm b/skins/Leency/Florence/florence.asm new file mode 100644 index 0000000000..212c2d4359 --- /dev/null +++ b/skins/Leency/Florence/florence.asm @@ -0,0 +1,34 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; +;; Distributed under terms of the GNU General Public License ;; +;; ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +include '../../skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [5:1:58:1],\ ; margins [left:top:right:bottom] + colors active = [binner=0x626262:bouter=0x131313:bframe=0x131313],\ + colors inactive = [binner=0x626262:bouter=0x131313:bframe=0x2C2C2C],\ + dtp = 'col.dtp' + +SKIN_BUTTONS \ + close = [-29:1][24:18],\ ; buttons coordinates + minimize = [-56:1][22:18] ; [left:top][width:height] + +SKIN_BITMAPS \ + left active = bmp_left,\ + left inactive = bmp_left1,\ + oper active = bmp_oper,\ + oper inactive = bmp_oper1,\ + base active = bmp_base,\ + base inactive = bmp_base1 + +BITMAP bmp_left ,'la.bmp' +BITMAP bmp_oper ,'ra.bmp' +BITMAP bmp_base ,'ca.bmp' +BITMAP bmp_left1,'li.bmp' +BITMAP bmp_oper1,'ri.bmp' +BITMAP bmp_base1,'ci.bmp' diff --git a/skins/Leency/Florence/la.bmp b/skins/Leency/Florence/la.bmp new file mode 100644 index 0000000000..462d0e9587 Binary files /dev/null and b/skins/Leency/Florence/la.bmp differ diff --git a/skins/Leency/Florence/li.bmp b/skins/Leency/Florence/li.bmp new file mode 100644 index 0000000000..94d91bae02 Binary files /dev/null and b/skins/Leency/Florence/li.bmp differ diff --git a/skins/Leency/Florence/ra.bmp b/skins/Leency/Florence/ra.bmp new file mode 100644 index 0000000000..86355fa119 Binary files /dev/null and b/skins/Leency/Florence/ra.bmp differ diff --git a/skins/Leency/Florence/ri.bmp b/skins/Leency/Florence/ri.bmp new file mode 100644 index 0000000000..482408c5e9 Binary files /dev/null and b/skins/Leency/Florence/ri.bmp differ diff --git a/skins/Leency/Shkvorka/right1.bmp b/skins/Leency/Shkvorka/right1_big.bmp similarity index 67% rename from skins/Leency/Shkvorka/right1.bmp rename to skins/Leency/Shkvorka/right1_big.bmp index d6d3346a7c..25ee306c33 100644 Binary files a/skins/Leency/Shkvorka/right1.bmp and b/skins/Leency/Shkvorka/right1_big.bmp differ diff --git a/skins/Leency/Shkvorka/right2.bmp b/skins/Leency/Shkvorka/right2.bmp deleted file mode 100644 index c1dea1b1f2..0000000000 Binary files a/skins/Leency/Shkvorka/right2.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/1.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index 7b2fa6889a..0000000000 --- a/skins/_old/MenuetOS/1.MenuetOS/2/MenuetOS.asm +++ /dev/null @@ -1,36 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x111B27:\ ; border inner color - bouter=0x111B27:\ ; border outer color - bframe=0x23364F],\ ; border frame color - colors inactive = [binner=0x111B27:\ ; border inner color - bouter=0x111B27:\ ; border outer color - bframe=0x5C646C],\ ; border frame color - dtp = 'menuet.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-19:6][12:12],\ ; buttons coordinates - minimize = [-35: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/1.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/1.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 8d201d8830..0000000000 --- a/skins/_old/MenuetOS/1.MenuetOS/2/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"), "1.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/active/base.bmp deleted file mode 100644 index 53d32073fe..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/active/left.bmp deleted file mode 100644 index 6e0422af25..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/active/oper.bmp deleted file mode 100644 index b055478575..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 697725e36b..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index 51b8a1ba71..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/1.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index ba4baea507..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp b/skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp deleted file mode 100644 index 5d9a097609..0000000000 Binary files a/skins/_old/MenuetOS/1.MenuetOS/2/menuet.dtp and /dev/null differ diff --git a/skins/_old/MenuetOS/1.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/1.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/1.MenuetOS/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/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/2.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index fbb1a454b9..0000000000 --- a/skins/_old/MenuetOS/2.MenuetOS/2/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/2/Tupfile.lua b/skins/_old/MenuetOS/2.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 7803fdb00c..0000000000 --- a/skins/_old/MenuetOS/2.MenuetOS/2/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"), "2.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/active/base.bmp deleted file mode 100644 index c815d68d46..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/active/left.bmp deleted file mode 100644 index bc7cd9a3f9..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/active/oper.bmp deleted file mode 100644 index b84553b9f9..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 8a680bc601..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index 37e22c57a0..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index 685ea6c9fe..0000000000 Binary files a/skins/_old/MenuetOS/2.MenuetOS/2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/2.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/2.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/2.MenuetOS/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/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index 51f88e8314..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/2/MenuetOS.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x1D2325:\ ; border inner color - bouter=0x1D2325:\ ; border outer color - bframe=0x3B454A],\ ; border frame color - colors inactive = [binner=0x1D2325:\ ; border inner color - bouter=0x1D2325:\ ; border outer color - bframe=0x65686A],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][15:15],\ ; buttons coordinates - minimize = [-39:3][15:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/3.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 9fc4b1f525..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/2/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"), "3.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/active/base.bmp deleted file mode 100644 index 9b2d8d23c4..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/active/left.bmp deleted file mode 100644 index 9e3904de55..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/active/oper.bmp deleted file mode 100644 index 572ff5f1d4..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 182e36b0d2..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index 07f03b7369..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/3.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index ac8fa1ea4d..0000000000 Binary files a/skins/_old/MenuetOS/3.MenuetOS/2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/3.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/3.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/3.MenuetOS/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/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/4.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index e530ca2240..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/2/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=0x152D41:\ ; border inner color - bouter=0x0B1721:\ ; border outer color - bframe=0x152D41],\ ; border frame color - colors inactive = [binner=0x576067:\ ; border inner color - bouter=0x0B1721:\ ; border outer color - bframe=0x576067],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:6][12:12],\ ; buttons coordinates - minimize = [-36: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/4.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/4.MenuetOS/2/Tupfile.lua deleted file mode 100644 index c3ed68c2ee..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/2/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"), "4.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/active/base.bmp deleted file mode 100644 index f9f550465b..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/active/left.bmp deleted file mode 100644 index 2d92608da4..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/active/oper.bmp deleted file mode 100644 index 6c66991bf2..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 20e634f962..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index c7f6d8aaef..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/4.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index ea70b33b9d..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/4.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/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/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP b/skins/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm b/skins/_old/MenuetOS/5.MenuetOS/2/MenuetOS.asm deleted file mode 100644 index 81f277995d..0000000000 --- a/skins/_old/MenuetOS/5.MenuetOS/2/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=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x162F44],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x576168],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-22:5][15:15],\ ; buttons coordinates - minimize = [-39:5][15:15] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/Tupfile.lua b/skins/_old/MenuetOS/5.MenuetOS/2/Tupfile.lua deleted file mode 100644 index 9a1cae3142..0000000000 --- a/skins/_old/MenuetOS/5.MenuetOS/2/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"), "5.MenuetOS.2.skn") diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/active/base.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/active/base.bmp deleted file mode 100644 index 8a6d900579..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/active/left.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/active/left.bmp deleted file mode 100644 index 2f49fd0707..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/active/oper.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/active/oper.bmp deleted file mode 100644 index 1f13d13c41..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/base.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/inactive/base.bmp deleted file mode 100644 index 4e8958cce5..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/left.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/inactive/left.bmp deleted file mode 100644 index 17bd48b38e..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/oper.bmp b/skins/_old/MenuetOS/5.MenuetOS/2/inactive/oper.bmp deleted file mode 100644 index 5f0c704a50..0000000000 Binary files a/skins/_old/MenuetOS/5.MenuetOS/2/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/5.MenuetOS/2/skin.inc b/skins/_old/MenuetOS/5.MenuetOS/2/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/MenuetOS/5.MenuetOS/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 4dc181f340..5cf6522dcc 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -8,6 +8,7 @@ skinlist = { "ConLenov/Win10/Win10.skn", "Leency/AreaSq/AreaSq.skn", "Leency/Blueberries/Blueberries.skn", +"Leency/Florence/Florence.skn", "Leency/HydrogenOS/HydrogenOS.skn", "Leency/Latte/Latte.skn", "Leency/ObsidianOS/ObsidianOS.skn", @@ -85,15 +86,10 @@ skinlist = { "_old/lightskin/lightskin.skn", "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn", -"_old/MenuetOS/1.MenuetOS/2/1.MenuetOS.2.skn", "_old/MenuetOS/2.MenuetOS/1/2.MenuetOS.1.skn", -"_old/MenuetOS/2.MenuetOS/2/2.MenuetOS.2.skn", "_old/MenuetOS/3.MenuetOS/1/3.MenuetOS.1.skn", -"_old/MenuetOS/3.MenuetOS/2/3.MenuetOS.2.skn", "_old/MenuetOS/4.MenuetOS/1/4.MenuetOS.1.skn", -"_old/MenuetOS/4.MenuetOS/2/4.MenuetOS.2.skn", "_old/MenuetOS/5.MenuetOS/1/5.MenuetOS.1.skn", -"_old/MenuetOS/5.MenuetOS/2/5.MenuetOS.2.skn", "_old/MetalColor/MCBlue/MCBlue.skn", "_old/MetalColor/MCRed/MCRed.skn", "_old/MetalGearArrows/1.MetalGearArrows/1.MetalGearArrows.skn",