Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3921 → Rev 3920

/programs/system/icon_new/build.sh
File deleted
/programs/system/icon_new/ico.inc
File deleted
\ No newline at end of file
/programs/system/icon_new/build.bat
File deleted
/programs/system/icon_new/DlgAdd.inc
6,9 → 6,7
 
DlgAdd:
DlgProp:
 
mov eax,[SelIcon]
mov [DlgSelIcon],eax
cmp eax,-1
jne SetProp
 
94,10 → 92,6
 
 
startDlg:
mcall 9,RBProcInfo,-1
mcall 18,21,dword[RBProcInfo+30]
mov [slotDlgAdd],eax
 
or [edtName.flags],ed_focus
 
mcall 40,100111b ;SetMaskMessage 100111b
114,6 → 108,8
mov dword[MaxPage],1
@@:
 
stdcall [OpenDialog_Init],OpenDialog_data
 
DReDraw:
mcall 48,3,sc,40
 
336,14 → 332,14
mcall 70,fiRunProg
 
 
cmp [DlgSelIcon],-1
cmp [SelIcon],-1
je @f
;㤠«ï¥¬ ¨§ ini áâ àãî ¨ª®­ªã
mov ebx,[DlgSelIcon]
mov ebx,[SelIcon]
mov eax,[IconsOffs+ebx*4]
stdcall [ini_del_section],IconIni,eax
 
stdcall EditIcon,[DlgSelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams
stdcall EditIcon,[SelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams
jmp DExitAndSave
@@:
stdcall AddIcon,[AddX],[AddY],DAreaIcon,DAreaName,DAreaPath,DAreaParams
358,9 → 354,7
stdcall [ini_set_int],IconIni,DAreaName,keyY,[MouseY]
 
DExit:
mov [DlgAddActiv],0
mov [slotDlgAdd],0
mcall -1 ;ExitThread
mcall -1 ;ExitProcess
 
;##################################################################
proc DRedraw
410,7 → 404,7
or ecx,80000000h
mcall ,<309,35+END_ICONS_AREAH>,,DCaptCancel
 
cmp [DlgSelIcon],-1
cmp [SelIcon],-1
jne @f
mpack ebx,255,35+END_ICONS_AREAH
mov edx,DCaptCreate
425,7 → 419,7
mcall ,<315,35+END_ICONS_AREAH>,,DCaptCancel
 
 
cmp [DlgSelIcon],-1
cmp [SelIcon],-1
jne @f
mpack ebx,257,35+END_ICONS_AREAH
mov edx,DCaptCreate
/programs/system/icon_new/RButton.inc
63,7 → 63,7
 
xor ebx,ebx
mov bx,[RMenuW]
mov esi,[RBMenuColor];0888888h
mov esi,0888888h
mcall 8
 
mov ebx,50000h
93,7 → 93,7
mov cx,dx
 
;¯¥à¢ ï à §¤¥«¨â¥«ì­ ï «¨­¨ï
mcall 38,,,[RBMenuColor];0888888h
mcall 38,,,0888888h
add ecx,00010001h
mcall ,,,
 
103,7 → 103,7
shl ecx,16
mov cx,16
 
mcall 8,,,idbRRedrawFon,[RBMenuColor];0888888h ;3 ª­®¯ª¨ ¢â®à®£® ¡«®ª 
mcall 8,,,idbRRedrawFon,0888888h ;3 ª­®¯ª¨ ¢â®à®£® ¡«®ª 
add ecx,00100000h
mcall ,,,idbRAlign
add ecx,00100000h
134,7 → 134,7
mov dx,cx
shl ecx,16
mov cx,dx
mcall 38,,,[RBMenuColor];0888888h
mcall 38,,,0888888h
add ecx,00010001h
mcall ,,,
;------------
146,9 → 146,9
cmp dword[SelIcon],-1
je @f
 
mcall 8,,,idbRDel,[RBMenuColor];0888888h
mcall 8,,,idbRDel,0888888h
add ecx,00100000h
mcall ,,,idbRProp,[RBMenuColor];0888888h
mcall ,,,idbRProp,0888888h
 
mov ebx,50000h
mov bx,word[esp]
160,7 → 160,7
jmp .endRM
@@:
 
mcall 8,,,idbRAdd,[RBMenuColor];0888888h
mcall 8,,,idbRAdd,0888888h
mov ebx,50000h
mov bx,word[esp]
add bx,16*3+4+5
266,10 → 266,7
jmp RBWExit
 
RBAdd:
cmp [DlgAddActiv],1
je RBWSetActivWin
mov [DlgAddActiv],1
 
; mov [DlgAddActiv],1
mcall 51,1,DlgAdd,stack_dlg ;CreateThread DlgAdd,stack_dlg
jmp RBWExit
 
292,16 → 289,10
jmp RBRedrawFon
 
RBPropeties:
cmp [DlgAddActiv],1
je RBWSetActivWin
mov [DlgAddActiv],1
 
; mov [DlgAddActiv],1
mcall 51,1,DlgProp,stack_dlg ;CreateThread DlgProp,stack_dlg
jmp RBWExit
 
RBWSetActivWin:
mcall 18,3,[slotDlgAdd]
jmp RBWExit
 
 
proc AlignIcons
452,19 → 443,6
 
push ebx esi edi
 
mov edi,[key_name]
mov esi,keyMenuColor
@@: lodsb
scasb
jne @f
test al,al
jnz @b
 
stdcall [ini_get_color],[f_name],[sec_name],[key_name],0888888h
mov [RBMenuColor],eax
ret
@@:
 
mov edi,[key_name] ;®¯à¥¤¥«ï¥¬ è¨à¨­ã ¬¥­î
xor eax,eax
or ecx,-1
513,7 → 491,7
 
proc Ini_SavePos stdcall,f_name,sec_name
push ebx edi esi
 
;int3
xor ebx,ebx
.SearchSect:
mov edi,[IconsOffs+ebx*4]
542,7 → 520,6
repne scasb
repne scasb
 
;int3
movzx eax,word[edi+2]
test eax,8000h
jz @f
/programs/system/icon_new/@icon.asm
38,6 → 38,7
include 'lang.inc'
include '../../macros.inc'
include '../../proc32.inc'
;include '../../API.inc'
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
include '../../dll.inc'
;include '../../debug.inc'
48,7 → 49,6
stdcall dll.Load,IMPORTS
test eax,eax
jnz ErrLoadLibs
;-------------------------------------------------------------------------------
 
; unpack deflate
mov eax,[unpack_DeflateUnpack2]
141,8 → 141,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 → 301,6
 
;-------------------------------------------------------------------------------
MovingIcon:
;int3
stdcall GetNumIcon,[MouseX],[MouseY],-1
mov [SelIcon],eax
stdcall RestoreBackgrnd,[SelIcon]
367,7 → 369,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 → 458,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
 
1176,16 → 1178,13
align 4
MaxNumIcon dd 0 ;ª®«¨ç¥á⢮ ¨ª®­®ª
 
bFixIcons dd 1
bFixIcons dd 0
bNotSave dd 0
 
LButtonActiv dd 0
RButtonActiv dd 0
MovingActiv dd 0
DlgAddActiv dd 0
 
slotDlgAdd dd 0
 
IconIni db '/rd/1/icon.ini',0
 
 
1243,7 → 1242,6
;----- RButton.inc -------------------------------------------------------------
;-------------------------------------------------------------------------------
secRButt db 'rbmenu',0
keyMenuColor db 'menucolor',0
 
if lang eq ru
RMenuRedrawFon db '¥à¥à¨á®¢ âì',0
1293,6 → 1291,7
DCaptPath db 'ãâì',0
DCaptParams db ' à ¬¥âàë',0
DCaptIcon db 'ˆª®­ª ',0
;DCaptChange db '.',0
DCaptCreate db '‘®§¤ âì',0
DCaptProperties db 'ˆ§¬¥­¨âì',0
DCaptCancel db 'Žâ¬¥­¨âì',0
1304,6 → 1303,7
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
1404,7 → 1404,6
AddY rd 1
 
SelIcon rd 1
DlgSelIcon rd 1
 
sc system_colors
 
1439,17 → 1438,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/icon.ini
3,7 → 3,6
„¨á¯¥âç¥à ¯à®æ¥áᮢ=/rd/1/cpu
“¯à ¢«¥­¨¥ ⥬®©=desktop
 áâனª  ãáâனáâ¢=setup
menucolor=128,128,128
[KFM]
path=/SYS/FILE MANAGERS/KFM
param=