From e8dd8daf8870e4284ef265db1634def0c9e3a299 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 9 Nov 2012 16:02:35 +0000 Subject: [PATCH] neutral skin updated, Simple_gray skin added git-svn-id: svn://kolibrios.org@3017 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/Simple_gray/base.bmp | Bin 0 -> 1954 bytes skins/Simple_gray/base_1.bmp | Bin 0 -> 1954 bytes skins/Simple_gray/build.bat | 2 + skins/Simple_gray/left.bmp | Bin 0 -> 454 bytes skins/Simple_gray/left_1.bmp | Bin 0 -> 454 bytes skins/Simple_gray/me_skin.inc | 242 ++++++++++++++++++++ skins/Simple_gray/oper.bmp | Bin 0 -> 3054 bytes skins/Simple_gray/oper_1.bmp | Bin 0 -> 3054 bytes skins/Simple_gray/simple_gray.ASM | 38 +++ skins/Simple_gray/simple_gray.dtp | Bin 0 -> 40 bytes skins/neutral/neutral_lilac/default.dtp | Bin 40 -> 40 bytes skins/neutral/neutral_lilac/default.dtp.asm | 2 +- 12 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 skins/Simple_gray/base.bmp create mode 100644 skins/Simple_gray/base_1.bmp create mode 100644 skins/Simple_gray/build.bat create mode 100644 skins/Simple_gray/left.bmp create mode 100644 skins/Simple_gray/left_1.bmp create mode 100644 skins/Simple_gray/me_skin.inc create mode 100644 skins/Simple_gray/oper.bmp create mode 100644 skins/Simple_gray/oper_1.bmp create mode 100644 skins/Simple_gray/simple_gray.ASM create mode 100644 skins/Simple_gray/simple_gray.dtp diff --git a/skins/Simple_gray/base.bmp b/skins/Simple_gray/base.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4fde475c90d1dcaeeec3d50e5575992c153426e4 GIT binary patch literal 1954 zcmZ?rUBu1+24+A~1BfM|n2|vOES>|D7vhFsumF&lLOsB6(8VxV> Y5ExAp=pll?bQ%q>(eOeK0jk!I0LXA84FCWD literal 0 HcmV?d00001 diff --git a/skins/Simple_gray/base_1.bmp b/skins/Simple_gray/base_1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0b698cb78e28187324b6da1e7948fa61526deb06 GIT binary patch literal 1954 zcmZ?rUBu1+24+A~1BfM|n2|vOES>|D7vhFsumF(gp&nq^x^pMB(5P9Y1?6aXjfNL` Y2#lr)^bo;cI*o?cXn3KA09ETp0I>KfdjJ3c literal 0 HcmV?d00001 diff --git a/skins/Simple_gray/build.bat b/skins/Simple_gray/build.bat new file mode 100644 index 0000000000..d7204fe3cb --- /dev/null +++ b/skins/Simple_gray/build.bat @@ -0,0 +1,2 @@ +fasm simple_gray.asm simple_gray.skn +pause \ No newline at end of file diff --git a/skins/Simple_gray/left.bmp b/skins/Simple_gray/left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f784c246000b105d98f1777b7199145483881956 GIT binary patch literal 454 zcmZ?rJ;ulY24+A~1Bh9HSQ3aC86r literal 0 HcmV?d00001 diff --git a/skins/Simple_gray/me_skin.inc b/skins/Simple_gray/me_skin.inc new file mode 100644 index 0000000000..365964eb38 --- /dev/null +++ b/skins/Simple_gray/me_skin.inc @@ -0,0 +1,242 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; Copyright (C) KolibriOS team 2004-2007. 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 _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/Simple_gray/oper.bmp b/skins/Simple_gray/oper.bmp new file mode 100644 index 0000000000000000000000000000000000000000..86d16fc405ea9d97573eef6d49a3b87af7e7199a GIT binary patch literal 3054 zcmd^p?<>q=apSU0k>ntaqT*rU{co<-{oG~HfypoSt*zq{NS@? zJU7cA=$5_ped2_lap=SpY#N*aH-r$MU5oF}3uioZLyfb~jHuHUH5m7qW)-@d#>s_& zelxoziW-c$ig>9tu3VVOqR<^QI4#$q6$(8+F563?M=o?;$8yU;eU2#rxnjBVYFAAI r&0--g_a75K#l^#<5B%zFrbo=lp#5*?vYN(|RAVXV54pKtkE#3*J0nE# literal 0 HcmV?d00001 diff --git a/skins/Simple_gray/oper_1.bmp b/skins/Simple_gray/oper_1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c96c4ab184d1321c1e3429fa7f1e83d60261c548 GIT binary patch literal 3054 zcmd^<%MHRX5JbZni8FLS1r)%Yo?HN(pd69NflKIz8W?5KXtXBCMzKM`a>96-@r#$w z{%~J5!`R`zeO?>9E}HdFzu^7b%C4b++p*#}cb!czscVYwa!+lWHQAZ06wC~M@Yyn+ zn`IDm%U=6Fal+3ybYcoN4bFfYLWs|<#rNlhGakC3#@S~^)ai;EjQdQp3f)cPztI*iM(bk!;b07kYA?l=?%X*B7+AGx6$1c19R+a! delta 21 WcmdPUm>?nW;>8OF7+AGx6$1c5uLZvV diff --git a/skins/neutral/neutral_lilac/default.dtp.asm b/skins/neutral/neutral_lilac/default.dtp.asm index 852df2ef58..958159d938 100644 --- a/skins/neutral/neutral_lilac/default.dtp.asm +++ b/skins/neutral/neutral_lilac/default.dtp.asm @@ -5,7 +5,7 @@ grab_button dd 0xcecece grab_button_text dd 0x000000 grab_text dd 0xffffff work dd 0xE8E8E8 -work_button dd 0xE8E8E8 +work_button dd 0xcecece work_button_text dd 0x000000 work_text dd 0x000000 work_graph dd 0xAAAAAA \ No newline at end of file