Add new Blueberries skin

git-svn-id: svn://kolibrios.org@6199 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-02-12 20:18:04 +00:00
parent 5ecdf8246d
commit 2189324326
36 changed files with 270 additions and 31 deletions

View File

@ -1,2 +1,2 @@
if tup.getconfig("NO_FASM") ~= "" then return end if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Shkvorka.skn") tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Shkvorka_blueberries.skn")

Binary file not shown.

View File

@ -0,0 +1,5 @@
@fasm default.dtp.asm default.dtp
@fasm default.asm default.skn
@del default.dtp
@kpack default.skn
@pause

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

View File

@ -3,17 +3,17 @@ include '..\me_skin.inc'
SKIN_PARAMS \ SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height height = bmp_center1.height,\ ; skin height
margins = [6:5:43:3],\ ; margins [left:top:right:bottom] margins = [6:5:43:3],\ ; margins [left:top:right:bottom]
colors active = [binner=0x787878:\ ; border inner colors active = [binner=0xEDEBEB:\ ; border inner
bouter=0x646464:\ ; border outer bouter=0x33383A:\ ; border outer
bframe=0xC5C5C5],\ ; border middle bframe=0xEDEBEB],\ ; border middle
colors inactive = [binner=0x8E8E8E:\ ; border inner colors inactive = [binner=0xEDEBEB:\ ; border inner
bouter=0x646464:\ ; border outer bouter=0x747474:\ ; border outer
bframe=0xE1E1E1],\ ; border middle bframe=0xEDEBEB],\ ; border middle
dtp = 'default.dtp' ; dtp colors dtp = 'default.dtp' ; dtp colors
SKIN_BUTTONS \ SKIN_BUTTONS \
close = [-31:1][27:18],\ ; buttons coordinates close = [-31:1][27:17],\ ; buttons coordinates
minimize = [-58:1][27:18] ; [left:top][width:height] minimize = [-59:1][27:17] ; [left:top][width:height]
SKIN_BITMAPS \ SKIN_BITMAPS \
left active = bmp_left1,\ ; skin bitmaps pointers left active = bmp_left1,\ ; skin bitmaps pointers

View File

@ -0,0 +1,14 @@
struc system_colors
{
.unused1 dd 0x363535
.unused2 dd 0xE7E5E5
.work_3d_dark dd 0xAEA6A6
.work_3d_light dd 0xFBFBFB
.window_title dd 0xF3F3F3
.work dd 0xEDEBEB
.work_button dd 0xD9F382
.work_button_text dd 0x333333
.work_text dd 0x000000
.work_graph dd 0x7E7E7E
}
struct system_colors

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

View File

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@ -0,0 +1,5 @@
@fasm default.dtp.asm default.dtp
@fasm default.asm default.skn
@del default.dtp
@kpack default.skn
@pause

View File

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

View File

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

View File

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

235
skins/Leency/me_skin.inc Normal file
View File

@ -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
}

View File

@ -1,4 +0,0 @@
fasm default.dtp.asm default.dtp
fasm default.asm default.skn
kpack default.skn
pause

View File

@ -1,4 +0,0 @@
fasm default.dtp.asm default.dtp
fasm default.asm default.skn
kpack default.skn
pause

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 B

View File

@ -1,14 +0,0 @@
struc system_colors
{
.frame dd 0x646464
.grab dd 0x000000
.grab_button dd 0x000000
.grab_button_text dd 0x000000
.grab_text dd 0x333333
.work dd 0xE4DFE1
.work_button dd 0x7288B1
.work_button_text dd 0xFEFEFE
.work_text dd 0x000000
.work_graph dd 0x7E7E7E
}
struct system_colors

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -1,6 +1,8 @@
-- Provides list of skins for distribution kit, -- Provides list of skins for distribution kit,
-- included by ../data/Tupfile.lua. -- included by ../data/Tupfile.lua.
skinlist = { skinlist = {
"Leency/Shkvorka/default.skn",
"Leency/Blueberries/default.skn",
"loggy/loggy.skn", "loggy/loggy.skn",
"_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn", "_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn",
"_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn", "_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn",