From 7f7e8727ab84e6f25029195802ff46ab66a70716 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 26 Dec 2013 19:30:07 +0000 Subject: [PATCH] OpusN skin upload. Based on Opus D skin. Flat. git-svn-id: svn://kolibrios.org@4405 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/Leency/OpusN/OpusN.asm | 31 ++++ skins/Leency/OpusN/OpusN.dtp | Bin 0 -> 40 bytes skins/Leency/OpusN/active/base.bmp | Bin 0 -> 606 bytes skins/Leency/OpusN/active/left.bmp | Bin 0 -> 606 bytes skins/Leency/OpusN/active/oper.bmp | Bin 0 -> 5390 bytes skins/Leency/OpusN/inactive/base.bmp | Bin 0 -> 606 bytes skins/Leency/OpusN/inactive/left.bmp | Bin 0 -> 606 bytes skins/Leency/OpusN/inactive/oper.bmp | Bin 0 -> 5390 bytes skins/Leency/OpusN/my_skin.inc | 235 +++++++++++++++++++++++++++ 9 files changed, 266 insertions(+) create mode 100644 skins/Leency/OpusN/OpusN.asm create mode 100644 skins/Leency/OpusN/OpusN.dtp create mode 100644 skins/Leency/OpusN/active/base.bmp create mode 100644 skins/Leency/OpusN/active/left.bmp create mode 100644 skins/Leency/OpusN/active/oper.bmp create mode 100644 skins/Leency/OpusN/inactive/base.bmp create mode 100644 skins/Leency/OpusN/inactive/left.bmp create mode 100644 skins/Leency/OpusN/inactive/oper.bmp create mode 100644 skins/Leency/OpusN/my_skin.inc diff --git a/skins/Leency/OpusN/OpusN.asm b/skins/Leency/OpusN/OpusN.asm new file mode 100644 index 0000000000..030c9c9d7c --- /dev/null +++ b/skins/Leency/OpusN/OpusN.asm @@ -0,0 +1,31 @@ +include 'my_skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [8:3:10:2],\ ; margins [left:top:right:bottom] + colors active = [binner=0xDCD6CB:\ ; border inner color + bouter=0x948B7B:\ ; border outer color + bframe=0xDCD6CB],\ ; border frame color + colors inactive = [binner=0xDCD6CB:\ ; border inner color + bouter=0x948B7B:\ ; border outer color + bframe=0xDCD6CB],\ ; border frame color + dtp = 'Opus_D.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-20:6][14:14],\ ; buttons coordinates + minimize = [-39:6][14:14] ; [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' diff --git a/skins/Leency/OpusN/OpusN.dtp b/skins/Leency/OpusN/OpusN.dtp new file mode 100644 index 0000000000000000000000000000000000000000..a3826ca1ca03392bba0339900272d70a16858f4a GIT binary patch literal 40 fcmbQ&Ue7QOh)-X;!vF&R|NjTGL1G{_2!PlCd4&;$ literal 0 HcmV?d00001 diff --git a/skins/Leency/OpusN/active/base.bmp b/skins/Leency/OpusN/active/base.bmp new file mode 100644 index 0000000000000000000000000000000000000000..576fccf232e3cf36e034de2941e359828f80d3e9 GIT binary patch literal 606 zcmZ?rjbmZ}12Z700mK|YEDpqs3=%*RCp>J*tK#Q YR@7WkiWS{{`~oZbj|242U4j(>0KIQWF8}}l literal 0 HcmV?d00001 diff --git a/skins/Leency/OpusN/active/left.bmp b/skins/Leency/OpusN/active/left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cbee197e2ad7a1160898c16484c11bce5b92f707 GIT binary patch literal 606 zcmZ?rjbmZ}12Z700mK|YEDpqs3=%*RCj(fLbusAG>tp)D literal 0 HcmV?d00001 diff --git a/skins/Leency/OpusN/active/oper.bmp b/skins/Leency/OpusN/active/oper.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5848bec1dc11b7c6aa9f9ea2514c9ac2e8e3850e GIT binary patch literal 5390 zcmd^?TTc@~6vx*u;FCr_f}g+-;H%+Tcn~Q>f>jD$T3Zn>K!gee4T4}4LR1J+K~YjH z2#7#w%f&6d7nL9&p|llZTQD*BZ>O$9cY%!|S*)A?PG{zvN&1^Jb7uBf%Kn2)>^X|^ z2;LODhw$!W4x?lk*MZp2ro!TwPI?uT-(wW%Y00Pj%ya@}u}?!$&W6(KBGp)Sqv>|h zT+lboJFQ8|wC;bPsCquYhW?drfw4oRj{ed}i7T&T?fgCq5@VoF2&4 z)$(ld;zps8cPcfi^bxRqeVL?m$LW@G>|M>Q)~FKi`P;X`wpZQc>9bes#Tq3tEaDFef~E56egXO5>n zgR(EpqKT3;(T`>Vr^)UaVx1D?Aw&rb1hTHBBTcTNg&tz!b1Gz+gcDR7u?LkL)jZwg zbB@|P?$`FvqW92_7hYzRYd_<6%(MZQJW1qBm)_?)?#=uH4@M1|TwQDqP%M0#MwT!6E)u^wvyd1%<`>^6=|6Hmv? zTrd<`|GDvFLqO<vp`U)#*m}0du$yB0Il@w^ArA9U8{J0Vd->j-*yk8cR eRiEY;mx3!eUA6a{7;?xacUkr534`~45c3OSk7}?0 literal 0 HcmV?d00001 diff --git a/skins/Leency/OpusN/inactive/base.bmp b/skins/Leency/OpusN/inactive/base.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a64daf84da3f8512ef01a13ea873de53b28fe218 GIT binary patch literal 606 zcmZ?rjbmZ}12Z700mK|YEDpqs3=%*RC|Fi5MRJNlX+cq8OC6%nX(3bp9A+ zP|y%p;b9hnD}Y3f%N! z@a^L>Xs3KWT}-%)&6Hm>NG9;M>{(unu?%7X&fExADkmb;@|F|8N}Ye{`dZ%P9@EV~ zb4g{S`ZR2TE2;d+5>#mTqv>dQz1_tVRG$a-rsW3ZEfHY;vdOZDkdHw-#F_A0V*ls& zq=P8(Cl%B0)fk_i${!rnDThD!tMJ|AOAdxOwOc452RryEUDu%Uje%agy4x#O5Kj0x a>VJ>p;ar8&svGsgWR(2;4#snVYxM_LCX5{b literal 0 HcmV?d00001 diff --git a/skins/Leency/OpusN/inactive/oper.bmp b/skins/Leency/OpusN/inactive/oper.bmp new file mode 100644 index 0000000000000000000000000000000000000000..268ef3e07f78e9a5f6cebf0337e2f881359832aa GIT binary patch literal 5390 zcmd^>TW-@p6o$c!L5Gmll;KY12AxoI1Wc zcAVI4(k5{lqV9m-nRYb9j%%SvDIxkjnK@@pJl`DqWbVvdz0M6jx6$6hHG}I0t}EP4 zv>aEtHu(CZ5lwgM_2Ah&_i*ve^y$&dw*(3)EE?62^Fx+TsnuNJ^S1DHS6maM4N=KR zdQLG5hJ6W@R}8EQs6}w<=bY?9qs*)qoQtd9sG^)~I2%a&*xK}>QRt+P!b}nfPSL3D z=?*MmKG~mR7fSl9cPyOQeJzdXa>)WPTo?A!hz5rFG^&CY?$Km8Rj*+-TB8InHi9mf z<>WO>&?}<^FE)Y(5>8&NOpMcM1<4x4DH=|)hB)!i?kd(9XY^T(wTz_>;g(<^kQq_F zzwnyXmUQMy=Dd6FF|;EaykepyL&6{B%*$pxC;LJIm{uKh@P4vh)FIZ(x<>WK$VpHM zB-&U`L3g$#W5S$XaN-9&R`t#aNp*5QX$~nQEO=>wI+V|XZs#O@!kh`OXfkI}w^>y5 zVTsSDW@k(4zsku%l9a*{%UMwEj5vZbwg|yE_B!;}`J|6)*>-7v6z679iO=T{=luIG zRMB%EI~lcSXc(Q5RqIDV znhdAx`hF)k{&m{w#|UJaXlQbU|6qcF{D2Ro`c`(g!$zIA@Usr!xesvI<{%~tKG?RUD3Zttkq@AOZ* zmrPg^772kftV0E9_W1(0^zr+YY5CI{RmrO1-1lT|nX5M1)2jMW8xJ6kxKEc>IKLfC VtGwf&;x#q9KKJS!hwFb3_Z!ynw+H|L literal 0 HcmV?d00001 diff --git a/skins/Leency/OpusN/my_skin.inc b/skins/Leency/OpusN/my_skin.inc new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/Leency/OpusN/my_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