diff --git a/data/common/NOTIFY3.PNG b/data/common/NOTIFY3.PNG index 72b9d87f83..abcc23ee1d 100644 Binary files a/data/common/NOTIFY3.PNG and b/data/common/NOTIFY3.PNG differ diff --git a/programs/system/notify3/NOTIFY.ASM b/programs/system/notify3/NOTIFY.ASM index 204427ba2f..3e58bec6b0 100644 --- a/programs/system/notify3/NOTIFY.ASM +++ b/programs/system/notify3/NOTIFY.ASM @@ -28,6 +28,7 @@ jge c } LINEH equ 12 + ICONS equ 12 ;===================================================================== @@ -129,20 +130,28 @@ cmpe [eax], byte "t", .set_title mov ebx, 1 cmpe [eax], byte "A", .set_icon - mov ebx, 2 + inc ebx cmpe [eax], byte "E", .set_icon - mov ebx, 3 + inc ebx cmpe [eax], byte "W", .set_icon - mov ebx, 4 + inc ebx cmpe [eax], byte "O", .set_icon - mov ebx, 5 + inc ebx cmpe [eax], byte "N", .set_icon - mov ebx, 6 + inc ebx cmpe [eax], byte "I", .set_icon - mov ebx, 7 + inc ebx cmpe [eax], byte "F", .set_icon - mov ebx, 8 + inc ebx cmpe [eax], byte "C", .set_icon + inc ebx + cmpe [eax], byte "M", .set_icon + 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 @@ -174,7 +183,7 @@ mcall 70, fi mov edx, dword [buffer + 32] - shl edx, 1 + shl edx, 2 stdcall mem.Alloc, edx mov [img_data.rgb_obj], eax @@ -191,7 +200,7 @@ add eax, 24 mov eax, [eax] ;; eax - data [argb] - mov ecx, 24 * 24 * 8 + mov ecx, 24 * 24 * ICONS alpha: mov ebx, [eax] shr ebx, 24 @@ -237,7 +246,8 @@ ;; CALC WINDOW.Y - mcall 68, 22, sz_shname, 256, 4 + 1 ;OPEN_ALWAYS and WRITE + mcall 68, 22, sz_shname, 256 + 512, 4 + 1 ;OPEN_ALWAYS and WRITE + add eax, 512 mov [shm], eax s_search: @@ -541,17 +551,21 @@ sz_ifile db "/sys/notify3.png", 0 sz_shname db "notify-mem-v01", 0 - sz_std db "'Notify 3. Keys list\n ", 10, \ + sz_std db "'NOTIFY 3\n", \ "d - disable auto-closing\n", \ - "t - first line is title\n", \ - "A - application icon\n", \ - "E - error icon\n", \ - "W - warning icon\n", \ - "O - ok icon\n", \ - "N - network icon\n", \ - "I - info icon\n", \ - "F - folder icon\n", \ - "C - component icon", \ + "t - title\n", \ + "A - application\n", \ + "E - error\n", \ + "W - warning\n", \ + "O - ok\n", \ + "N - network\n", \ + "I - info\n", \ + "F - folder\n", \ + "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 6831cde21d..c3c0701462 100644 --- a/programs/system/notify3/README.TXT +++ b/programs/system/notify3/README.TXT @@ -13,12 +13,18 @@ 2.3 d - disable auto-closing - t - first line is title - A - application icon - E - error icon - W - warning icon - O - ok icon - N - network icon - I - info icon - F - folder icon - C - component icon + t - title + + 2.3.1 ICONS: + A - application + E - error + W - warning + O - ok + N - network + I - info + F - folder + C - component + M - mail + D - download + H - hard disk + P - audio player diff --git a/programs/system/notify3/TEST.SH b/programs/system/notify3/TEST.SH index 646b8dc4b0..64386c0b1c 100644 --- a/programs/system/notify3/TEST.SH +++ b/programs/system/notify3/TEST.SH @@ -1,8 +1,7 @@ -#SHS -cd /sys/ -@notify Simple notification -@notify Simple notification, which will not be closed -@notify "Multiline notification\nwith second line" -@notify "Multiline notification\nwith title" -t -@notify "Notify 3\nNotification with information" -tI -@notify "Error\nGreat error!!!" -tdE \ No newline at end of file +#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 +@notify "Error\nGreat error!!!" -tdE diff --git a/programs/system/notify3/TEST2.SH b/programs/system/notify3/TEST2.SH new file mode 100644 index 0000000000..7542468f69 --- /dev/null +++ b/programs/system/notify3/TEST2.SH @@ -0,0 +1,13 @@ +#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