diff --git a/data/common/notify3.png b/data/common/notify3.png index abcc23ee1d..7a7e736ee7 100644 Binary files a/data/common/notify3.png and b/data/common/notify3.png differ diff --git a/programs/system/icon_new/@icon.asm b/programs/system/icon_new/@icon.asm index c2ba7c5ff4..c71d8088b4 100644 --- a/programs/system/icon_new/@icon.asm +++ b/programs/system/icon_new/@icon.asm @@ -1052,15 +1052,15 @@ else end if if lang eq ru - ErrRunProg db 'Ошибка запуска программы',0 - WarningSave db 'Не забудьте сохранить изменения, запустить RDSave',0 - ErrNotFoundIni db 'Не найден icon.ini',0 - ErrName db 'Имя "rbmenu" зарезервировано',0 + ErrRunProg db '"Icon\nОшибка запуска программы" -tE"',0 + WarningSave db '"Icon\nНе забудьте сохранить изменения, запустить RDSave" -tI',0 + ErrNotFoundIni db '"Icon\nНе найден icon.ini" -tE',0 + ErrName db '"Icon\nИмя "rbmenu" зарезервировано" -tE',0 else - 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 + ErrRunProg db '"Icon\nError runing program" -tE',0 + WarningSave db '"Icon\nDo not forget to save the changes, run the RDSave" -tI',0 + ErrNotFoundIni db '"Icon\nicon.ini not found" -tE',0 + ErrName db '"Icon\nThe name "rbmenu" reserved" -tE',0 end if ;------------------------------------------------------------------------------- diff --git a/programs/system/mousemul/trunk/mousemul.asm b/programs/system/mousemul/trunk/mousemul.asm index 7b5a7d166c..fb087c47fd 100644 --- a/programs/system/mousemul/trunk/mousemul.asm +++ b/programs/system/mousemul/trunk/mousemul.asm @@ -2,17 +2,17 @@ ; compiler: FASM 1.67.23 ; name: Mouse Emulation For KolibriOS ;----------------------------------------------------------------------------- -; version: 1.2 +; version: 1.2 ; last update: 01/06/2012 ; written by: Marat Zakiyanov aka Mario79, aka Mario ; changes: using new functions 66.6 and 66.7 ;----------------------------------------------------------------------------- -; version: 1.1 +; version: 1.1 ; last update: 26/05/2012 ; written by: Lipatov Kirill aka Leency ; changes: shows notify with instructions, while opening program ;----------------------------------------------------------------------------- -; version: 1.0 +; version: 1.0 ; last update: 04/09/2010 ; written by: Marat Zakiyanov aka Mario79, aka Mario ; changes: total optimization of code, @@ -160,8 +160,8 @@ real: mov ebx,edx mov edi,ebx shr ebx,16 ; get x1 -; shl edi,16 ; get y1 -; shr edi,16 +; shl edi,16 ; get y1 +; shr edi,16 and edi,0xffff nullli: @@ -180,8 +180,8 @@ razr: mov ecx,eax shr eax,16 ; get x2 -; shl ecx,16 ; get y2 -; shr ecx,16 +; shl ecx,16 ; get y2 +; shr ecx,16 and ecx,0xffff rightdownli: @@ -286,11 +286,11 @@ UDATA mouse_timer_ticks dd 0 ;----------------------------------------------------------------------------- if lang eq ru - ud_user_message db 'NumLock включает и выключает эмулятор мыши. Управление через Numpad',0 + ud_user_message db '"NumLock включает и выключает эмулятор мыши.\nУправление через Numpad." -I',0 else if lang eq it - ud_user_message db 'NumLock - on/off - usa Numpad per muovere il cursore',0 + ud_user_message db '"NumLock - on/off - usa Numpad per muovere il cursore." -I',0 else - ud_user_message db 'NumLock - on/off mouse emul. Numpad - move cursor',0 + ud_user_message db '"NumLock - on/off mouse emul. Numpad - move cursor." -I',0 end if notifyapp: diff --git a/programs/system/notify3/notify.asm b/programs/system/notify3/notify.asm index 3e58bec6b0..c12cf7f7df 100644 --- a/programs/system/notify3/notify.asm +++ b/programs/system/notify3/notify.asm @@ -28,7 +28,7 @@ jge c } LINEH equ 12 - ICONS equ 12 + ICONS equ 11 ;===================================================================== @@ -149,8 +149,6 @@ inc ebx cmpe [eax], byte "D", .set_icon inc ebx - cmpe [eax], byte "H", .set_icon - inc ebx cmpe [eax], byte "P", .set_icon jmp .next_char @@ -564,7 +562,6 @@ "C - component\n", \ "M - mail\n", \ "D - download\n", \ - "H - hard disk\n", \ "P - audio player", \ "' -td", 0 diff --git a/programs/system/notify3/readme.txt b/programs/system/notify3/readme.txt index c3c0701462..5b48f5a7a9 100644 --- a/programs/system/notify3/readme.txt +++ b/programs/system/notify3/readme.txt @@ -26,5 +26,4 @@ C - component M - mail D - download - H - hard disk P - audio player diff --git a/programs/system/notify3/test#1.sh b/programs/system/notify3/test#1.sh index 64386c0b1c..10279068c7 100644 --- a/programs/system/notify3/test#1.sh +++ b/programs/system/notify3/test#1.sh @@ -1,6 +1,5 @@ #SHS @notify Simple notification -@notify "Simple notification, which will not be closed" -d @notify "Multiline notification\nwith second line" @notify "Multiline notification\nwith title" -t @notify "Notify 3\nNotification with information" -tI diff --git a/programs/system/notify3/test#2.sh b/programs/system/notify3/test#2.sh index 7542468f69..2b6a2b4d9e 100644 --- a/programs/system/notify3/test#2.sh +++ b/programs/system/notify3/test#2.sh @@ -1,13 +1,12 @@ #SHS -@notify "Application" -dtA -@notify "Error" -dtE -@notify "Warning" -dtW -@notify "Ok" -dtO -@notify "Network" -dtN -@notify "Info" -dtI -@notify "Folder" -dtF -@notify "Component" -dtC -@notify "Mail" -dtM -@notify "Download" -dtD -@notify "Hard disk" -dtH -@notify "Audio Player" -dtP \ No newline at end of file +@notify "Application" -tA +@notify "Error" -tE +@notify "Warning" -tW +@notify "Ok" -tO +@notify "Network" -tN +@notify "Info" -tI +@notify "Folder" -tF +@notify "Component" -tC +@notify "Mail" -tM +@notify "Download" -tD +@notify "Audio Player" -tP \ No newline at end of file