diff --git a/skins/Leency/AreaO/scr.png b/skins/Leency/AreaO/scr.png deleted file mode 100644 index 2ffdec6b49..0000000000 Binary files a/skins/Leency/AreaO/scr.png and /dev/null differ diff --git a/skins/Leency/Area[]/scr.png b/skins/Leency/Area[]/scr.png deleted file mode 100644 index fdb2508500..0000000000 Binary files a/skins/Leency/Area[]/scr.png and /dev/null differ diff --git a/skins/Leency/L-Junior/build.bat b/skins/Leency/L-Junior/build.bat index 250602f7b4..2f6751da01 100644 --- a/skins/Leency/L-Junior/build.bat +++ b/skins/Leency/L-Junior/build.bat @@ -1,4 +1,3 @@ -..\..\fasm default.asm default.skn -..\..\kpack default.skn -copy default.skn d:\000\kolibri\default.skn +..\fasm default.asm default.skn +..\kpack default.skn pause \ No newline at end of file diff --git a/skins/Leency/Luna/base.bmp b/skins/Leency/Luna/base.bmp new file mode 100644 index 0000000000..15bcaf30f1 Binary files /dev/null and b/skins/Leency/Luna/base.bmp differ diff --git a/skins/Leency/Luna/base_1.bmp b/skins/Leency/Luna/base_1.bmp new file mode 100644 index 0000000000..1f3eb1ecf0 Binary files /dev/null and b/skins/Leency/Luna/base_1.bmp differ diff --git a/skins/Leency/Luna/build.bat b/skins/Leency/Luna/build.bat new file mode 100644 index 0000000000..2f6751da01 --- /dev/null +++ b/skins/Leency/Luna/build.bat @@ -0,0 +1,3 @@ +..\fasm default.asm default.skn +..\kpack default.skn +pause \ No newline at end of file diff --git a/skins/Leency/Luna/default.asm b/skins/Leency/Luna/default.asm new file mode 100644 index 0000000000..a955919406 --- /dev/null +++ b/skins/Leency/Luna/default.asm @@ -0,0 +1,31 @@ +include 'me_skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [5:1:43:1],\ ; margins [left:top:right:bottom] + colors active = [binner=0x4C6389:\ ; border inner color + bouter=0x575746:\ ; border outer color + bframe=0x7E98CA],\ ; border frame color + colors inactive = [binner=0x73839D:\ ; border inner color + bouter=0x73736E:\ ; border outer color + bframe=0xA6B2CB],\ ; border frame color + dtp = 'default.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-19:3][15:15],\ ; buttons coordinates + minimize = [-36: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 ,'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/Leency/Luna/default.dtp b/skins/Leency/Luna/default.dtp new file mode 100644 index 0000000000..303f039efe Binary files /dev/null and b/skins/Leency/Luna/default.dtp differ diff --git a/skins/Leency/Yeah skin/default.dtp.asm b/skins/Leency/Luna/default.dtp.asm similarity index 100% rename from skins/Leency/Yeah skin/default.dtp.asm rename to skins/Leency/Luna/default.dtp.asm diff --git a/skins/Leency/Luna/left.bmp b/skins/Leency/Luna/left.bmp new file mode 100644 index 0000000000..cfb1fc2a4c Binary files /dev/null and b/skins/Leency/Luna/left.bmp differ diff --git a/skins/Leency/Luna/left_1.bmp b/skins/Leency/Luna/left_1.bmp new file mode 100644 index 0000000000..8cf88e2833 Binary files /dev/null and b/skins/Leency/Luna/left_1.bmp differ diff --git a/skins/Leency/Yeah skin/me_skin.inc b/skins/Leency/Luna/me_skin.inc similarity index 100% rename from skins/Leency/Yeah skin/me_skin.inc rename to skins/Leency/Luna/me_skin.inc diff --git a/skins/Leency/Luna/oper.bmp b/skins/Leency/Luna/oper.bmp new file mode 100644 index 0000000000..52d290d4b0 Binary files /dev/null and b/skins/Leency/Luna/oper.bmp differ diff --git a/skins/Leency/Luna/oper_1.bmp b/skins/Leency/Luna/oper_1.bmp new file mode 100644 index 0000000000..c2c25c5a10 Binary files /dev/null and b/skins/Leency/Luna/oper_1.bmp differ diff --git a/skins/Leency/Octo/build.bat b/skins/Leency/Octo/build.bat new file mode 100644 index 0000000000..2f6751da01 --- /dev/null +++ b/skins/Leency/Octo/build.bat @@ -0,0 +1,3 @@ +..\fasm default.asm default.skn +..\kpack default.skn +pause \ No newline at end of file diff --git a/skins/Leency/Octo/center1.bmp b/skins/Leency/Octo/center1.bmp new file mode 100644 index 0000000000..bd3913a83c Binary files /dev/null and b/skins/Leency/Octo/center1.bmp differ diff --git a/skins/Leency/Octo/center2.bmp b/skins/Leency/Octo/center2.bmp new file mode 100644 index 0000000000..d142ed2b72 Binary files /dev/null and b/skins/Leency/Octo/center2.bmp differ diff --git a/skins/Leency/Octo/default.asm b/skins/Leency/Octo/default.asm new file mode 100644 index 0000000000..ebbc65dfa2 --- /dev/null +++ b/skins/Leency/Octo/default.asm @@ -0,0 +1,31 @@ +include 'me_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=0x204962:\ ; border outer color + bframe=0xE1E1E1],\ ; border frame color + colors inactive = [binner=0xE1E1E1:\ ; border inner color + bouter=0xA1A1A1:\ ; border outer color + bframe=0xE1E1E1],\ ; border frame color + dtp = 'default.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-20:3][14:14],\ ; buttons coordinates + minimize = [-37:3][14: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/Leency/Octo/default.dtp b/skins/Leency/Octo/default.dtp new file mode 100644 index 0000000000..5a62f2e7a1 Binary files /dev/null and b/skins/Leency/Octo/default.dtp differ diff --git a/skins/Leency/Octo/left1.bmp b/skins/Leency/Octo/left1.bmp new file mode 100644 index 0000000000..bb75b4c11f Binary files /dev/null and b/skins/Leency/Octo/left1.bmp differ diff --git a/skins/Leency/Octo/left2.bmp b/skins/Leency/Octo/left2.bmp new file mode 100644 index 0000000000..575d5e4770 Binary files /dev/null and b/skins/Leency/Octo/left2.bmp differ diff --git a/skins/Leency/Octo/me_skin.inc b/skins/Leency/Octo/me_skin.inc new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/Leency/Octo/me_skin.inc @@ -0,0 +1,235 @@ +;============================================================================ +; 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 _fname + load w dword from _bmp.i.biWidth + load h dword from _bmp.i.biHeight + end virtual + align 4 + label _name + .width = w + .height = h + dd w,h + a=54+(w*3+(w mod 4))*(h-1) + size = $ + repeat h + repeat w + virtual at 0 + file _fname + load r from a+0 + load g from a+1 + load b from a+2 + end virtual + 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,_dtp_sz + __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 + virtual at 0 + file _dtp + _dtp_sz = $ + end virtual + dd _dtp_sz + 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 +} \ No newline at end of file diff --git a/skins/Leency/Octo/right1.bmp b/skins/Leency/Octo/right1.bmp new file mode 100644 index 0000000000..6daaefb658 Binary files /dev/null and b/skins/Leency/Octo/right1.bmp differ diff --git a/skins/Leency/Octo/right2.bmp b/skins/Leency/Octo/right2.bmp new file mode 100644 index 0000000000..aa31033e70 Binary files /dev/null and b/skins/Leency/Octo/right2.bmp differ diff --git a/skins/Leency/Sandwich/build.bat b/skins/Leency/Sandwich/build.bat index 250602f7b4..2f6751da01 100644 --- a/skins/Leency/Sandwich/build.bat +++ b/skins/Leency/Sandwich/build.bat @@ -1,4 +1,3 @@ -..\..\fasm default.asm default.skn -..\..\kpack default.skn -copy default.skn d:\000\kolibri\default.skn +..\fasm default.asm default.skn +..\kpack default.skn pause \ No newline at end of file diff --git a/skins/Leency/Yeah skin/build.bat b/skins/Leency/Yeah skin/build.bat deleted file mode 100644 index 250602f7b4..0000000000 --- a/skins/Leency/Yeah skin/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/Leency/Yeah/build.bat b/skins/Leency/Yeah/build.bat new file mode 100644 index 0000000000..2f6751da01 --- /dev/null +++ b/skins/Leency/Yeah/build.bat @@ -0,0 +1,3 @@ +..\fasm default.asm default.skn +..\kpack default.skn +pause \ No newline at end of file diff --git a/skins/Leency/Yeah skin/center1.bmp b/skins/Leency/Yeah/center1.bmp similarity index 100% rename from skins/Leency/Yeah skin/center1.bmp rename to skins/Leency/Yeah/center1.bmp diff --git a/skins/Leency/Yeah skin/center2.bmp b/skins/Leency/Yeah/center2.bmp similarity index 100% rename from skins/Leency/Yeah skin/center2.bmp rename to skins/Leency/Yeah/center2.bmp diff --git a/skins/Leency/Yeah skin/default.asm b/skins/Leency/Yeah/default.asm similarity index 100% rename from skins/Leency/Yeah skin/default.asm rename to skins/Leency/Yeah/default.asm diff --git a/skins/Leency/Yeah skin/default.dtp b/skins/Leency/Yeah/default.dtp similarity index 100% rename from skins/Leency/Yeah skin/default.dtp rename to skins/Leency/Yeah/default.dtp diff --git a/skins/Leency/Yeah/default.dtp.asm b/skins/Leency/Yeah/default.dtp.asm new file mode 100644 index 0000000000..a182bb44b3 --- /dev/null +++ b/skins/Leency/Yeah/default.dtp.asm @@ -0,0 +1,14 @@ +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/Leency/Yeah skin/left1.bmp b/skins/Leency/Yeah/left1.bmp similarity index 100% rename from skins/Leency/Yeah skin/left1.bmp rename to skins/Leency/Yeah/left1.bmp diff --git a/skins/Leency/Yeah skin/left2.bmp b/skins/Leency/Yeah/left2.bmp similarity index 100% rename from skins/Leency/Yeah skin/left2.bmp rename to skins/Leency/Yeah/left2.bmp diff --git a/skins/Leency/Yeah/me_skin.inc b/skins/Leency/Yeah/me_skin.inc new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/Leency/Yeah/me_skin.inc @@ -0,0 +1,235 @@ +;============================================================================ +; 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 _fname + load w dword from _bmp.i.biWidth + load h dword from _bmp.i.biHeight + end virtual + align 4 + label _name + .width = w + .height = h + dd w,h + a=54+(w*3+(w mod 4))*(h-1) + size = $ + repeat h + repeat w + virtual at 0 + file _fname + load r from a+0 + load g from a+1 + load b from a+2 + end virtual + 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,_dtp_sz + __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 + virtual at 0 + file _dtp + _dtp_sz = $ + end virtual + dd _dtp_sz + 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 +} \ No newline at end of file diff --git a/skins/Leency/Yeah skin/right1.bmp b/skins/Leency/Yeah/right1.bmp similarity index 100% rename from skins/Leency/Yeah skin/right1.bmp rename to skins/Leency/Yeah/right1.bmp diff --git a/skins/Leency/Yeah skin/right2.bmp b/skins/Leency/Yeah/right2.bmp similarity index 100% rename from skins/Leency/Yeah skin/right2.bmp rename to skins/Leency/Yeah/right2.bmp diff --git a/skins/Leency/scr_all.PNG b/skins/Leency/scr_all.PNG index 78549c8b8a..ab63e62d78 100644 Binary files a/skins/Leency/scr_all.PNG and b/skins/Leency/scr_all.PNG differ