Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7936 → Rev 7937

/programs/system/skincfg/trunk/idata.inc
263,7 → 263,7
.background_flag dd 0 ;+16
.font_color dd 0x0 ;+20
.background_color dd 0x0 ;+24
.text_pointer dd fname ;+28
.text_pointer dd dtp_name ;+28
.work_area_pointer dd text_work_area ;+32
.temp_text_length dd 0 ;+36
;---------------------------------------------------------------------
291,7 → 291,7
.start_path dd open_dialog_path ;+24
.draw_window dd draw_window ;+28
.status dd 0 ;+32
.openfile_pach dd fname ;+36
.openfile_pach dd dtp_name ;+36
.filename_area dd filename_area ;+40
.filter_area dd Filter
.x:
349,9 → 349,6
.end:
db 0
 
start_temp_file_name:
db 'default.dtp',0
 
default_skin:
db '/sys/default.skn',0
default_dtp:
/programs/system/skincfg/trunk/skincfg.asm
23,7 → 23,7
dd IM_END ; file size
dd I_END ; memory
dd stacktop ; stack pointer
dd skin_info ; parameters
dd app_param ; parameters
dd cur_dir_path ; path to file
include 'lang.inc'
30,6 → 30,7
include '../../../proc32.inc'
include '../../../config.inc' ;for nightbuild
include '../../../macros.inc'
include '../../../string.inc'
include '../../../dll.inc'
include 'kglobals.inc'
include 'unpacker.inc'
104,8 → 105,9
test eax,eax
jz close
;---------------------------------------------------------------------
mov edi,filename_area
mov esi,start_temp_file_name
; set default pathes
mov edi,skin_info
mov esi,default_skin
xor eax,eax
cld
@@:
114,8 → 116,7
test eax,eax
jnz @b
 
 
mov edi,fname
mov edi,dtp_name
mov esi,default_dtp
xor eax,eax
cld
124,12 → 125,32
stosb
test eax,eax
jnz @b
;---------------------------------------------------------------------
; check app param
stdcall string.length, app_param
add eax, app_param
mov ecx, [eax-4]
cmp ecx, '.skn'
je load_skin_from_param
cmp ecx, '.dtp'
jne no_param
 
;---------------------------------------------------------------------
load_dtp_from_param:
mov edi,dtp_name
mov esi,app_param
xor eax,eax
cld
@@:
lodsb
stosb
test eax,eax
jnz @b
call load_dtp_file.1
jmp skin_path_ready
 
load_skin_from_param:
mov edi,skin_info
cmp byte [edi], 0
jne skin_path_ready
mov esi,default_skin
mov esi,app_param
xor eax,eax
cld
@@:
137,6 → 158,13
stosb
test eax,eax
jnz @b
call load_skin_file.2
jmp skin_path_ready
 
no_param:
mcall 48,3,color_table,4*10 ; get current colors
call load_skin_file.2
skin_path_ready:
;---------------------------------------------------------------------
;OpenDialog initialisation
157,9 → 185,6
push dword PathShow_data_2
call [PathShow_prepare]
;---------------------------------------------------------------------
mcall 48,3,color_table,4*10 ; get current colors
call load_skin_file.2
;---------------------------------------------------------------------
red:
call draw_window ; at first, draw the window
;---------------------------------------------------------------------
187,7 → 212,7
cmp ah,12 ; load file
jne no_load
 
call load_file
call load_dtp_file
call draw_window
jmp still
;--------------------------------------
291,7 → 316,7
noid1:
jmp still
;---------------------------------------------------------------------
load_file:
load_dtp_file:
;---------------------------------------------------------------------
; invoke OpenDialog
mov [OpenDialog_data.type],dword 0
307,6 → 332,7
 
call draw_PathShow
;---------------------------------------------------------------------
.2:
xor eax, eax
mov ebx, read_info
mov dword [ebx], eax ; subfunction: read
/programs/system/skincfg/trunk/udata.inc
7,7 → 7,7
.blocks dd ? ; 512 bytes
.address dd ?
.workarea dd ?
fname rb 4096 ; filename
dtp_name rb 4096
 
virtual at read_info
write_info:
26,7 → 26,7
.workarea dd ?
skin_info rb 4096
 
;param rb 257
app_param rb 257
 
align 4
app_colours: