forked from KolibriOS/kolibrios
Unz: use @notify instead on dialog window when unarchiving error occurs to prevent many window creating
git-svn-id: svn://kolibrios.org@7162 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
217ed6f176
commit
d82cdb9873
@ -522,66 +522,15 @@ proc SayErr num_strings:dword, strings:dword,num_buttons:dword, buttons:dword
|
|||||||
mov ebx,[strings]
|
mov ebx,[strings]
|
||||||
m2m [errmess0], dword [ebx]
|
m2m [errmess0], dword [ebx]
|
||||||
.l1:
|
.l1:
|
||||||
mcall 51,1,threadSayErr,stackDlg
|
|
||||||
|
m2m [fsRunNotifyOK.param],[errmess0]
|
||||||
|
mcall 70,fsRunNotifyOK
|
||||||
|
|
||||||
popad
|
popad
|
||||||
mov eax,1
|
mov eax,1
|
||||||
ret
|
ret
|
||||||
endp
|
endp
|
||||||
|
|
||||||
proc SimpleSayErr str:dword
|
|
||||||
pushad
|
|
||||||
m2m [errmess0],[str]
|
|
||||||
mcall 51,1,threadSayErr,stackDlg
|
|
||||||
popad
|
|
||||||
ret
|
|
||||||
endp
|
|
||||||
|
|
||||||
|
|
||||||
proc threadSayErr
|
|
||||||
mcall 40, 111b+0C000000h
|
|
||||||
.wm_redraw:
|
|
||||||
mcall 12, 1
|
|
||||||
mcall 48, 3, sc, sizeof.system_colors
|
|
||||||
mov edx, [sc.work]
|
|
||||||
or edx, 0x33000000
|
|
||||||
mcall 0, <220,WIN_W>, <220,110>, , , title
|
|
||||||
|
|
||||||
mov ecx,[sc.work_text]
|
|
||||||
or ecx,90000000h
|
|
||||||
mov edx,[errmess0]
|
|
||||||
mcall 4, <15,11>
|
|
||||||
|
|
||||||
mcall 8, <105,100>,<45,25>,1,[sc.work_button]
|
|
||||||
mov ecx,[sc.work_button_text]
|
|
||||||
or ecx,90000000h
|
|
||||||
mcall 4, <147,51>, , strOk
|
|
||||||
|
|
||||||
mcall 12, 2
|
|
||||||
|
|
||||||
.still:
|
|
||||||
mcall 10
|
|
||||||
cmp eax, 1
|
|
||||||
je .wm_redraw
|
|
||||||
cmp eax, 2
|
|
||||||
je .wm_key
|
|
||||||
cmp eax, 3
|
|
||||||
je .wm_button
|
|
||||||
jmp .still
|
|
||||||
|
|
||||||
.wm_button:
|
|
||||||
mcall 17
|
|
||||||
|
|
||||||
cmp ah, 1
|
|
||||||
je .exit
|
|
||||||
jmp .still
|
|
||||||
|
|
||||||
.wm_key:
|
|
||||||
mcall 2
|
|
||||||
jmp .still
|
|
||||||
.exit:
|
|
||||||
mcall -1
|
|
||||||
endp
|
|
||||||
|
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
@ -730,7 +679,7 @@ bWinChild db 0 ;1 -
|
|||||||
redInput db 0 ;1 - ¯®¤á¢¥â¨âì ªà áë¬ ¤¯¨áì
|
redInput db 0 ;1 - ¯®¤á¢¥â¨âì ªà áë¬ ¤¯¨áì
|
||||||
|
|
||||||
if lang eq ru
|
if lang eq ru
|
||||||
title db 'uNZ v0.11 - <20> ᯠª®¢é¨ª Zip ¨ 7z',0
|
title db 'uNZ v0.12 - <20> ᯠª®¢é¨ª Zip ¨ 7z',0
|
||||||
strGo db '<27> ᯠª®¢ âì',0
|
strGo db '<27> ᯠª®¢ âì',0
|
||||||
strInp db ' €à娢',0
|
strInp db ' €à娢',0
|
||||||
strPath db 'ˆ§¢«¥çì ¢',0
|
strPath db 'ˆ§¢«¥çì ¢',0
|
||||||
@ -744,7 +693,7 @@ if lang eq ru
|
|||||||
strNotSupport db "'<27>¥¯®¤¤¥à¦¨¢ ¥¬ë© ä®à¬ â à娢 ' -E",0
|
strNotSupport db "'<27>¥¯®¤¤¥à¦¨¢ ¥¬ë© ä®à¬ â à娢 ' -E",0
|
||||||
strNotFound db "'” ©« ¥ ©¤¥' -E",0
|
strNotFound db "'” ©« ¥ ©¤¥' -E",0
|
||||||
else
|
else
|
||||||
title db 'uNZ v0.11 - Unarchiver of Zip and 7z',0
|
title db 'uNZ v0.12 - Unarchiver of Zip and 7z',0
|
||||||
strGo db 'Unpack',0
|
strGo db 'Unpack',0
|
||||||
strInp db 'Archive',0
|
strInp db 'Archive',0
|
||||||
strPath db 'Extract to',0
|
strPath db 'Extract to',0
|
||||||
|
Loading…
Reference in New Issue
Block a user