Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 6129 → Rev 6130

/programs/develop/info3ds/info3ds.asm
49,7 → 49,7
;
main_wnd_height equ 460 ;¢ëá®â  £« ¢­®£® ®ª­  ¯à®£à ¬¬ë
fn_toolbar db 'toolbar.png',0
IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*12+54
image_data_toolbar dd 0
;
457,36 → 457,36
mov word[buf_0.l],ax
 
mov esi,[sc.work_button]
mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,3
mcall ,(30 shl 16)+20,,4
mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,0x40000003
mcall ,(30 shl 16)+20,,0x40000004
 
cmp byte[can_save],0
je @f
mcall ,(55 shl 16)+20,,5
mcall ,(55 shl 16)+20,,0x40000005
@@:
mcall ,(85 shl 16)+20,,6 ;®ª­® á ª®®à¤¨­ â ¬¨
mcall ,(110 shl 16)+20,,7 ;㤠«¥­¨¥ ¡«®ª 
mcall ,(85 shl 16)+20,,0x40000006 ;®ª­® á ª®®à¤¨­ â ¬¨
mcall ,(110 shl 16)+20,,0x40000007 ;㤠«¥­¨¥ ¡«®ª 
 
mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+7 ;new
mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+5 ;new
 
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mov edx,(32 shl 16)+7 ;open
mov edx,(30 shl 16)+5 ;open
int 0x40
 
cmp byte[can_save],0
je @f
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mov edx,(57 shl 16)+7 ;save
mov edx,(55 shl 16)+5 ;save
int 0x40
sub ebx,IMAGE_TOOLBAR_ICON_SIZE
@@:
 
add ebx,4*IMAGE_TOOLBAR_ICON_SIZE
mov edx,(87 shl 16)+7
mov edx,(85 shl 16)+5
int 0x40
 
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mov edx,(112 shl 16)+7
mov edx,(110 shl 16)+5
int 0x40
 
mov dword[w_scr_t1.all_redraw],1
/programs/develop/info3ds/info3ds_u.asm
54,7 → 54,7
;
main_wnd_height equ 460 ;¢ëá®â  £« ¢­®£® ®ª­  ¯à®£à ¬¬ë
fn_toolbar db 'toolbar.png',0
IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*12+54
image_data_toolbar dd 0
;
491,27 → 491,27
stdcall [kmainmenu_draw], [main_menu]
 
mov esi,[sc.work_button]
mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(24 shl 16)+20,3
mcall ,(30 shl 16)+20,,4 ;open
mcall ,(3d_wnd_l shl 16)+20,,5 ;¢¥àè¨­ë ¢ª«./¢ëª«.
mcall ,((3d_wnd_l+25) shl 16)+20,,6 ;£à ­¨ ¢ª«./¢ëª«.
mcall ,((3d_wnd_l+50) shl 16)+20,,7 ;§ «¨¢ª  £à ­¥© ¢ª«./¢ëª«.
mcall ,((3d_wnd_l+75) shl 16)+20,,8 ;ᢥ⠢ª«./¢ëª«.
mcall ,((3d_wnd_l+100) shl 16)+20,,9 ;á¡à®á
mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(24 shl 16)+20,0x40000003
mcall ,(30 shl 16)+20,,0x40000004 ;open
mcall ,(3d_wnd_l shl 16)+20,,0x40000005 ;¢¥àè¨­ë ¢ª«./¢ëª«.
mcall ,((3d_wnd_l+25) shl 16)+20,,0x40000006 ;£à ­¨ ¢ª«./¢ëª«.
mcall ,((3d_wnd_l+50) shl 16)+20,,0x40000007 ;§ «¨¢ª  £à ­¥© ¢ª«./¢ëª«.
mcall ,((3d_wnd_l+75) shl 16)+20,,0x40000008 ;ᢥ⠢ª«./¢ëª«.
mcall ,((3d_wnd_l+100) shl 16)+20,,0x40000009 ;á¡à®á
 
mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+26 ;new
mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+24 ;new
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,(32 shl 16)+26 ;open
mcall ,,,(30 shl 16)+24 ;open
add ebx,IMAGE_TOOLBAR_ICON_SIZE*6
mcall ,,,((3d_wnd_l+2) shl 16)+26 ;¢¥àè¨­ë ¢ª«./¢ëª«.
mcall ,,,((3d_wnd_l) shl 16)+24 ;¢¥àè¨­ë ¢ª«./¢ëª«.
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+27) shl 16)+26 ;£à ­¨ ¢ª«./¢ëª«.
mcall ,,,((3d_wnd_l+25) shl 16)+24 ;£à ­¨ ¢ª«./¢ëª«.
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+52) shl 16)+26 ;§ «¨¢ª  £à ­¥© ¢ª«./¢ëª«.
mcall ,,,((3d_wnd_l+50) shl 16)+24 ;§ «¨¢ª  £à ­¥© ¢ª«./¢ëª«.
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+77) shl 16)+26 ;ᢥ⠢ª«./¢ëª«.
mcall ,,,((3d_wnd_l+75) shl 16)+24 ;ᢥ⠢ª«./¢ëª«.
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+102) shl 16)+26 ;á¡à®á
mcall ,,,((3d_wnd_l+100) shl 16)+24 ;á¡à®á
 
mov dword[w_scr_t1.all_redraw],1
stdcall [tl_draw], tree1
/programs/develop/info3ds/info_wnd_coords.inc
213,15 → 213,15
int 0x40
 
mov esi,[sc.work_button]
mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (266 shl 16)+20, 3
mcall , (30 shl 16)+20, (266 shl 16)+20, 4
mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (266 shl 16)+20, 0x40000003
mcall , (30 shl 16)+20, (266 shl 16)+20, 0x40000004
 
mov ebx,[image_data_toolbar]
add ebx,3*IMAGE_TOOLBAR_ICON_SIZE
mcall SF_PUT_IMAGE, , (16 shl 16)+16, (7 shl 16)+268 ;load
mcall SF_PUT_IMAGE, , (21 shl 16)+21, (5 shl 16)+266 ;load
 
sub ebx,IMAGE_TOOLBAR_ICON_SIZE
mov edx,(32 shl 16)+268 ;save
mov edx,(30 shl 16)+266 ;save
int 0x40
 
mov dword[w_scr_t3.all_redraw],1
/programs/develop/info3ds/toolbar.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream