diff --git a/skins/L-Junior/build.bat b/skins/L-Junior/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/L-Junior/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/L-Junior/center1.BMP b/skins/L-Junior/center1.BMP deleted file mode 100644 index cec19d23d0..0000000000 Binary files a/skins/L-Junior/center1.BMP and /dev/null differ diff --git a/skins/L-Junior/center2.BMP b/skins/L-Junior/center2.BMP deleted file mode 100644 index c3322dd8c3..0000000000 Binary files a/skins/L-Junior/center2.BMP and /dev/null differ diff --git a/skins/L-Junior/left1.BMP b/skins/L-Junior/left1.BMP deleted file mode 100644 index 35bf23d723..0000000000 Binary files a/skins/L-Junior/left1.BMP and /dev/null differ diff --git a/skins/L-Junior/left2.BMP b/skins/L-Junior/left2.BMP deleted file mode 100644 index 5f568e0141..0000000000 Binary files a/skins/L-Junior/left2.BMP and /dev/null differ diff --git a/skins/L-Junior/right1.BMP b/skins/L-Junior/right1.BMP deleted file mode 100644 index 80b8085e38..0000000000 Binary files a/skins/L-Junior/right1.BMP and /dev/null differ diff --git a/skins/L-Junior/right2.BMP b/skins/L-Junior/right2.BMP deleted file mode 100644 index ae7b548b84..0000000000 Binary files a/skins/L-Junior/right2.BMP and /dev/null differ diff --git a/skins/Leency/AreaO/build.bat b/skins/Leency/AreaO/build.bat new file mode 100644 index 0000000000..b014dacfba --- /dev/null +++ b/skins/Leency/AreaO/build.bat @@ -0,0 +1,4 @@ +del default.skn +..\fasm default.asm default.skn +..\kpack default.skn +pause \ No newline at end of file diff --git a/skins/Leency/AreaO/center1.bmp b/skins/Leency/AreaO/center1.bmp new file mode 100644 index 0000000000..28e3880f3e Binary files /dev/null and b/skins/Leency/AreaO/center1.bmp differ diff --git a/skins/Leency/AreaO/default.asm b/skins/Leency/AreaO/default.asm new file mode 100644 index 0000000000..cb7005d145 --- /dev/null +++ b/skins/Leency/AreaO/default.asm @@ -0,0 +1,29 @@ +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=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:5][12:12],\ ; buttons coordinates + minimize = [-38:5][12:12] ; [left:top][width:height] + +SKIN_BITMAPS \ + left active = bmp_left1,\ ; skin bitmaps pointers + left inactive = bmp_left1,\ + oper active = bmp_right1,\ + oper inactive = bmp_right2,\ + base active = bmp_center1,\ + base inactive = bmp_center1 + +BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps +BITMAP bmp_right1, 'right1.bmp' +BITMAP bmp_right2, 'right2.bmp' +BITMAP bmp_center1,'center1.bmp' diff --git a/skins/Leency/AreaO/default.dtp b/skins/Leency/AreaO/default.dtp new file mode 100644 index 0000000000..59d1623806 Binary files /dev/null and b/skins/Leency/AreaO/default.dtp differ diff --git a/skins/Sandwich/default.dtp.asm b/skins/Leency/AreaO/default.dtp.asm similarity index 100% rename from skins/Sandwich/default.dtp.asm rename to skins/Leency/AreaO/default.dtp.asm diff --git a/skins/Leency/AreaO/left1.bmp b/skins/Leency/AreaO/left1.bmp new file mode 100644 index 0000000000..b9c0e758d5 Binary files /dev/null and b/skins/Leency/AreaO/left1.bmp differ diff --git a/skins/Sandwich/me_skin.inc b/skins/Leency/AreaO/me_skin.inc similarity index 100% rename from skins/Sandwich/me_skin.inc rename to skins/Leency/AreaO/me_skin.inc diff --git a/skins/Leency/AreaO/right1.bmp b/skins/Leency/AreaO/right1.bmp new file mode 100644 index 0000000000..376a8c26db Binary files /dev/null and b/skins/Leency/AreaO/right1.bmp differ diff --git a/skins/Leency/AreaO/right2.bmp b/skins/Leency/AreaO/right2.bmp new file mode 100644 index 0000000000..56184ae587 Binary files /dev/null and b/skins/Leency/AreaO/right2.bmp differ diff --git a/skins/Leency/AreaO/scr.png b/skins/Leency/AreaO/scr.png new file mode 100644 index 0000000000..2ffdec6b49 Binary files /dev/null and b/skins/Leency/AreaO/scr.png differ diff --git a/skins/Leency/Area[]/build.bat b/skins/Leency/Area[]/build.bat new file mode 100644 index 0000000000..b014dacfba --- /dev/null +++ b/skins/Leency/Area[]/build.bat @@ -0,0 +1,4 @@ +del default.skn +..\fasm default.asm default.skn +..\kpack default.skn +pause \ No newline at end of file diff --git a/skins/Leency/Area[]/center1.bmp b/skins/Leency/Area[]/center1.bmp new file mode 100644 index 0000000000..f614507ddb Binary files /dev/null and b/skins/Leency/Area[]/center1.bmp differ diff --git a/skins/Leency/Area[]/center2.bmp b/skins/Leency/Area[]/center2.bmp new file mode 100644 index 0000000000..dcd6f95680 Binary files /dev/null and b/skins/Leency/Area[]/center2.bmp differ diff --git a/skins/Leency/Area[]/default.asm b/skins/Leency/Area[]/default.asm new file mode 100644 index 0000000000..80241e521b --- /dev/null +++ b/skins/Leency/Area[]/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=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:6][11:11],\ ; buttons coordinates + minimize = [-34:6][11:11] ; [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/Area[]/default.dtp b/skins/Leency/Area[]/default.dtp new file mode 100644 index 0000000000..59d1623806 Binary files /dev/null and b/skins/Leency/Area[]/default.dtp differ diff --git a/skins/Yeah skin/default.dtp.asm b/skins/Leency/Area[]/default.dtp.asm similarity index 100% rename from skins/Yeah skin/default.dtp.asm rename to skins/Leency/Area[]/default.dtp.asm diff --git a/skins/Leency/Area[]/left1.bmp b/skins/Leency/Area[]/left1.bmp new file mode 100644 index 0000000000..54d76366f3 Binary files /dev/null and b/skins/Leency/Area[]/left1.bmp differ diff --git a/skins/Leency/Area[]/left2.bmp b/skins/Leency/Area[]/left2.bmp new file mode 100644 index 0000000000..54d76366f3 Binary files /dev/null and b/skins/Leency/Area[]/left2.bmp differ diff --git a/skins/Yeah skin/me_skin.inc b/skins/Leency/Area[]/me_skin.inc similarity index 100% rename from skins/Yeah skin/me_skin.inc rename to skins/Leency/Area[]/me_skin.inc diff --git a/skins/Leency/Area[]/right1.bmp b/skins/Leency/Area[]/right1.bmp new file mode 100644 index 0000000000..699d3997ff Binary files /dev/null and b/skins/Leency/Area[]/right1.bmp differ diff --git a/skins/Leency/Area[]/right2.bmp b/skins/Leency/Area[]/right2.bmp new file mode 100644 index 0000000000..d6bc759b40 Binary files /dev/null and b/skins/Leency/Area[]/right2.bmp differ diff --git a/skins/Leency/Area[]/scr.png b/skins/Leency/Area[]/scr.png new file mode 100644 index 0000000000..fdb2508500 Binary files /dev/null and b/skins/Leency/Area[]/scr.png differ diff --git a/skins/L-Junior/DEFAULT.ASM b/skins/Leency/L-Junior/DEFAULT.ASM similarity index 100% rename from skins/L-Junior/DEFAULT.ASM rename to skins/Leency/L-Junior/DEFAULT.ASM diff --git a/skins/L-Junior/ME_SKIN.INC b/skins/Leency/L-Junior/ME_SKIN.INC similarity index 100% rename from skins/L-Junior/ME_SKIN.INC rename to skins/Leency/L-Junior/ME_SKIN.INC diff --git a/skins/Leency/L-Junior/build.bat b/skins/Leency/L-Junior/build.bat new file mode 100644 index 0000000000..250602f7b4 --- /dev/null +++ b/skins/Leency/L-Junior/build.bat @@ -0,0 +1,4 @@ +..\..\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/L-Junior/center1.BMP b/skins/Leency/L-Junior/center1.BMP new file mode 100644 index 0000000000..a1fccaeb0d Binary files /dev/null and b/skins/Leency/L-Junior/center1.BMP differ diff --git a/skins/Leency/L-Junior/center2.BMP b/skins/Leency/L-Junior/center2.BMP new file mode 100644 index 0000000000..ea41d666ee Binary files /dev/null and b/skins/Leency/L-Junior/center2.BMP differ diff --git a/skins/Leency/L-Junior/left1.BMP b/skins/Leency/L-Junior/left1.BMP new file mode 100644 index 0000000000..b66752249c Binary files /dev/null and b/skins/Leency/L-Junior/left1.BMP differ diff --git a/skins/Leency/L-Junior/left2.BMP b/skins/Leency/L-Junior/left2.BMP new file mode 100644 index 0000000000..19b72469a7 Binary files /dev/null and b/skins/Leency/L-Junior/left2.BMP differ diff --git a/skins/L-Junior/myblue.DTP b/skins/Leency/L-Junior/myblue.DTP similarity index 100% rename from skins/L-Junior/myblue.DTP rename to skins/Leency/L-Junior/myblue.DTP diff --git a/skins/Leency/L-Junior/right1.BMP b/skins/Leency/L-Junior/right1.BMP new file mode 100644 index 0000000000..5204c07a14 Binary files /dev/null and b/skins/Leency/L-Junior/right1.BMP differ diff --git a/skins/Leency/L-Junior/right2.BMP b/skins/Leency/L-Junior/right2.BMP new file mode 100644 index 0000000000..8276fcc7a4 Binary files /dev/null and b/skins/Leency/L-Junior/right2.BMP differ diff --git a/skins/Leency/Sandwich/build.bat b/skins/Leency/Sandwich/build.bat new file mode 100644 index 0000000000..250602f7b4 --- /dev/null +++ b/skins/Leency/Sandwich/build.bat @@ -0,0 +1,4 @@ +..\..\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/Sandwich/center1.bmp b/skins/Leency/Sandwich/center1.bmp new file mode 100644 index 0000000000..67e4f35f24 Binary files /dev/null and b/skins/Leency/Sandwich/center1.bmp differ diff --git a/skins/Leency/Sandwich/center2.bmp b/skins/Leency/Sandwich/center2.bmp new file mode 100644 index 0000000000..67e4f35f24 Binary files /dev/null and b/skins/Leency/Sandwich/center2.bmp differ diff --git a/skins/Sandwich/default.asm b/skins/Leency/Sandwich/default.asm similarity index 100% rename from skins/Sandwich/default.asm rename to skins/Leency/Sandwich/default.asm diff --git a/skins/Sandwich/default.dtp b/skins/Leency/Sandwich/default.dtp similarity index 100% rename from skins/Sandwich/default.dtp rename to skins/Leency/Sandwich/default.dtp diff --git a/skins/Leency/Sandwich/default.dtp.asm b/skins/Leency/Sandwich/default.dtp.asm new file mode 100644 index 0000000000..a182bb44b3 --- /dev/null +++ b/skins/Leency/Sandwich/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/Sandwich/left1.bmp b/skins/Leency/Sandwich/left1.bmp new file mode 100644 index 0000000000..a9c38fee44 Binary files /dev/null and b/skins/Leency/Sandwich/left1.bmp differ diff --git a/skins/Leency/Sandwich/left2.bmp b/skins/Leency/Sandwich/left2.bmp new file mode 100644 index 0000000000..a9c38fee44 Binary files /dev/null and b/skins/Leency/Sandwich/left2.bmp differ diff --git a/skins/Leency/Sandwich/me_skin.inc b/skins/Leency/Sandwich/me_skin.inc new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/Leency/Sandwich/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/Sandwich/right1.bmp b/skins/Leency/Sandwich/right1.bmp similarity index 100% rename from skins/Sandwich/right1.bmp rename to skins/Leency/Sandwich/right1.bmp diff --git a/skins/Sandwich/right2.bmp b/skins/Leency/Sandwich/right2.bmp similarity index 100% rename from skins/Sandwich/right2.bmp rename to skins/Leency/Sandwich/right2.bmp diff --git a/skins/Leency/Yeah skin/build.bat b/skins/Leency/Yeah skin/build.bat new file mode 100644 index 0000000000..250602f7b4 --- /dev/null +++ b/skins/Leency/Yeah skin/build.bat @@ -0,0 +1,4 @@ +..\..\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 skin/center1.bmp b/skins/Leency/Yeah skin/center1.bmp new file mode 100644 index 0000000000..7ace5d2b65 Binary files /dev/null and b/skins/Leency/Yeah skin/center1.bmp differ diff --git a/skins/Leency/Yeah skin/center2.bmp b/skins/Leency/Yeah skin/center2.bmp new file mode 100644 index 0000000000..3b76995c20 Binary files /dev/null and b/skins/Leency/Yeah skin/center2.bmp differ diff --git a/skins/Yeah skin/default.asm b/skins/Leency/Yeah skin/default.asm similarity index 87% rename from skins/Yeah skin/default.asm rename to skins/Leency/Yeah skin/default.asm index 20a312c610..e3d0735968 100644 --- a/skins/Yeah skin/default.asm +++ b/skins/Leency/Yeah skin/default.asm @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-30:0][26:16],\ ; buttons coordinates - minimize = [-55:0][26:16] ; [left:top][width:height] + close = [-29:1][25:15],\ ; buttons coordinates + minimize = [-54:1][25:15] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left1,\ ; skin bitmaps pointers diff --git a/skins/Yeah skin/default2.dtp b/skins/Leency/Yeah skin/default.dtp similarity index 100% rename from skins/Yeah skin/default2.dtp rename to skins/Leency/Yeah skin/default.dtp diff --git a/skins/Leency/Yeah skin/default.dtp.asm b/skins/Leency/Yeah skin/default.dtp.asm new file mode 100644 index 0000000000..a182bb44b3 --- /dev/null +++ b/skins/Leency/Yeah skin/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 skin/left1.bmp new file mode 100644 index 0000000000..59dc9d1968 Binary files /dev/null and b/skins/Leency/Yeah skin/left1.bmp differ diff --git a/skins/Leency/Yeah skin/left2.bmp b/skins/Leency/Yeah skin/left2.bmp new file mode 100644 index 0000000000..0d9ae202f7 Binary files /dev/null and b/skins/Leency/Yeah skin/left2.bmp differ diff --git a/skins/Leency/Yeah skin/me_skin.inc b/skins/Leency/Yeah skin/me_skin.inc new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/Leency/Yeah skin/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 skin/right1.bmp new file mode 100644 index 0000000000..cc6b262471 Binary files /dev/null and b/skins/Leency/Yeah skin/right1.bmp differ diff --git a/skins/Leency/Yeah skin/right2.bmp b/skins/Leency/Yeah skin/right2.bmp new file mode 100644 index 0000000000..66ed653a7b Binary files /dev/null and b/skins/Leency/Yeah skin/right2.bmp differ diff --git a/skins/Leency/scr_all.PNG b/skins/Leency/scr_all.PNG new file mode 100644 index 0000000000..78549c8b8a Binary files /dev/null and b/skins/Leency/scr_all.PNG differ diff --git a/skins/Nature/Sandwich/Sandwich.skn b/skins/Nature/Sandwich/Sandwich.skn new file mode 100644 index 0000000000..ff3d29489c Binary files /dev/null and b/skins/Nature/Sandwich/Sandwich.skn differ diff --git a/skins/Nature/Sandwich/src/DESKTOP b/skins/Nature/Sandwich/src/DESKTOP new file mode 100644 index 0000000000..9ae13e48cc Binary files /dev/null and b/skins/Nature/Sandwich/src/DESKTOP differ diff --git a/skins/Nature/Sandwich/src/Thumbs.db b/skins/Nature/Sandwich/src/Thumbs.db new file mode 100644 index 0000000000..93e6a39ec5 Binary files /dev/null and b/skins/Nature/Sandwich/src/Thumbs.db differ diff --git a/skins/Nature/Sandwich/src/build.bat b/skins/Nature/Sandwich/src/build.bat new file mode 100644 index 0000000000..250602f7b4 --- /dev/null +++ b/skins/Nature/Sandwich/src/build.bat @@ -0,0 +1,4 @@ +..\..\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/Sandwich/center1.bmp b/skins/Nature/Sandwich/src/center1.bmp similarity index 100% rename from skins/Sandwich/center1.bmp rename to skins/Nature/Sandwich/src/center1.bmp diff --git a/skins/Sandwich/center2.bmp b/skins/Nature/Sandwich/src/center2.bmp similarity index 100% rename from skins/Sandwich/center2.bmp rename to skins/Nature/Sandwich/src/center2.bmp diff --git a/skins/Nature/Sandwich/src/default.asm b/skins/Nature/Sandwich/src/default.asm new file mode 100644 index 0000000000..e84bbe2cea --- /dev/null +++ b/skins/Nature/Sandwich/src/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=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/Nature/Sandwich/src/default.dtp b/skins/Nature/Sandwich/src/default.dtp new file mode 100644 index 0000000000..9e19447b76 Binary files /dev/null and b/skins/Nature/Sandwich/src/default.dtp differ diff --git a/skins/Nature/Sandwich/src/default.dtp.asm b/skins/Nature/Sandwich/src/default.dtp.asm new file mode 100644 index 0000000000..a182bb44b3 --- /dev/null +++ b/skins/Nature/Sandwich/src/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/Nature/Sandwich/src/default.skn b/skins/Nature/Sandwich/src/default.skn new file mode 100644 index 0000000000..ff3d29489c Binary files /dev/null and b/skins/Nature/Sandwich/src/default.skn differ diff --git a/skins/Sandwich/left1.bmp b/skins/Nature/Sandwich/src/left1.bmp similarity index 100% rename from skins/Sandwich/left1.bmp rename to skins/Nature/Sandwich/src/left1.bmp diff --git a/skins/Sandwich/left2.bmp b/skins/Nature/Sandwich/src/left2.bmp similarity index 100% rename from skins/Sandwich/left2.bmp rename to skins/Nature/Sandwich/src/left2.bmp diff --git a/skins/Nature/Sandwich/src/me_skin.inc b/skins/Nature/Sandwich/src/me_skin.inc new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/Nature/Sandwich/src/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/Nature/Sandwich/src/right1.bmp b/skins/Nature/Sandwich/src/right1.bmp new file mode 100644 index 0000000000..294b94c567 Binary files /dev/null and b/skins/Nature/Sandwich/src/right1.bmp differ diff --git a/skins/Nature/Sandwich/src/right2.bmp b/skins/Nature/Sandwich/src/right2.bmp new file mode 100644 index 0000000000..996a2a57a4 Binary files /dev/null and b/skins/Nature/Sandwich/src/right2.bmp differ diff --git a/skins/Sandwich/build.bat b/skins/Sandwich/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/Sandwich/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/Yeah skin/build.bat b/skins/Yeah skin/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/Yeah skin/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/Yeah skin/center1.bmp b/skins/Yeah skin/center1.bmp deleted file mode 100644 index 6011868ee0..0000000000 Binary files a/skins/Yeah skin/center1.bmp and /dev/null differ diff --git a/skins/Yeah skin/center2.bmp b/skins/Yeah skin/center2.bmp deleted file mode 100644 index 97a572a8ee..0000000000 Binary files a/skins/Yeah skin/center2.bmp and /dev/null differ diff --git a/skins/Yeah skin/default.dtp b/skins/Yeah skin/default.dtp deleted file mode 100644 index 5d4c2d36bc..0000000000 Binary files a/skins/Yeah skin/default.dtp and /dev/null differ diff --git a/skins/Yeah skin/left1.bmp b/skins/Yeah skin/left1.bmp deleted file mode 100644 index c1c6813ab0..0000000000 Binary files a/skins/Yeah skin/left1.bmp and /dev/null differ diff --git a/skins/Yeah skin/left2.bmp b/skins/Yeah skin/left2.bmp deleted file mode 100644 index 2794f2003a..0000000000 Binary files a/skins/Yeah skin/left2.bmp and /dev/null differ diff --git a/skins/Yeah skin/right1.bmp b/skins/Yeah skin/right1.bmp deleted file mode 100644 index cb9f403d8c..0000000000 Binary files a/skins/Yeah skin/right1.bmp and /dev/null differ diff --git a/skins/Yeah skin/right2.bmp b/skins/Yeah skin/right2.bmp deleted file mode 100644 index a2f6523ac4..0000000000 Binary files a/skins/Yeah skin/right2.bmp and /dev/null differ diff --git a/skins/authors.txt b/skins/authors.txt index ddbdcb85a9..3e77774fb4 100644 --- a/skins/authors.txt +++ b/skins/authors.txt @@ -29,7 +29,7 @@ gskin Aqwas Hearts Rock_maniak_forever humanoid_OSX Aqwas khrome2 ChE -L-Junior Leency +Leency (folder) Leency lightskin Aqwas macos_l Aqwas mage_scroll Alver @@ -59,7 +59,6 @@ RoboTech Rock_maniak_forever Russia Mario79 Russia_2 Rock_maniak_forever Sad_grey Aqwas -Sandwich Leency SashSkinPack_1_1 Sash sea Aqwas skin_feol goglus @@ -78,8 +77,6 @@ Victory_1945 Rock_maniak_forever Vista nillsoft WIN311 Veliant winflat mistif(ator -winpx_luna Leency WindowsXP Rock_maniak_forever WinXP_Standart Mario79 -Yeah skin Leency zRiver Rock_maniak_forever \ No newline at end of file