XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki 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
if lang eq ru
ErrRunProg db 'Žè¨¡ª  § ¯ã᪠ ¯à®£à ¬¬ë',0
WarningSave db '<EFBFBD>¥ § ¡ã¤ì⥠á®åà ­¨âì ¨§¬¥­¥­¨ï, § ¯ãáâ¨âì RDSave',0
ErrNotFoundIni db '<EFBFBD>¥ ­ ©¤¥­ icon.ini',0
ErrName db 'ˆ¬ï "rbmenu" § à¥§¥à¢¨à®¢ ­®',0
ErrRunProg db '"Icon\nŽè¨¡ª  § ¯ã᪠ ¯à®£à ¬¬ë" -tE"',0
WarningSave db '"Icon\n<EFBFBD>¥ § ¡ã¤ì⥠á®åà ­¨âì ¨§¬¥­¥­¨ï, § ¯ãáâ¨âì RDSave" -tI',0
ErrNotFoundIni db '"Icon\n<EFBFBD>¥ ­ ©¤¥­ 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
;-------------------------------------------------------------------------------

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

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

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

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

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

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

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

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

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

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