Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 7255 → Rev 7256

/skins/Leency/AreaSq/default.asm
2,7 → 2,7
 
SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height
margins = [9:6:37:6],\ ; margins [left:top:right:bottom]
margins = [9:4:37:0],\ ; margins [left:top:right:bottom]
colors active = [binner=0xE1E1E1:\ ; border inner color
bouter=0x3E3635:\ ; border outer color
bframe=0xE1E1E1],\ ; border frame color
/skins/Leency/Latte/left2.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/Leency/Latte/center2.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/Leency/Latte/build.bat
1,3 → 1,4
delete default.skn
fasm default.dtp.asm default.dtp
fasm default.asm default.skn
fasm default.asm default.skn
@pause
/skins/Leency/Latte/default.asm
2,7 → 2,7
 
SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height
margins = [5:6:40:4],\ ; margins [left:top:right:bottom]
margins = [5:2:40:0],\ ; margins [left:top:right:bottom]
colors active = [binner=0xCACACA:\ ; border inner color
bouter=0xA1A1A1:\ ; border outer color
bframe=0xCACACA],\ ; border frame color
12,8 → 12,8
dtp = 'default.dtp' ; dtp colors
 
SKIN_BUTTONS \
close = [-18:4][13:14],\ ; buttons coordinates
minimize = [-36:4][13:14] ; [left:top][width:height]
close = [-19:3][16:16],\ ; buttons coordinates
minimize = [-37:3][16:16] ; [left:top][width:height]
 
SKIN_BITMAPS \
left active = bmp_left1,\ ; skin bitmaps pointers
24,8 → 24,8
base inactive = bmp_center2
 
BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps
BITMAP bmp_left2, 'left2.bmp'
BITMAP bmp_left2, 'left1.bmp'
BITMAP bmp_right1, 'right1.bmp'
BITMAP bmp_right2, 'right2.bmp'
BITMAP bmp_center1,'center1.bmp'
BITMAP bmp_center2,'center2.bmp'
BITMAP bmp_center2,'center1.bmp'
/skins/Leency/Latte/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/skins/Leency/Latte/default.dtp.asm
2,8 → 2,8
{
.frame dd 0x006393
.grab dd 0x0077b0
.grab_button dd 0xc0c0c0
.grab_button_text dd 0x000000
.work_dark dd 0xA5A5A5
.work_light dd 0xE4E4E4
.title_text dd 0x444444
.work dd 0xCACACA
.work_button dd 0xE9E9E9
/skins/Leency/Latte/right1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/skins/Leency/Latte/right2.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/skins/Leency/ObsidianOS/default.asm
2,7 → 2,7
 
SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height
margins = [6:5:43:3],\ ; margins [left:top:right:bottom]
margins = [7:5:43:3],\ ; margins [left:top:right:bottom]
colors active = [binner=0x202020:\ ; border inner
bouter=0x000000:\ ; border outer
bframe=0x555555],\ ; border middle
/skins/Leency/Octo_flat/default.asm
2,7 → 2,7
 
SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height
margins = [25:4:40:6],\ ; margins [left:top:right:bottom]
margins = [25:2:40:0],\ ; margins [left:top:right:bottom]
colors active = [binner=0xE1E1E1:\ ; border inner color
bouter=0x204962:\ ; border outer color
bframe=0xE1E1E1],\ ; border frame color
/skins/Leency/Octo_flat/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/skins/Leency/Shkvorka/default.dtp.asm
2,8 → 2,8
{
.taskbar dd 0x586786
.taskbar_text dd 0xFEFEFE
.work_3d_dark dd 0xC0BBB4
.work_3d_light dd 0xECE9E5
.work_dark dd 0xC0BBB4
.work_light dd 0xECE9E5
.window_title dd 0x333333
.work dd 0xDDD7CF
.work_button dd 0x7887A6
/skins/_old/night/left_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/_old/night/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/_old/night/base_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/_old/night/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/_old/night/night.asm
File deleted
/skins/_old/night/Tupfile.lua
File deleted
/skins/_old/night/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/_old/night/skin.inc
File deleted
/skins/_old/night/build_skn.bat
File deleted
\ No newline at end of file
/skins/_old/night/oper_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/_old/night/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/skins/night/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/skins/night/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/skins/night/night.asm
0,0 → 1,33
;SKIN (.SKN) - COMPILE WITH FASM
 
include 'skin.inc'
 
SKIN_PARAMS \
height = bmp_base.height,\ ; skin height
margins = [5:4:37:0],\ ; margins [left:top:right:bottom]
colors active = [binner=0x000000:\ ; border inner color
bouter=0x000000:\ ; border outer color
bframe=0x2d2d2d],\ ; border frame color
colors inactive = [binner=0x000000:\ ; border inner color
bouter=0x000000:\ ; border outer color
bframe=0x2d2d2d],\ ; border frame color
dtp = 'default.dtp' ; dtp colors
 
SKIN_BUTTONS \
close = [-19:3][16:16],\ ; buttons coordinates
minimize = [-36:3][16:16] ; [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.bmp'
BITMAP bmp_oper1,'oper_1.bmp'
BITMAP bmp_base1,'base.bmp'
/skins/night/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/skins/night/oper_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/skins/night/skin.inc
0,0 → 1,239
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2004-2017. 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 equ _#_name
_file::
file _fname
end virtual
load w dword from _file:_bmp.i.biWidth
load h dword from _file:_bmp.i.biHeight
load hsize dword from _file:_bmp.h.bfOffBits
align 4
label _name
.width = w
.height = h
dd w,h
a=hsize+(w*3+(w mod 4))*(h-1)
size = $
repeat h
repeat w
load r from _file:a+0
load g from _file:a+1
load b from _file:a+2
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
__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
dd @f - $ - 4
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
}
/skins/night/Tupfile.lua
0,0 → 1,2
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("night.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "night.skn")
/skins/night/build_skn.bat
0,0 → 1,2
fasm night.asm night.skn
pause
/skins/night/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/skins/skinlist.lua
8,6 → 8,7
"Leency/Shkvorka/Shkvorka.skn",
"Leency/Yeah/Yeah.skn",
"loggy/loggy.skn",
"night/night.skn",
"Win10/Win10.skn",
"_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn",
"_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn",
111,7 → 112,6
"_old/neutral/neutral_blue/neutral_blue.skn",
"_old/neutral/neutral_green/neutral_green.skn",
"_old/neutral/neutral_lilac/neutral_lilac.skn",
"_old/night/night.skn",
"_old/nix/nix_big/nix_big.skn",
"_old/nix/nix_medium/nix_medium.skn",
"_old/nix/nix_small/nix_small.skn",