From 1dc693eed6d88bb076ca8ec2dc8aebddba071f1b Mon Sep 17 00:00:00 2001 From: GerdtR Date: Thu, 4 Jul 2013 00:46:12 +0000 Subject: [PATCH] Added skin Win8 git-svn-id: svn://kolibrios.org@3754 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/win8/BASE.BMP | Bin 0 -> 138 bytes skins/win8/BASE_1.BMP | Bin 0 -> 138 bytes skins/win8/DEFAULT.SKN | Bin 0 -> 321 bytes skins/win8/Default.skn.asm | 33 ++++++ skins/win8/LEFT.BMP | Bin 0 -> 222 bytes skins/win8/LEFT_1.BMP | Bin 0 -> 222 bytes skins/win8/ME_SKIN.INC | 235 +++++++++++++++++++++++++++++++++++++ skins/win8/OPER.BMP | Bin 0 -> 4338 bytes skins/win8/OPER_1.BMP | Bin 0 -> 4254 bytes skins/win8/default.dtp | Bin 0 -> 40 bytes skins/win8/default.dtp.asm | 11 ++ skins/win8/dtp_build.bat | 2 + skins/win8/pack_build.bat | 1 + skins/win8/skn_build.bat | 2 + 14 files changed, 284 insertions(+) create mode 100644 skins/win8/BASE.BMP create mode 100644 skins/win8/BASE_1.BMP create mode 100644 skins/win8/DEFAULT.SKN create mode 100644 skins/win8/Default.skn.asm create mode 100644 skins/win8/LEFT.BMP create mode 100644 skins/win8/LEFT_1.BMP create mode 100644 skins/win8/ME_SKIN.INC create mode 100644 skins/win8/OPER.BMP create mode 100644 skins/win8/OPER_1.BMP create mode 100644 skins/win8/default.dtp create mode 100644 skins/win8/default.dtp.asm create mode 100644 skins/win8/dtp_build.bat create mode 100644 skins/win8/pack_build.bat create mode 100644 skins/win8/skn_build.bat diff --git a/skins/win8/BASE.BMP b/skins/win8/BASE.BMP new file mode 100644 index 0000000000000000000000000000000000000000..c8be478b679072170d826a58046b672216c21df9 GIT binary patch literal 138 qcmZ?r?P7ocGa#h_#Ed{J3Z^B1Bm+YTm_#MMughYfCf?T?$N&IIKrFie literal 0 HcmV?d00001 diff --git a/skins/win8/BASE_1.BMP b/skins/win8/BASE_1.BMP new file mode 100644 index 0000000000000000000000000000000000000000..53d4d6d4190d775b504fda3f15d83c36904708dd GIT binary patch literal 138 ucmZ?r?P7ocGa#h_#Ed{J3Z^B1Bm+YT5DRldFjxRcEM2;ks<^JMjsXDU)GA#7 literal 0 HcmV?d00001 diff --git a/skins/win8/DEFAULT.SKN b/skins/win8/DEFAULT.SKN new file mode 100644 index 0000000000000000000000000000000000000000..94034e335772353468642f42a08f2900f8c4b068 GIT binary patch literal 321 zcmV-H0lxlAP(w>2BLDya0000%#gZwsj&&}CIeQq_5y2l4vDvHnXV-&pq|;8Y?`WN^ z*6Z&q7&G09-93;v>4h@HgI9mxrs8@#siEUOlL7UC|S=k~gHFtX$oL;S;a zB7{N!48ZDiXTVm*BqNRL94tL!4T*GwjKDyATf-vE#r*0hmFKU0pTB^=c>U02$ TeC1Aau1z|D9v{o-T|TjZc^sN8 literal 0 HcmV?d00001 diff --git a/skins/win8/Default.skn.asm b/skins/win8/Default.skn.asm new file mode 100644 index 0000000000..6ea974ec5e --- /dev/null +++ b/skins/win8/Default.skn.asm @@ -0,0 +1,33 @@ +;SKIN (.SKN) - COMPILE WITH FASM + +include 'me_skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [5:1:67:1],\ ; margins [left:top:right:bottom] + colors active = [binner=0xD1D1D1:\ ; border inner color + bouter=0x8AA6CE:\ ; border outer color + bframe=0xf3f3f3],\ ; border frame color + colors inactive = [binner=0xD1D1D1:\ ; border inner color + bouter=0xD1D1D1:\ ; border outer color + bframe=0xf3f3f3],\ ; border frame color + dtp = 'default.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-42:1][37:17],\ ; buttons coordinates + minimize = [-69:2][28: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/win8/LEFT.BMP b/skins/win8/LEFT.BMP new file mode 100644 index 0000000000000000000000000000000000000000..656ad96c820c4310bcde457216fefb04c6ffe217 GIT binary patch literal 222 xcmZ?ry~h9nWi literal 0 HcmV?d00001 diff --git a/skins/win8/LEFT_1.BMP b/skins/win8/LEFT_1.BMP new file mode 100644 index 0000000000000000000000000000000000000000..fd33fc41318c9e7f933f7801fa7890a2fbe55286 GIT binary patch literal 222 zcmZ?ry~h9nW7b^8PGn#J057#l A2mk;8 literal 0 HcmV?d00001 diff --git a/skins/win8/ME_SKIN.INC b/skins/win8/ME_SKIN.INC new file mode 100644 index 0000000000..ccbb3c191c --- /dev/null +++ b/skins/win8/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/win8/OPER.BMP b/skins/win8/OPER.BMP new file mode 100644 index 0000000000000000000000000000000000000000..3761f916268d9201e879727c86e506b6cf8b56dc GIT binary patch literal 4338 zcmZ?r{UpEu24+A~1Bji0SQLmE86H$=u%I~{jZ36I{(u3pVoVWaSxh#Xy#tp& zkR6W9#&j}PkwN1Rpz9#cC&Lp!y@SagaIatuar}aV$sfZaK9G|WG8=z1z-0$Vd|)~p zQv~j0tc=0o53EijNpRF3Xd!@|OH!Cpq8QEkfvX28@dQvWjs1aUJl(k9_y7{a05C8B E009d3_y7O^ literal 0 HcmV?d00001 diff --git a/skins/win8/default.dtp b/skins/win8/default.dtp new file mode 100644 index 0000000000000000000000000000000000000000..e508545798d7355e6cf2a7692f941624902f57ea GIT binary patch literal 40 kcmdnh8pQB@T^7UlUQdSq|Nn#W=g*%RKo|y|pV`6y0K9b*fdBvi literal 0 HcmV?d00001 diff --git a/skins/win8/default.dtp.asm b/skins/win8/default.dtp.asm new file mode 100644 index 0000000000..3b41d7da5b --- /dev/null +++ b/skins/win8/default.dtp.asm @@ -0,0 +1,11 @@ +;SYSTEM COLORS (.DTP) - COMPILE WITH FASM +frame dd 0x5285BA +grab dd 0x6AAEF7 +grab_button dd 0x498DF7 +grab_button_text dd 0xffffff +grab_text dd 0xffffff +work dd 0xF3F3F3 +work_button dd 0xf3f3f3 +work_button_text dd 0x000000 +work_text dd 0x000000 +work_graph dd 0xB4CCE7 \ No newline at end of file diff --git a/skins/win8/dtp_build.bat b/skins/win8/dtp_build.bat new file mode 100644 index 0000000000..2fddee0e38 --- /dev/null +++ b/skins/win8/dtp_build.bat @@ -0,0 +1,2 @@ +fasm default.dtp.asm default.dtp +pause \ No newline at end of file diff --git a/skins/win8/pack_build.bat b/skins/win8/pack_build.bat new file mode 100644 index 0000000000..7e7d474b2c --- /dev/null +++ b/skins/win8/pack_build.bat @@ -0,0 +1 @@ +kpack default.skn default.pack.skn diff --git a/skins/win8/skn_build.bat b/skins/win8/skn_build.bat new file mode 100644 index 0000000000..2828114c6b --- /dev/null +++ b/skins/win8/skn_build.bat @@ -0,0 +1,2 @@ +fasm default.asm default.skn +pause \ No newline at end of file