Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4006 → Rev 4007

/programs/system/icon_new/@icon.asm
1,5 → 1,3
;  ¯®â®¬: ¤®¡ ¢¨â § £à㧪ã ico ¨ ¢®§¬®¦­®áâì ¢ë¡®à  ¨ª®­ª¨ ­¥ ¨§ iconstrp
 
ICONS_DAT equ '/rd/1/icons.dat'
ICON_STRIP equ '/rd/1/iconstrp.png'
ICON_SIZE equ 68
140,15 → 138,9
and eax,0FFh
mov [sbIcons.max_area],eax
 
; int3
; mov eax,1
; mov eax,[IconsOffs+eax*4]
; stdcall [ini_del_section],IconIni,eax
; ret
;jmp MSGRedrawIcons
mcall 51,1,BGRedrawThread,stack_bredraw
stdcall [OpenDialog_Init],OpenDialog_data
 
 
messages:
mcall 10
sub eax,6
357,8 → 349,8
mcall 5,1 ;Sleep 1
jmp .WaitLB
.endWaitLB:
mov [MovingActiv],0
 
 
mcall 37,0 ;GetMousePos
xor ebx,ebx
mov bx,ax
416,8 → 408,9
 
mov [bNotSave],1
mov [IconNoDraw],-1
mcall 15,3
 
mov [MovingActiv],0 ;⮫쪮 ⥯¥àì ®âª«îç ¥¬ ®ª­® á ¬ëèìî
 
jmp messages
 
;-------------------------------------------------------------------------------
515,8 → 508,6
jne GetIconInd
 
PathToIcon:
;stdcall LoadIcon,edi
;mov esi,eax
mov al,30h ;§ £«ã誠!!!!!!!!!!!!!
mov byte[edi+1],0
 
1158,6 → 1149,7
 
bFixIcons dd 1
bNotSave dd 0
bIcoBuff dd 0 ;1, ¥á«¨ IconArea § ­ïâ
 
LButtonActiv dd 0
RButtonActiv dd 0
1256,7 → 1248,7
ErrRunProg db 'Error runing program',0
WarningSave db 'Do not forget to save the changes, run the RDSave',0
ErrNotFoundIni db 'icon.ini not found',0
ErrName db 'The Name "rbmenu" reserved',0
ErrName db 'The name "rbmenu" reserved',0
end if
 
 
1342,7 → 1334,7
.opendir_pach dd temp_dir_pach ;+16
.dir_default_pach dd communication_area_default_pach ;+20
.start_path dd open_dialog_path ;+24
.draw_window dd DRedraw;draw_window_for_OD ;+28
.draw_window dd DRedrawWin;draw_window_for_OD ;+28
.status dd 0 ;+32
.openfile_pach dd DAreaPath;fname_Info ;+36
.filename_area dd 0;DAreaPath ;+40
1375,6 → 1367,8
IconArea rb 4*ICON_SIZE*ICON_SIZE
;\
 
 
 
ScreenX rw 1
ScreenY rw 1
 
/programs/system/icon_new/DlgAdd.inc
142,7 → 142,7
edit_boxes_set_sys_color edtParams,edtIcon,sc
;edit_boxes_set_sys_color edtIcon,endEdits,sc
 
call DRedraw
call DRedrawWin
 
DMessages:
mcall 10 ;WaitMessage
201,9 → 201,9
 
.DNE3:
and [edtParams.flags],not ed_focus
or [edtIcon.flags],ed_focus
or [edtName.flags],ed_focus
stdcall [edit_box_draw],edtParams
stdcall [edit_box_draw],edtIcon
stdcall [edit_box_draw],edtName
jmp DMessages
 
;.DNE4:
377,7 → 377,7
mcall -1 ;ExitThread
 
;##################################################################
proc DRedraw
proc DRedrawWin
mcall 12,1 ;RedrawWinBeg
mov edx,[sc.work]
or edx,34000000h
474,6 → 474,15
IcoY:DWORD,\
iIcon:DWORD
 
@@: ;¦¤ñ¬, ª®£¤  ®á¢®¡®¤¨âáï ¡ãää¥à
cmp [bIcoBuff],1
jne @f
mcall 5,1
jmp @b
@@:
 
mov [bIcoBuff],1 ;¡«®ª¨à㥬 IconArea
 
mov ecx,[sbIcons.position]
xor eax,eax
m2m dword[iIcon],0
491,7 → 500,6
 
mov [IcoX],ICONSX
 
 
mov ecx,ICONS_DRAW_COUNTW
.DrawIcons:
push ecx
517,7 → 525,7
mov eax,[sc.work]
@@:
 
mov word[edi],ax
mov [edi],ax
shr eax,16
mov [edi+2],al
add edi,3
585,6 → 593,8
loop .DrawIcons2
 
.endProc:
 
mov [bIcoBuff],0 ;à §¡«®ª¨à㥬 ¡ãä¥à
ret
endp
 
/programs/system/icon_new/bgredraw.inc
3,6 → 3,15
mcall 40,010000b
 
BGRTRedrawIcons:
@@:
cmp [bIcoBuff],1 ;¤«ï ¡«®ª¨à®¢ª¨ ¯à¥à¥à¨á®¢ª¨ ¨ª®­®ª
jne @f
mcall 5,1
jmp @b
@@:
 
mov [bIcoBuff],1
 
mcall 48,5
mov dx,ax
shr eax,16
27,6 → 36,7
loop @b
.NoDraw:
 
mov [bIcoBuff],0
 
 
BGRTmessages:
/programs/system/icon_new/icon.ini
1,9 → 1,8
[rbmenu]
 áâனª  ãáâனáâ¢=setup
“¯à ¢«¥­¨¥ ⥬®©=desktop
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
Š®­á®«ì=/rd/1/shell
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
“¯à ¢«¥­¨¥ ⥬®©=desktop
 áâனª  ãáâனáâ¢=setup
menucolor=128,128,128
[KFM]
path=/SYS/FILE MANAGERS/KFM
param=