Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3961 → Rev 3962

/programs/system/icon_new/@icon.asm
48,7 → 48,6
stdcall dll.Load,IMPORTS
test eax,eax
jnz ErrLoadLibs
;-------------------------------------------------------------------------------
 
; unpack deflate
mov eax,[unpack_DeflateUnpack2]
141,8 → 140,11
and eax,0FFh
mov [sbIcons.max_area],eax
 
stdcall [OpenDialog_Init],OpenDialog_data
 
; int3
; mov eax,1
; mov eax,[IconsOffs+eax*4]
; stdcall [ini_del_section],IconIni,eax
; ret
jmp MSGRedrawIcons
 
messages:
298,7 → 300,6
 
;-------------------------------------------------------------------------------
MovingIcon:
;int3
stdcall GetNumIcon,[MouseX],[MouseY],-1
mov [SelIcon],eax
stdcall RestoreBackgrnd,[SelIcon]
367,7 → 368,7
;qweqwe:
 
mov [MovingActiv],1
mcall 51,1,MovingWnd,stack_move ;CreateThread MovingWnd,stack_dlg
mcall 51,1,MovingWnd,stack_dlg ;CreateThread MovingWnd,stack_dlg
.WaitLB:
mcall 37,2 ;GetMouseKey
test al,001b
456,7 → 457,7
jmp @b
@@:
 
mcall 51,1,RButtonWin,stack_rb ;CreateThread RButtonWin,stack_dlg
mcall 51,1,RButtonWin,stack_dlg ;CreateThread RButtonWin,stack_dlg
 
jmp messages
 
1184,8 → 1185,6
MovingActiv dd 0
DlgAddActiv dd 0
 
slotDlgAdd dd 0
 
IconIni db '/rd/1/icon.ini',0
 
 
1195,6 → 1194,7
keyIco db 'ico',0
keyX db 'x',0
keyY db 'y',0
keyMenuColor db 'menucolor',0
 
;-------------------------------------------------------------------------------
IMPORTS:
1243,7 → 1243,6
;----- RButton.inc -------------------------------------------------------------
;-------------------------------------------------------------------------------
secRButt db 'rbmenu',0
keyMenuColor db 'menucolor',0
 
if lang eq ru
RMenuRedrawFon db '¥à¥à¨á®¢ âì',0
1253,14 → 1252,7
RMenuProp db '‘¢®©á⢠',0
RMenuOffMoving db '‡ ªà¥¯¨âì ¨ª®­ª¨',0
RMenuOnMoving db 'Žâªà¥¯¨âì ¨ª®­ª¨',0
else if lang eq et
RMenuRedrawFon db 'Värskenda',0
RMenuAlign db 'Tõmme võrgule',0
RMenuAdd db 'Lisa',0
RMenuDel db 'Kustuta',0
RMenuProp db 'Omadused',0
RMenuOffMoving db 'Paranda ikoonid',0
RMenuOnMoving db 'Ära paranda ikoone',0
 
else
 
RMenuRedrawFon db 'Redraw',0
1278,10 → 1270,7
ErrRunProg db 'Žè¨¡ª  § ¯ã᪠ ¯à®£à ¬¬ë',0
WarningSave db '¥ § ¡ã¤ì⥠á®åà ­¨âì ¨§¬¥­¥­¨ï, § ¯ãáâ¨âì RDSave',0
ErrNotFoundIni db '¥ ­ ©¤¥­ icon.ini',0
else if lang eq et
ErrRunProg db 'Programmi käivitamise viga',0
WarningSave db 'Ära unusta muudatusi salvestada, käivita RDSave',0
ErrNotFoundIni db 'icon.ini ei leitud',0
 
else
 
ErrRunProg db 'Error runing program',0
1297,35 → 1286,27
;------- AddDlg.inc ---------------------------------------------------------------
;-------------------------------------------------------------------------------
if lang eq ru
DTitle db '„®¡ ¢¨âì ¨ª®­ªã',0
DTitleAdd db '„®¡ ¢¨âì ¨ª®­ªã',0
DTitleProp db 'ˆ§¬¥­¨âì ¨ª®­ªã',0
 
DCaptName db 'ˆ¬ï',0
DCaptPath db 'ãâì',0
DCaptParams db ' à ¬¥âàë',0
DCaptIcon db 'ˆª®­ª ',0
;DCaptChange db '.',0
DCaptCreate db '‘®§¤ âì',0
DCaptProperties db 'ˆ§¬¥­¨âì',0
DCaptCancel db 'Žâ¬¥­¨âì',0
 
else if lang eq et
DTitle db 'Lisa ikoon',0
 
DCaptName db 'Nimi',0
DCaptPath db 'Asukoht',0
DCaptParams db 'Parameetrid',0
DCaptIcon db 'Ikoon',0
;DCaptChange db '.',0
DCaptCreate db 'Loo',0
DCaptProperties db 'Muuda',0
DCaptCancel db 'Katkesta',0
 
else
DTitle db 'Add icon',0
DTitleAdd db 'Add icon',0
DTitleProp db 'Change icon',0
 
DCaptName db 'Name',0
DCaptPath db 'Path',0
DCaptParams db 'Parameters',0
DCaptIcon db 'Icon',0
;DCaptChange db '.',0
DCaptCreate db 'Create',0
DCaptProperties db 'Change',0
DCaptCancel db 'Cancel',0
1427,6 → 1408,7
 
SelIcon rd 1
DlgSelIcon rd 1
slotDlgAdd rd 1
 
sc system_colors
 
1435,6 → 1417,7
IconsOffs rd 100
PIcoDB rd 1
 
 
align 4
icon_count rd 1
strip_file rd 1
1451,7 → 1434,7
RMenuHsb rw 1
 
MaxPage rd 1
 
RBMenuColor rd 1
mouse_dd rd 1
 
DAreaName rb NAME_LENGTH+1
1461,17 → 1444,12
 
align 4
RBProcInfo rb 1024
RBMenuColor rd 1
align 4
 
 
 
; OpenDialog
temp_dir_pach rb 1024
fname_Info rb 1024
;-------------------------------------------------------------------------------
rb 256
stack_move:
stack_rb:
rb 1024
stack_dlg:
align 4
/programs/system/icon_new/DlgAdd.inc
367,7 → 367,14
mcall 12,1 ;RedrawWinBeg
mov edx,[sc.work]
or edx,33000000h
mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+185>,,,DTitle
cmp [DlgSelIcon],-1
jne @f
mov edi,DTitleAdd
jmp .l1
@@:
mov edi,DTitleProp
.l1:
mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+185>,,,
 
stdcall [edit_box_draw],edtName
stdcall [edit_box_draw],edtExePath
/programs/system/icon_new/readme.txt
1,5 → 1,5
Äàííàÿ ïðîãðàììà çàìåíÿåò ñòàíäàðòíûé icon.
Äëÿ óñòàíîâêè â ñèñòåìó ñêîïèðóéòå @icon è icon.ini â ñèñòåìíûé
Äëÿ óñòàíîâêè â ñèñòåìó ñêîïèðóéòå @icon è icon.ini íà ñèñòåìíûé
äèñê. Óáåðèòå èç Autorun.dat ñòðîêè ñ çàïóñêîì @rb è icon è äîáàâüòå
ñòðîêó ñ çàïóñêîì @icon (áåç ïàðàìåòðîâ, õîòÿ ýòî íå âàæíî). Ñîõðàíèòå
ñèñòåìíûé äèñê è ïåðåçàãðóçèòå. Âñ¸, ïðîãðàììà óñòàíîâëåíà.