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

Notify3: del HARDDRRIVE icon, integration in @icon and mouseemul

Browse Source 
git-svn-id: svn://kolibrios.org@4814 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
eAndrew 2014-04-10 13:37:25 +00:00
parent ffd240bc4f
commit f56c212b3b
7 changed files with 30 additions and 36 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: 9.6 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

16
programs/system/icon_new/@icon.asm
View File

@ -1052,15 +1052,15 @@ else
end if end if
if lang eq ru if lang eq ru
ErrRunProg db 'Žè¨¡ª  § ¯ã᪠ ¯à®£à ¬¬ë',0 ErrRunProg db '"Icon\nŽè¨¡ª  § ¯ã᪠ ¯à®£à ¬¬ë" -tE"',0
WarningSave db '<EFBFBD>¥ § ¡ã¤ì⥠á®åà ­¨âì ¨§¬¥­¥­¨ï, § ¯ãáâ¨âì RDSave',0 WarningSave db '"Icon\n<EFBFBD>¥ § ¡ã¤ì⥠á®åà ­¨âì ¨§¬¥­¥­¨ï, § ¯ãáâ¨âì RDSave" -tI',0
ErrNotFoundIni db '<EFBFBD>¥ ­ ©¤¥­ icon.ini',0 ErrNotFoundIni db '"Icon\n<EFBFBD>¥ ­ ©¤¥­ icon.ini" -tE',0
ErrName db 'ˆ¬ï "rbmenu" § à¥§¥à¢¨à®¢ ­®',0 ErrName db '"Icon\nˆ¬ï "rbmenu" § à¥§¥à¢¨à®¢ ­®" -tE',0
else else
ErrRunProg db 'Error runing program',0 ErrRunProg db '"Icon\nError runing program" -tE',0
WarningSave db 'Do not forget to save the changes, run the RDSave',0 WarningSave db '"Icon\nDo not forget to save the changes, run the RDSave" -tI',0
ErrNotFoundIni db 'icon.ini not found',0 ErrNotFoundIni db '"Icon\nicon.ini not found" -tE',0
ErrName db 'The name "rbmenu" reserved',0 ErrName db '"Icon\nThe name "rbmenu" reserved" -tE',0
end if end if
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------

6
programs/system/mousemul/trunk/mousemul.asm
View File

@ -286,11 +286,11 @@ UDATA
mouse_timer_ticks dd 0 mouse_timer_ticks dd 0
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
if lang eq ru 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 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 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 end if
notifyapp: notifyapp:

5
programs/system/notify3/notify.asm
View File

@ -28,7 +28,7 @@
jge c } jge c }
LINEH equ 12 LINEH equ 12
ICONS equ 12 ICONS equ 11
;===================================================================== ;=====================================================================
@ -149,8 +149,6 @@
inc ebx inc ebx
cmpe [eax], byte "D", .set_icon cmpe [eax], byte "D", .set_icon
inc ebx inc ebx
cmpe [eax], byte "H", .set_icon
inc ebx
cmpe [eax], byte "P", .set_icon cmpe [eax], byte "P", .set_icon
jmp .next_char jmp .next_char
@ -564,7 +562,6 @@
"C - component\n", \ "C - component\n", \
"M - mail\n", \ "M - mail\n", \
"D - download\n", \ "D - download\n", \
"H - hard disk\n", \
"P - audio player", \ "P - audio player", \
"' -td", 0 "' -td", 0

1
programs/system/notify3/readme.txt
View File

@ -26,5 +26,4 @@
C - component C - component
M - mail M - mail
D - download D - download
H - hard disk
P - audio player P - audio player

1
programs/system/notify3/test#1.sh
View File

@ -1,6 +1,5 @@
#SHS #SHS
@notify Simple notification @notify Simple notification
@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

23
programs/system/notify3/test#2.sh
View File

@ -1,13 +1,12 @@
#SHS #SHS
@notify "Application" -dtA @notify "Application" -tA
@notify "Error" -dtE @notify "Error" -tE
@notify "Warning" -dtW @notify "Warning" -tW
@notify "Ok" -dtO @notify "Ok" -tO
@notify "Network" -dtN @notify "Network" -tN
@notify "Info" -dtI @notify "Info" -tI
@notify "Folder" -dtF @notify "Folder" -tF
@notify "Component" -dtC @notify "Component" -tC
@notify "Mail" -dtM @notify "Mail" -tM
@notify "Download" -dtD @notify "Download" -tD
@notify "Hard disk" -dtH @notify "Audio Player" -tP
@notify "Audio Player" -dtP