sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Notify 3: fix TEST.SH (-d key); add TEST2.SH (all icons); new icons in NOTIFY3.PNG; some changes in source...

Browse Source 
git-svn-id: svn://kolibrios.org@4809 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
eAndrew 2014-04-09 15:42:05 +00:00
parent bc86f5a110
commit 2ccfb21fdb
5 changed files with 69 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/common/NOTIFY3.PNG
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

54
programs/system/notify3/NOTIFY.ASM
View File

@ -28,6 +28,7 @@
jge c } jge c }
LINEH equ 12 LINEH equ 12
ICONS equ 12
;===================================================================== ;=====================================================================
@ -129,20 +130,28 @@
cmpe [eax], byte "t", .set_title cmpe [eax], byte "t", .set_title
mov ebx, 1 mov ebx, 1
cmpe [eax], byte "A", .set_icon cmpe [eax], byte "A", .set_icon
mov ebx, 2 inc ebx
cmpe [eax], byte "E", .set_icon cmpe [eax], byte "E", .set_icon
mov ebx, 3 inc ebx
cmpe [eax], byte "W", .set_icon cmpe [eax], byte "W", .set_icon
mov ebx, 4 inc ebx
cmpe [eax], byte "O", .set_icon cmpe [eax], byte "O", .set_icon
mov ebx, 5 inc ebx
cmpe [eax], byte "N", .set_icon cmpe [eax], byte "N", .set_icon
mov ebx, 6 inc ebx
cmpe [eax], byte "I", .set_icon cmpe [eax], byte "I", .set_icon
mov ebx, 7 inc ebx
cmpe [eax], byte "F", .set_icon cmpe [eax], byte "F", .set_icon
mov ebx, 8 inc ebx
cmpe [eax], byte "C", .set_icon 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 jmp .next_char
@ -174,7 +183,7 @@
mcall 70, fi mcall 70, fi
mov edx, dword [buffer + 32] mov edx, dword [buffer + 32]
shl edx, 1 shl edx, 2
stdcall mem.Alloc, edx stdcall mem.Alloc, edx
mov [img_data.rgb_obj], eax mov [img_data.rgb_obj], eax
@ -191,7 +200,7 @@
add eax, 24 add eax, 24
mov eax, [eax] ;; eax - data [argb] mov eax, [eax] ;; eax - data [argb]
mov ecx, 24 * 24 * 8 mov ecx, 24 * 24 * ICONS
alpha: alpha:
mov ebx, [eax] mov ebx, [eax]
shr ebx, 24 shr ebx, 24
@ -237,7 +246,8 @@
;; CALC WINDOW.Y ;; 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 mov [shm], eax
s_search: s_search:
@ -541,17 +551,21 @@
sz_ifile db "/sys/notify3.png", 0 sz_ifile db "/sys/notify3.png", 0
sz_shname db "notify-mem-v01", 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", \ "d - disable auto-closing\n", \
"t - first line is title\n", \ "t - title\n", \
"A - application icon\n", \ "A - application\n", \
"E - error icon\n", \ "E - error\n", \
"W - warning icon\n", \ "W - warning\n", \
"O - ok icon\n", \ "O - ok\n", \
"N - network icon\n", \ "N - network\n", \
"I - info icon\n", \ "I - info\n", \
"F - folder icon\n", \ "F - folder\n", \
"C - component icon", \ "C - component\n", \
"M - mail\n", \
"D - download\n", \
"H - hard disk\n", \
"P - audio player", \
"' -td", 0 "' -td", 0
;---------------------------- ;----------------------------

24
programs/system/notify3/README.TXT
View File

@ -13,12 +13,18 @@
2.3 <KEYS> 2.3 <KEYS>
d - disable auto-closing d - disable auto-closing
t - first line is title t - title
A - application icon
E - error icon 2.3.1 ICONS:
W - warning icon A - application
O - ok icon E - error
N - network icon W - warning
I - info icon O - ok
F - folder icon N - network
C - component icon I - info
F - folder
C - component
M - mail
D - download
H - hard disk
P - audio player

3
programs/system/notify3/TEST.SH
View File

@ -1,7 +1,6 @@
#SHS #SHS
cd /sys/
@notify Simple notification @notify Simple notification
@notify Simple notification, which will not be closed @notify "Simple notification, which will not be closed" -d
@notify "Multiline notification\nwith second line" @notify "Multiline notification\nwith second line"
@notify "Multiline notification\nwith title" -t @notify "Multiline notification\nwith title" -t
@notify "Notify 3\nNotification with information" -tI @notify "Notify 3\nNotification with information" -tI

13
programs/system/notify3/TEST2.SH Normal file
View File

@ -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