WebSVN – Kolibri OS – Diff – /programs/system/icon_new/DlgAdd.inc


idbChange	equ 2
idbCreate	equ 3
idbLeft 	equ 4
idbRight	equ 5
idbCancel	equ 1
 
DlgAdd:
DlgProp:
 
	mov	eax,[SelIcon]
	mov	[DlgSelIcon],eax
	cmp	eax,-1
	jne	SetProp
 
    ;-----------
	mov	eax,[MouseX]
	mov	ebx,[MouseY]
 
	cmp	ax,[wsX]
	jae	@f
	mov	ax,[wsX]
      @@:
 
	cmp	bx,[wsY]
	jae	@f
	mov	bx,[wsY]
      @@:			    ;eax,ebx - ðåàëüíàÿ êîîðäèíàòà. Âñå êîîðäèíàòû â ïðîãå îòíîñèòåëüíî ëåâîãî âåðõíåãî óãëà ðàáî÷åé îáëàñòè
 
	xor	edx,edx
	mov	dx,[wsXe]
	sub	edx,ICON_SIZE
	cmp	eax,edx
	jbe	@f
	mov	eax,edx
      @@:
 
	mov	dx,[wsYe]
	sub	edx,ICON_SIZE
	cmp	ebx,edx
	jbe	@f
	mov	ebx,edx
      @@:
 
	xor	edx,edx 	     ;ïðåîáðàçîâûâàåì â îòíîñèòåëüíûå
	mov	dx,[wsW]
	shr	edx,1
	add	dx,[wsX]
	cmp	eax,edx
	jbe	@f
	sub	ax,[wsXe]
	inc	ax
	jmp	.dlg1
      @@:
	sub	ax,[wsX]
    .dlg1:
 
	xor	edx,edx
	mov	dx,[wsH]
	shr	edx,1
	add	dx,[wsY]
	cmp	ebx,edx
	jbe	@f
	sub	bx,[wsYe]
	inc	bx
	jmp	.dlg2
      @@:
	sub	bx,[wsY]
    .dlg2:
 
	mov	[AddX],eax
	mov	[AddY],ebx
    ;-----------
 
	mov	ecx,NAME_LENGTH
	mov	edi,DAreaName
	xor	al,al
	rep	stosb
	mov	dword[edtName.size],0
	mov	dword[edtName.pos],0
 
	mov	ecx,256
	mov	edi,DAreaPath
	rep	stosb
	mov	dword[edtExePath.size],0
	mov	dword[edtExePath.pos],0
 
	mov	ecx,256
	mov	edi,DAreaParams
	rep	stosb
	mov	dword[edtParams.size],0
	mov	dword[edtParams.pos],0
 
	mov	ecx,256
	mov	edi,DAreaIcon
	rep	stosb
	mov	dword[edtIcon.size],0
	mov	dword[edtIcon.pos],0
 
	jmp	startDlg
    ;--------
SetProp:
	mov	esi,[IconsOffs+eax*4]
	mov	edi,DAreaName
	xor	ecx,ecx
     @@:
	lodsb
	stosb
	inc	ecx
	test	al,al
	jnz	@b
	dec	ecx
	mov	dword[edtName.size],ecx
	mov	dword[edtName.pos],ecx
 
	xor	ecx,ecx
	mov	edi,DAreaPath
     @@:
	lodsb
	stosb
	inc	ecx
	test	al,al
	jnz	@b
	dec	ecx
	mov	dword[edtExePath.size],ecx
	mov	dword[edtExePath.pos],ecx
 
	xor	ecx,ecx
	mov	edi,DAreaParams
     @@:
	lodsb
	stosb
	inc	ecx
	test	al,al
	jnz	@b
	dec	ecx
	mov	dword[edtParams.size],ecx
	mov	dword[edtParams.pos],ecx
 
	xor	ecx,ecx
	mov	edi,DAreaIcon
     @@:
	lodsb
	stosb
	inc	ecx
	test	al,al
	jnz	@b
	dec	ecx
	mov	dword[edtIcon.size],ecx
	mov	dword[edtIcon.pos],ecx
 
 
startDlg:
	mcall	9,RBProcInfo,-1
	mcall	18,21,dword[RBProcInfo+30]
	mov	[slotDlgAdd],eax
 
	or	[edtName.flags],ed_focus
 
	mcall	40,100111b	;SetMaskMessage 100111b
	xor	eax,eax
	mov	dword[MaxPage],0
      @@:
	add	eax,ICONS_DRAW_COUNTW
	inc	dword[MaxPage]
	cmp	eax,[icon_count]
	jb	@b
	dec	dword[MaxPage]
	cmp	dword[MaxPage],0
	jne	@f
	mov	dword[MaxPage],1
      @@:
 
DReDraw:
	mcall	48,3,sc,40
 
	mov	eax,[sc.work]
	rol	eax,16
	add	al,9
	jnc	@f
	mov	al,0FFh
      @@:
	rol	eax,16
	add	al,9
	jnc	@f
	mov	al,0FFh
      @@:
	add	ah,9
	jnc	@f
	mov	ah,0FFh
      @@:
 
	mov	[sbIcons.bckg_col],eax
	m2m	[sbIcons.frnt_col],[sc.work]
	m2m	[sbIcons.line_col],[sc.work_graph]
 
	edit_boxes_set_sys_color edtName,edtExePath,sc
	edit_boxes_set_sys_color edtExePath,edtParams,sc
	edit_boxes_set_sys_color edtParams,edtIcon,sc
	;edit_boxes_set_sys_color edtIcon,endEdits,sc
 
	call	DRedrawWin
 
DMessages:
	mcall	10		;WaitMessage
 
	dec	eax
	jz	DReDraw
	dec	eax
	jz	DKey
	dec	eax
	jz	DButton
	sub	eax,3
	jz	DMouse
 
	jmp  DMessages
 
 
;---------------------------------------------------------------------
DKey:
	mcall	2		;GetKeyPressed
	cmp	ah,1Bh
	je	DExit
	cmp	ah,9  ;Tab
	je	DNextEdit
	stdcall [edit_box_key],edtName
	stdcall [edit_box_key],edtExePath
	stdcall [edit_box_key],edtParams
	;stdcall [edit_box_key],edtIcon
 
	jmp	DMessages
 
 
DNextEdit:
	test	[edtName.flags],ed_focus
	jne	 .DNE1
	test	[edtExePath.flags],ed_focus
	jne	 .DNE2
	test	[edtParams.flags],ed_focus
	jne	 .DNE3
	;test    [edtIcon.flags],ed_focus
	;jne      .DNE4
	jmp	DMessages
 
    .DNE1:
	and	[edtName.flags],not ed_focus
	or	[edtExePath.flags],ed_focus
	stdcall [edit_box_draw],edtName
	stdcall [edit_box_draw],edtExePath
	jmp	DMessages
 
    .DNE2:
	and	[edtExePath.flags],not ed_focus
	or	[edtParams.flags],ed_focus
	stdcall [edit_box_draw],edtExePath
	stdcall [edit_box_draw],edtParams
	jmp	DMessages
 
    .DNE3:
	and	[edtParams.flags],not ed_focus
	or	[edtName.flags],ed_focus
	stdcall [edit_box_draw],edtParams
	stdcall [edit_box_draw],edtName
	jmp	DMessages
 
    ;.DNE4:
    ;    and     [edtIcon.flags],not ed_focus
    ;    or      [edtName.flags],ed_focus
    ;    stdcall [edit_box_draw],edtName
    ;    stdcall [edit_box_draw],edtIcon
    ;    jmp     DMessages
;---------------------------------------------------------------------
DButton:
	mcall	17		;GetButtonPressed
	cmp	ah, idbCancel
	je	DExit
	cmp	ah,idbChange
	je	DSetExePath
	cmp	ah,idbCreate
	je	DSaveIcon
 
	jmp	DMessages
;-------------------------------------------------------------------------------
DMouse:
	stdcall [edit_box_mouse],edtName
	stdcall [edit_box_mouse],edtExePath
	stdcall [edit_box_mouse],edtParams
;        stdcall [edit_box_mouse],edtIcon
 
	push	[sbIcons.position]
	stdcall [scrollbar_h_mouse],sbIcons
	pop	eax
	cmp	eax,[sbIcons.position]
	je	@f
	call	DrawStdIcons
      @@:
 
	mcall	37,2		;GetMouseKey
	test	eax,1
	jz	DMessages
	mcall	37,1		;GetMouseWinPos
 
	test	eax,10001000h
	jne	DMessages
	xor	edx,edx
	mov	dx,ax	  ;y
	shr	eax,16	  ;x
 
	sub	eax,ICONSX
	js	DMessages
	sub	edx,ICONSY
	js	DMessages
 
	cmp	eax,(IMG_SIZE+SPCW)*ICONS_DRAW_COUNTW-SPCW
	ja	DMessages
	cmp	edx,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH-SPCH
	ja	DMessages
 
	xor	ebx,ebx
	mov	ecx,[sbIcons.position]
	test	ecx,ecx
	jz	.DM
     @@:
	add	ebx,ICONS_DRAW_COUNTH
	loop	@b
     .DM:
 
	sub	eax,IMG_SIZE+SPCW
	js     .DM1
     @@:
	add	ebx,ICONS_DRAW_COUNTH
	sub	eax,IMG_SIZE+SPCW
	jns	@b
     .DM1:
 
 
	sub	edx,IMG_SIZE+SPCH
	js     .DM2
     @@:
	inc	ebx
	sub	edx,IMG_SIZE+SPCH
	jns	@b
     .DM2:
 
	mov	eax,ebx
 
	cmp	eax,[icon_count]
	jae	DMessages
 
	mov	bl,10
	div	bl
 
	add	ah,30h
	test	al,al
	jz	@f
 
	add	al,30h
	mov	byte[DAreaIcon],al
	mov	byte[DAreaIcon+1],ah
	mov	byte[DAreaIcon+2],0
	mov	dword[edtIcon.size],2
	jmp	.RedrawNum
 
      @@:
	mov	byte[DAreaIcon],ah
	mov	byte[DAreaIcon+1],0
	mov	dword[edtIcon.size],1
	jmp	.RedrawNum
    .RedrawNum:
 
 
      ;  stdcall [edit_box_draw],edtIcon
 
 
	call	DrawSelIcon
	jmp	DReDraw;DMessages;
;-------------------------------------------------------------------------------
DSetExePath:
	stdcall [OpenDialog_Start],OpenDialog_data
	mov	edi,DAreaPath
	xor	al,al
	or	ecx,-1
	repne	scasb
	sub	edi,DAreaPath
	dec	edi
	mov	dword[edtExePath+12*4],edi
 
	jmp	DMessages;DReDraw;
 
DSaveIcon:
	mov	edi,DAreaName
	mov	esi,secRButt
    @@: lodsb
	scasb
	jne	@f
	test	al,al
	jnz	@b
 
	mov	dword[fiRunProg+8],ErrName
	mov	dword[fiRunProg+21],pthNotify
	mcall	70,fiRunProg
 
	jmp	DMessages
    @@:
	mov	dword[fiRunProg+8],WarningSave
	mov	dword[fiRunProg+21],pthNotify
	mcall	70,fiRunProg
 
 
	cmp	[DlgSelIcon],-1
	je	@f
 
 
 
 
		       
	stdcall EditIcon,[DlgSelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams
	mov	ebx,[DlgSelIcon]
	mov	eax,[IconsID+ebx*4]
	jmp	DExitAndSave
     @@:
 
	call	GenerateID
 
	mov	ebx,[MaxNumIcon]
	mov	[IconsID+ebx*4],eax
	push	eax
	stdcall AddIcon,[AddX],[AddY],DAreaIcon,DAreaName,DAreaPath,DAreaParams
	pop	eax
 
;-------------------------------------------------------------------------------
DExitAndSave:
 
	mov	dword[nameSection],eax
	stdcall [ini_set_str],IconIni,nameSection,keyName,DAreaName,dword[edtName.size]
	stdcall [ini_set_str],IconIni,nameSection,keyPath,DAreaPath,dword[edtExePath.size]
	stdcall [ini_set_str],IconIni,nameSection,keyParams,DAreaParams,dword[edtParams.size]
	stdcall [ini_set_str],IconIni,nameSection,keyIco,DAreaIcon,dword[edtIcon.size]
 
	cmp	[DlgSelIcon],-1
	jne	@f
	stdcall [ini_set_int],IconIni,nameSection,keyX,[MouseX]
	stdcall [ini_set_int],IconIni,nameSection,keyY,[MouseY]
      @@:
DExit:
	mov	[DlgAddActiv],0
	mov	[slotDlgAdd],0
	mcall	-1		;ExitThread
 
;##################################################################
proc DRedrawWin
	mcall	12,1		;RedrawWinBeg
	mov	edx,[sc.work]
	or	edx,34000000h
	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+165>,,,
 
	stdcall [edit_box_draw],edtName
	stdcall [edit_box_draw],edtExePath
	stdcall [edit_box_draw],edtParams
;        stdcall [edit_box_draw],edtIcon
 
	call	DrawStdIcons
 
 
	stdcall [scrollbar_h_draw],sbIcons
	mcall	38,,\
		   ,\
		[sc.work_graph]
	mcall	  ,,\
		   ,\
		[sc.work_graph]
 
	mcall	  ,,\
		   ,\
		[sc.work_graph]
	mcall	  ,,\
		   ,\
		[sc.work_graph]
 
				  ;BUTTONS
	mcall	8,<250,49>,<30+END_ICONS_AREAH,16>,idbCreate,[sc.work_button]
	mcall	 ,<305,54>,			  ,idbCancel
	mcall	 ,<351,14>,<26,14>	       ,idbChange
 
				  ;CAPTIONS
	mov	ecx,[sc.work_text]
	or	ecx,80000000h
	mcall	4,<30+IMG_SIZE,10>,,DCaptName
	mcall	 ,<30+IMG_SIZE,30>,,DCaptPath
	mcall	 ,<30+IMG_SIZE,50>,,DCaptParams
	;mcall    ,<30+IMG_SIZE,70>,,DCaptIcon
 
if lang eq ru
	mov	ecx,[sc.work_button_text]
	or	ecx,80000000h
	mcall	 ,<309,35+END_ICONS_AREAH>,,DCaptCancel
 
	cmp	[DlgSelIcon],-1
	jne	@f
	mpack	ebx,255,35+END_ICONS_AREAH
	mov	edx,DCaptCreate
	jmp	.DRD1
      @@:
	mpack	ebx,252,35+END_ICONS_AREAH
	mov	edx,DCaptProperties
     .DRD1:
else
	mov	ecx,[sc.work_button_text]
	or	ecx,80000000h
	mcall	 ,<315,35+END_ICONS_AREAH>,,DCaptCancel
 
 
	cmp	[DlgSelIcon],-1
	jne	@f
	mpack	ebx,257,35+END_ICONS_AREAH
	mov	edx,DCaptCreate
	jmp	.DRD1
      @@:
	mpack	ebx,257,35+END_ICONS_AREAH
	mov	edx,DCaptProperties
     .DRD1:
end if
	mcall
 
	mcall	1,351+4  ,26+10,[sc.work_button_text]
	mcall	 ,351+4+3,26+10,
	mcall	 ,351+4+6,26+10,
 
	call DrawSelIcon
 
	mcall	12,2		;RedrawWinEnd
	ret
endp
 
 
proc DrawStdIcons
local IcoX:DWORD,\
      IcoY:DWORD,\
      iIcon:DWORD
 
	mov	ecx,[sbIcons.position]
	xor	eax,eax
	m2m	dword[iIcon],0
 
	test	ecx,ecx
	jz	.DST1
     @@:
	add	[iIcon],ICONS_DRAW_COUNTH
	add	eax,IMG_SIZE*IMG_SIZE*4*ICONS_DRAW_COUNTH
	loop	@b
   .DST1:
 
	lea	esi,[eax+44]
	add	esi,[raw_pointer]
 
	mov	[IcoX],ICONSX
 
	mov	ecx,ICONS_DRAW_COUNTW
  .DrawIcons:
	push	ecx
 
	mov	[IcoY],ICONSY
 
	mov	ecx,ICONS_DRAW_COUNTH
  .DrawIcoStolb:
	push	ecx
 
	mov	edi,DlgBufImg
	mov	edx,IMG_SIZE
 
    .DrawLine:
 
 
	mov	ecx,IMG_SIZE
     .DrawPix:
 
	lodsd
	test	eax,0FF000000h
	jnz	@f
	mov	eax,[sc.work]
     @@:
 
	mov	[edi],ax
	shr	eax,16
	mov	[edi+2],al
	add	edi,3
 
	loop	.DrawPix
 
	dec	edx
	jnz    .DrawLine
 
	mov	edx,[IcoX]
	shl	edx,16
	mov	dx,word[IcoY]
	mcall	7,DlgBufImg,
 
	inc	[iIcon]
	mov	eax,[iIcon]
	cmp	eax,[icon_count]
	jae	.endDrawIcon
 
	add	dword[IcoY],IMG_SIZE+SPCH
	pop	ecx
	loop	.DrawIcoStolb
 
	add	dword[IcoX],IMG_SIZE+SPCW
	pop	ecx
	loop	.DrawIcons
	jmp	.endProc
 
    .endDrawIcon:
 
	mov	ecx,IMG_SIZE*IMG_SIZE
	mov	edi,DlgBufImg
	mov	eax,[sc.work]
	mov	ebx,eax
	shr	ebx,16
     @@:
	mov	word[edi],ax
	mov	[edi+2],bl
	add	edi,3
	loop	@b
 
				     ;çàòèðàíèå íå èñïîëüçîâàíûõ ìåñò
	jmp	.Dalee
 
  .DrawIcons2:
	push	ecx
 
	mov	[IcoY],ICONSY
	mov	ecx,ICONS_DRAW_COUNTH
  .DrawIcoStolb2:
	push	ecx
 
	mov	edx,[IcoX]
	shl	edx,16
	mov	dx,word[IcoY]
	mcall	7,DlgBufImg,
 
     .Dalee:
	add	dword[IcoY],IMG_SIZE+SPCH
	pop	ecx
	loop	.DrawIcoStolb2
 
	add	dword[IcoX],IMG_SIZE+SPCW
	pop	ecx
	loop	.DrawIcons2
 
   .endProc:
 
	ret
endp
 
proc DrawSelIcon
	mov	edi,DAreaIcon
	cmp	byte[edi],0
	jne	@f
	ret
      @@:
 
	mov	al,[edi]
	cmp	al,'9'
	ja	.PathToIcon
	cmp	al,'/'
	jne	.GetIconInd
   .PathToIcon:
	mov	al,30h		 ;çàãëóøêà!!!!!!!!!!!!!
	mov	byte[edi+1],0
   .GetIconInd:
;int3
	sub	al,30h
	cmp	byte[edi+1],0
	je	@f
	shl	eax,1
	lea	eax,[eax*4+eax]
	xor	edx,edx
	mov	dl,[edi+1]
	sub	dl,30h
	add	eax,edx
     @@:	     ;eax=num icon
	cmp	eax,[icon_count]
	jb	@f
	xor	eax,eax
     @@:
	test	eax,eax
	je	.DI1
	mov	ecx,eax
	xor	eax,eax
      @@:
	add	eax,IMG_SIZE*IMG_SIZE*4
	loop	@b
     .DI1:
	mov	esi,eax
	add	esi,[raw_pointer]
	add	esi,44
 
	mov	edi,DlgBufImg
	mov	edx,IMG_SIZE
    .DrawLine:
 
	mov	ecx,IMG_SIZE
     .DrawPix:
 
	lodsd
	test	eax,0FF000000h
	jnz	@f
	mov	eax,[sc.work]
     @@:
 
	mov	word[edi],ax
	shr	eax,16
	mov	[edi+2],al
	add	edi,3
 
	loop	.DrawPix
 
	dec	edx
	jnz	.DrawLine
 
	mcall	7,DlgBufImg,,<15,15>
 
	ret
endp

Rev 4146	Rev 4336
1	idbChange equ 2	1	idbChange equ 2
2	idbCreate equ 3	2	idbCreate equ 3
3	idbLeft equ 4	3	idbLeft equ 4
4	idbRight equ 5	4	idbRight equ 5
5	idbCancel equ 1	5	idbCancel equ 1
6		6
7	DlgAdd:	7	DlgAdd:
8	DlgProp:	8	DlgProp:
9		9
10	mov eax,[SelIcon]	10	mov eax,[SelIcon]
11	mov [DlgSelIcon],eax	11	mov [DlgSelIcon],eax
12	cmp eax,-1	12	cmp eax,-1
13	jne SetProp	13	jne SetProp
14		14
15	;-----------	15	;-----------
16	mov eax,[MouseX]	16	mov eax,[MouseX]
17	mov ebx,[MouseY]	17	mov ebx,[MouseY]
18		18
19	cmp ax,[wsX]	19	cmp ax,[wsX]
20	jae @f	20	jae @f
21	mov ax,[wsX]	21	mov ax,[wsX]
22	@@:	22	@@:
23		23
24	cmp bx,[wsY]	24	cmp bx,[wsY]
25	jae @f	25	jae @f
26	mov bx,[wsY]	26	mov bx,[wsY]
27	@@: ;eax,ebx - à¥ «ì ï ª®®à¤¨ â . á¥ ª®®à¤¨ âë ¢ ¯à®£¥ ®â®á¨â¥«ì® «¥¢®£® ¢¥àå¥£® ã£« à ¡®ç¥© ®¡« áâ¨	27	@@: ;eax,ebx - ðåàëüíàÿ êîîðäèíàòà. Âñå êîîðäèíàòû â ïðîãå îòíîñèòåëüíî ëåâîãî âåðõíåãî óãëà ðàáî÷åé îáëàñòè
28		28
29	xor edx,edx	29	xor edx,edx
30	mov dx,[wsXe]	30	mov dx,[wsXe]
31	sub edx,ICON_SIZE	31	sub edx,ICON_SIZE
32	cmp eax,edx	32	cmp eax,edx
33	jbe @f	33	jbe @f
34	mov eax,edx	34	mov eax,edx
35	@@:	35	@@:
36		36
37	mov dx,[wsYe]	37	mov dx,[wsYe]
38	sub edx,ICON_SIZE	38	sub edx,ICON_SIZE
39	cmp ebx,edx	39	cmp ebx,edx
40	jbe @f	40	jbe @f
41	mov ebx,edx	41	mov ebx,edx
42	@@:	42	@@:
43		43
44	xor edx,edx ;¯à¥®¡à §®¢ë¢ ¥¬ ¢ ®â®á¨â¥«ìë¥	44	xor edx,edx ;ïðåîáðàçîâûâàåì â îòíîñèòåëüíûå
45	mov dx,[wsW]	45	mov dx,[wsW]
46	shr edx,1	46	shr edx,1
47	add dx,[wsX]	47	add dx,[wsX]
48	cmp eax,edx	48	cmp eax,edx
49	jbe @f	49	jbe @f
50	sub ax,[wsXe]	50	sub ax,[wsXe]
51	inc ax	51	inc ax
52	jmp .dlg1	52	jmp .dlg1
53	@@:	53	@@:
54	sub ax,[wsX]	54	sub ax,[wsX]
55	.dlg1:	55	.dlg1:
56		56
57	xor edx,edx	57	xor edx,edx
58	mov dx,[wsH]	58	mov dx,[wsH]
59	shr edx,1	59	shr edx,1
60	add dx,[wsY]	60	add dx,[wsY]
61	cmp ebx,edx	61	cmp ebx,edx
62	jbe @f	62	jbe @f
63	sub bx,[wsYe]	63	sub bx,[wsYe]
64	inc bx	64	inc bx
65	jmp .dlg2	65	jmp .dlg2
66	@@:	66	@@:
67	sub bx,[wsY]	67	sub bx,[wsY]
68	.dlg2:	68	.dlg2:
69		69
70	mov [AddX],eax	70	mov [AddX],eax
71	mov [AddY],ebx	71	mov [AddY],ebx
72	;-----------	72	;-----------
73		73
74	mov ecx,NAME_LENGTH	74	mov ecx,NAME_LENGTH
75	mov edi,DAreaName	75	mov edi,DAreaName
76	xor al,al	76	xor al,al
77	rep stosb	77	rep stosb
78	mov dword[edtName.size],0	78	mov dword[edtName.size],0
79	mov dword[edtName.pos],0	79	mov dword[edtName.pos],0
80		80
81	mov ecx,256	81	mov ecx,256
82	mov edi,DAreaPath	82	mov edi,DAreaPath
83	rep stosb	83	rep stosb
84	mov dword[edtExePath.size],0	84	mov dword[edtExePath.size],0
85	mov dword[edtExePath.pos],0	85	mov dword[edtExePath.pos],0
86		86
87	mov ecx,256	87	mov ecx,256
88	mov edi,DAreaParams	88	mov edi,DAreaParams
89	rep stosb	89	rep stosb
90	mov dword[edtParams.size],0	90	mov dword[edtParams.size],0
91	mov dword[edtParams.pos],0	91	mov dword[edtParams.pos],0
92		92
93	mov ecx,256	93	mov ecx,256
94	mov edi,DAreaIcon	94	mov edi,DAreaIcon
95	rep stosb	95	rep stosb
96	mov dword[edtIcon.size],0	96	mov dword[edtIcon.size],0
97	mov dword[edtIcon.pos],0	97	mov dword[edtIcon.pos],0
98		98
99	jmp startDlg	99	jmp startDlg
100	;--------	100	;--------
101	SetProp:	101	SetProp:
102	mov esi,[IconsOffs+eax*4]	102	mov esi,[IconsOffs+eax*4]
103	mov edi,DAreaName	103	mov edi,DAreaName
104	xor ecx,ecx	104	xor ecx,ecx
105	@@:	105	@@:
106	lodsb	106	lodsb
107	stosb	107	stosb
108	inc ecx	108	inc ecx
109	test al,al	109	test al,al
110	jnz @b	110	jnz @b
111	dec ecx	111	dec ecx
112	mov dword[edtName.size],ecx	112	mov dword[edtName.size],ecx
113	mov dword[edtName.pos],ecx	113	mov dword[edtName.pos],ecx
114		114
115	xor ecx,ecx	115	xor ecx,ecx
116	mov edi,DAreaPath	116	mov edi,DAreaPath
117	@@:	117	@@:
118	lodsb	118	lodsb
119	stosb	119	stosb
120	inc ecx	120	inc ecx
121	test al,al	121	test al,al
122	jnz @b	122	jnz @b
123	dec ecx	123	dec ecx
124	mov dword[edtExePath.size],ecx	124	mov dword[edtExePath.size],ecx
125	mov dword[edtExePath.pos],ecx	125	mov dword[edtExePath.pos],ecx
126		126
127	xor ecx,ecx	127	xor ecx,ecx
128	mov edi,DAreaParams	128	mov edi,DAreaParams
129	@@:	129	@@:
130	lodsb	130	lodsb
131	stosb	131	stosb
132	inc ecx	132	inc ecx
133	test al,al	133	test al,al
134	jnz @b	134	jnz @b
135	dec ecx	135	dec ecx
136	mov dword[edtParams.size],ecx	136	mov dword[edtParams.size],ecx
137	mov dword[edtParams.pos],ecx	137	mov dword[edtParams.pos],ecx
138		138
139	xor ecx,ecx	139	xor ecx,ecx
140	mov edi,DAreaIcon	140	mov edi,DAreaIcon
141	@@:	141	@@:
142	lodsb	142	lodsb
143	stosb	143	stosb
144	inc ecx	144	inc ecx
145	test al,al	145	test al,al
146	jnz @b	146	jnz @b
147	dec ecx	147	dec ecx
148	mov dword[edtIcon.size],ecx	148	mov dword[edtIcon.size],ecx
149	mov dword[edtIcon.pos],ecx	149	mov dword[edtIcon.pos],ecx
150		150
151		151
152	startDlg:	152	startDlg:
153	mcall 9,RBProcInfo,-1	153	mcall 9,RBProcInfo,-1
154	mcall 18,21,dword[RBProcInfo+30]	154	mcall 18,21,dword[RBProcInfo+30]
155	mov [slotDlgAdd],eax	155	mov [slotDlgAdd],eax
156		156
157	or [edtName.flags],ed_focus	157	or [edtName.flags],ed_focus
158		158
159	mcall 40,100111b ;SetMaskMessage 100111b	159	mcall 40,100111b ;SetMaskMessage 100111b
160	xor eax,eax	160	xor eax,eax
161	mov dword[MaxPage],0	161	mov dword[MaxPage],0
162	@@:	162	@@:
163	add eax,ICONS_DRAW_COUNTW	163	add eax,ICONS_DRAW_COUNTW
164	inc dword[MaxPage]	164	inc dword[MaxPage]
165	cmp eax,[icon_count]	165	cmp eax,[icon_count]
166	jb @b	166	jb @b
167	dec dword[MaxPage]	167	dec dword[MaxPage]
168	cmp dword[MaxPage],0	168	cmp dword[MaxPage],0
169	jne @f	169	jne @f
170	mov dword[MaxPage],1	170	mov dword[MaxPage],1
171	@@:	171	@@:
172		172
173	DReDraw:	173	DReDraw:
174	mcall 48,3,sc,40	174	mcall 48,3,sc,40
175		175
176	mov eax,[sc.work]	176	mov eax,[sc.work]
177	rol eax,16	177	rol eax,16
178	add al,9	178	add al,9
179	jnc @f	179	jnc @f
180	mov al,0FFh	180	mov al,0FFh
181	@@:	181	@@:
182	rol eax,16	182	rol eax,16
183	add al,9	183	add al,9
184	jnc @f	184	jnc @f
185	mov al,0FFh	185	mov al,0FFh
186	@@:	186	@@:
187	add ah,9	187	add ah,9
188	jnc @f	188	jnc @f
189	mov ah,0FFh	189	mov ah,0FFh
190	@@:	190	@@:
191		191
192	mov [sbIcons.bckg_col],eax	192	mov [sbIcons.bckg_col],eax
193	m2m [sbIcons.frnt_col],[sc.work]	193	m2m [sbIcons.frnt_col],[sc.work]
194	m2m [sbIcons.line_col],[sc.work_graph]	194	m2m [sbIcons.line_col],[sc.work_graph]
195		195
196	edit_boxes_set_sys_color edtName,edtExePath,sc	196	edit_boxes_set_sys_color edtName,edtExePath,sc
197	edit_boxes_set_sys_color edtExePath,edtParams,sc	197	edit_boxes_set_sys_color edtExePath,edtParams,sc
198	edit_boxes_set_sys_color edtParams,edtIcon,sc	198	edit_boxes_set_sys_color edtParams,edtIcon,sc
199	;edit_boxes_set_sys_color edtIcon,endEdits,sc	199	;edit_boxes_set_sys_color edtIcon,endEdits,sc
200		200
201	call DRedrawWin	201	call DRedrawWin
202		202
203	DMessages:	203	DMessages:
204	mcall 10 ;WaitMessage	204	mcall 10 ;WaitMessage
205		205
206	dec eax	206	dec eax
207	jz DReDraw	207	jz DReDraw
208	dec eax	208	dec eax
209	jz DKey	209	jz DKey
210	dec eax	210	dec eax
211	jz DButton	211	jz DButton
212	sub eax,3	212	sub eax,3
213	jz DMouse	213	jz DMouse
214		214
215	jmp DMessages	215	jmp DMessages
216		216
217		217
218	;---------------------------------------------------------------------	218	;---------------------------------------------------------------------
219	DKey:	219	DKey:
220	mcall 2 ;GetKeyPressed	220	mcall 2 ;GetKeyPressed
221	cmp ah,1Bh	221	cmp ah,1Bh
222	je DExit	222	je DExit
223	cmp ah,9 ;Tab	223	cmp ah,9 ;Tab
224	je DNextEdit	224	je DNextEdit
225	stdcall [edit_box_key],edtName	225	stdcall [edit_box_key],edtName
226	stdcall [edit_box_key],edtExePath	226	stdcall [edit_box_key],edtExePath
227	stdcall [edit_box_key],edtParams	227	stdcall [edit_box_key],edtParams
228	;stdcall [edit_box_key],edtIcon	228	;stdcall [edit_box_key],edtIcon
229		229
230	jmp DMessages	230	jmp DMessages
231		231
232		232
233	DNextEdit:	233	DNextEdit:
234	test [edtName.flags],ed_focus	234	test [edtName.flags],ed_focus
235	jne .DNE1	235	jne .DNE1
236	test [edtExePath.flags],ed_focus	236	test [edtExePath.flags],ed_focus
237	jne .DNE2	237	jne .DNE2
238	test [edtParams.flags],ed_focus	238	test [edtParams.flags],ed_focus
239	jne .DNE3	239	jne .DNE3
240	;test [edtIcon.flags],ed_focus	240	;test [edtIcon.flags],ed_focus
241	;jne .DNE4	241	;jne .DNE4
242	jmp DMessages	242	jmp DMessages
243		243
244	.DNE1:	244	.DNE1:
245	and [edtName.flags],not ed_focus	245	and [edtName.flags],not ed_focus
246	or [edtExePath.flags],ed_focus	246	or [edtExePath.flags],ed_focus
247	stdcall [edit_box_draw],edtName	247	stdcall [edit_box_draw],edtName
248	stdcall [edit_box_draw],edtExePath	248	stdcall [edit_box_draw],edtExePath
249	jmp DMessages	249	jmp DMessages
250		250
251	.DNE2:	251	.DNE2:
252	and [edtExePath.flags],not ed_focus	252	and [edtExePath.flags],not ed_focus
253	or [edtParams.flags],ed_focus	253	or [edtParams.flags],ed_focus
254	stdcall [edit_box_draw],edtExePath	254	stdcall [edit_box_draw],edtExePath
255	stdcall [edit_box_draw],edtParams	255	stdcall [edit_box_draw],edtParams
256	jmp DMessages	256	jmp DMessages
257		257
258	.DNE3:	258	.DNE3:
259	and [edtParams.flags],not ed_focus	259	and [edtParams.flags],not ed_focus
260	or [edtName.flags],ed_focus	260	or [edtName.flags],ed_focus
261	stdcall [edit_box_draw],edtParams	261	stdcall [edit_box_draw],edtParams
262	stdcall [edit_box_draw],edtName	262	stdcall [edit_box_draw],edtName
263	jmp DMessages	263	jmp DMessages
264		264
265	;.DNE4:	265	;.DNE4:
266	; and [edtIcon.flags],not ed_focus	266	; and [edtIcon.flags],not ed_focus
267	; or [edtName.flags],ed_focus	267	; or [edtName.flags],ed_focus
268	; stdcall [edit_box_draw],edtName	268	; stdcall [edit_box_draw],edtName
269	; stdcall [edit_box_draw],edtIcon	269	; stdcall [edit_box_draw],edtIcon
270	; jmp DMessages	270	; jmp DMessages
271	;---------------------------------------------------------------------	271	;---------------------------------------------------------------------
272	DButton:	272	DButton:
273	mcall 17 ;GetButtonPressed	273	mcall 17 ;GetButtonPressed
274	cmp ah, idbCancel	274	cmp ah, idbCancel
275	je DExit	275	je DExit
276	cmp ah,idbChange	276	cmp ah,idbChange
277	je DSetExePath	277	je DSetExePath
278	cmp ah,idbCreate	278	cmp ah,idbCreate
279	je DSaveIcon	279	je DSaveIcon
280		280
281	jmp DMessages	281	jmp DMessages
282	;-------------------------------------------------------------------------------	282	;-------------------------------------------------------------------------------
283	DMouse:	283	DMouse:
284	stdcall [edit_box_mouse],edtName	284	stdcall [edit_box_mouse],edtName
285	stdcall [edit_box_mouse],edtExePath	285	stdcall [edit_box_mouse],edtExePath
286	stdcall [edit_box_mouse],edtParams	286	stdcall [edit_box_mouse],edtParams
287	; stdcall [edit_box_mouse],edtIcon	287	; stdcall [edit_box_mouse],edtIcon
288		288
289	push [sbIcons.position]	289	push [sbIcons.position]
290	stdcall [scrollbar_h_mouse],sbIcons	290	stdcall [scrollbar_h_mouse],sbIcons
291	pop eax	291	pop eax
292	cmp eax,[sbIcons.position]	292	cmp eax,[sbIcons.position]
293	je @f	293	je @f
294	call DrawStdIcons	294	call DrawStdIcons
295	@@:	295	@@:
296		296
297	mcall 37,2 ;GetMouseKey	297	mcall 37,2 ;GetMouseKey
298	test eax,1	298	test eax,1
299	jz DMessages	299	jz DMessages
300	mcall 37,1 ;GetMouseWinPos	300	mcall 37,1 ;GetMouseWinPos
301		301
302	test eax,10001000h	302	test eax,10001000h
303	jne DMessages	303	jne DMessages
304	xor edx,edx	304	xor edx,edx
305	mov dx,ax ;y	305	mov dx,ax ;y
306	shr eax,16 ;x	306	shr eax,16 ;x
307		307
308	sub eax,ICONSX	308	sub eax,ICONSX
309	js DMessages	309	js DMessages
310	sub edx,ICONSY	310	sub edx,ICONSY
311	js DMessages	311	js DMessages
312		312
313	cmp eax,(IMG_SIZE+SPCW)*ICONS_DRAW_COUNTW-SPCW	313	cmp eax,(IMG_SIZE+SPCW)*ICONS_DRAW_COUNTW-SPCW
314	ja DMessages	314	ja DMessages
315	cmp edx,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH-SPCH	315	cmp edx,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH-SPCH
316	ja DMessages	316	ja DMessages
317		317
318	xor ebx,ebx	318	xor ebx,ebx
319	mov ecx,[sbIcons.position]	319	mov ecx,[sbIcons.position]
320	test ecx,ecx	320	test ecx,ecx
321	jz .DM	321	jz .DM
322	@@:	322	@@:
323	add ebx,ICONS_DRAW_COUNTH	323	add ebx,ICONS_DRAW_COUNTH
324	loop @b	324	loop @b
325	.DM:	325	.DM:
326		326
327	sub eax,IMG_SIZE+SPCW	327	sub eax,IMG_SIZE+SPCW
328	js .DM1	328	js .DM1
329	@@:	329	@@:
330	add ebx,ICONS_DRAW_COUNTH	330	add ebx,ICONS_DRAW_COUNTH
331	sub eax,IMG_SIZE+SPCW	331	sub eax,IMG_SIZE+SPCW
332	jns @b	332	jns @b
333	.DM1:	333	.DM1:
334		334
335		335
336	sub edx,IMG_SIZE+SPCH	336	sub edx,IMG_SIZE+SPCH
337	js .DM2	337	js .DM2
338	@@:	338	@@:
339	inc ebx	339	inc ebx
340	sub edx,IMG_SIZE+SPCH	340	sub edx,IMG_SIZE+SPCH
341	jns @b	341	jns @b
342	.DM2:	342	.DM2:
343		343
344	mov eax,ebx	344	mov eax,ebx
345		345
346	cmp eax,[icon_count]	346	cmp eax,[icon_count]
347	jae DMessages	347	jae DMessages
348		348
349	mov bl,10	349	mov bl,10
350	div bl	350	div bl
351		351
352	add ah,30h	352	add ah,30h
353	test al,al	353	test al,al
354	jz @f	354	jz @f
355		355
356	add al,30h	356	add al,30h
357	mov byte[DAreaIcon],al	357	mov byte[DAreaIcon],al
358	mov byte[DAreaIcon+1],ah	358	mov byte[DAreaIcon+1],ah
359	mov byte[DAreaIcon+2],0	359	mov byte[DAreaIcon+2],0
360	mov dword[edtIcon.size],2	360	mov dword[edtIcon.size],2
361	jmp .RedrawNum	361	jmp .RedrawNum
362		362
363	@@:	363	@@:
364	mov byte[DAreaIcon],ah	364	mov byte[DAreaIcon],ah
365	mov byte[DAreaIcon+1],0	365	mov byte[DAreaIcon+1],0
366	mov dword[edtIcon.size],1	366	mov dword[edtIcon.size],1
367	jmp .RedrawNum	367	jmp .RedrawNum
368	.RedrawNum:	368	.RedrawNum:
369		369
370		370
371	; stdcall [edit_box_draw],edtIcon	371	; stdcall [edit_box_draw],edtIcon
372		372
373		373
374	call DrawSelIcon	374	call DrawSelIcon
375	jmp DReDraw;DMessages;	375	jmp DReDraw;DMessages;
376	;-------------------------------------------------------------------------------	376	;-------------------------------------------------------------------------------
377	DSetExePath:	377	DSetExePath:
378	stdcall [OpenDialog_Start],OpenDialog_data	378	stdcall [OpenDialog_Start],OpenDialog_data
379	mov edi,DAreaPath	379	mov edi,DAreaPath
380	xor al,al	380	xor al,al
381	or ecx,-1	381	or ecx,-1
382	repne scasb	382	repne scasb
383	sub edi,DAreaPath	383	sub edi,DAreaPath
384	dec edi	384	dec edi
385	mov dword[edtExePath+12*4],edi	385	mov dword[edtExePath+12*4],edi
386		386
387	jmp DMessages;DReDraw;	387	jmp DMessages;DReDraw;
388		388
389	DSaveIcon:	389	DSaveIcon:
390	mov edi,DAreaName	390	mov edi,DAreaName
391	mov esi,secRButt	391	mov esi,secRButt
392	@@: lodsb	392	@@: lodsb
393	scasb	393	scasb
394	jne @f	394	jne @f
395	test al,al	395	test al,al
396	jnz @b	396	jnz @b
397		397
398	mov dword[fiRunProg+8],ErrName	398	mov dword[fiRunProg+8],ErrName
399	mov dword[fiRunProg+21],pthNotify	399	mov dword[fiRunProg+21],pthNotify
400	mcall 70,fiRunProg	400	mcall 70,fiRunProg
401		401
402	jmp DMessages	402	jmp DMessages
403	@@:	403	@@:
404	mov dword[fiRunProg+8],WarningSave	404	mov dword[fiRunProg+8],WarningSave
405	mov dword[fiRunProg+21],pthNotify	405	mov dword[fiRunProg+21],pthNotify
406	mcall 70,fiRunProg	406	mcall 70,fiRunProg
407		407
408		408
409	cmp [DlgSelIcon],-1	409	cmp [DlgSelIcon],-1
410	je @f	410	je @f
411	;ã¤ «ï¥¬ ¨§ ini áâ àãî ¨ª®ªã	-
412	mov ebx,[DlgSelIcon]	-
413	mov eax,[IconsOffs+ebx*4]	-
414	stdcall [ini_del_section],IconIni,eax	-
415		411
-		412	stdcall EditIcon,[DlgSelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams
-		413	mov ebx,[DlgSelIcon]
416	stdcall EditIcon,[DlgSelIcon],DAreaIcon,DAreaName,DAreaPath,DAreaParams	414	mov eax,[IconsID+ebx*4]
417	jmp DExitAndSave	415	jmp DExitAndSave
-		416	@@:
-		417
-		418	call GenerateID
-		419
-		420	mov ebx,[MaxNumIcon]
-		421	mov [IconsID+ebx*4],eax
418	@@:	422	push eax
419	stdcall AddIcon,[AddX],[AddY],DAreaIcon,DAreaName,DAreaPath,DAreaParams	423	stdcall AddIcon,[AddX],[AddY],DAreaIcon,DAreaName,DAreaPath,DAreaParams
-		424	pop eax
420	;jmp DExitAndSave	425
421	;-------------------------------------------------------------------------------	426	;-------------------------------------------------------------------------------
422	DExitAndSave:	427	DExitAndSave:
423		428
424	stdcall [ini_set_str],IconIni,DAreaName,keyPath,DAreaPath,dword[edtExePath.size]	429	mov dword[nameSection],eax
425	stdcall [ini_set_str],IconIni,DAreaName,keyParams,DAreaParams,dword[edtParams.size]	430	stdcall [ini_set_str],IconIni,nameSection,keyName,DAreaName,dword[edtName.size]
426	stdcall [ini_set_str],IconIni,DAreaName,keyIco,DAreaIcon,dword[edtIcon.size]	431	stdcall [ini_set_str],IconIni,nameSection,keyPath,DAreaPath,dword[edtExePath.size]
427	stdcall [ini_set_int],IconIni,DAreaName,keyX,[MouseX]	432	stdcall [ini_set_str],IconIni,nameSection,keyParams,DAreaParams,dword[edtParams.size]
-		433	stdcall [ini_set_str],IconIni,nameSection,keyIco,DAreaIcon,dword[edtIcon.size]
-		434
-		435	cmp [DlgSelIcon],-1
-		436	jne @f
-		437	stdcall [ini_set_int],IconIni,nameSection,keyX,[MouseX]
428	stdcall [ini_set_int],IconIni,DAreaName,keyY,[MouseY]	438	stdcall [ini_set_int],IconIni,nameSection,keyY,[MouseY]
429		439	@@:
430	DExit:	440	DExit:
431	mov [DlgAddActiv],0	441	mov [DlgAddActiv],0
432	mov [slotDlgAdd],0	442	mov [slotDlgAdd],0
433	mcall -1 ;ExitThread	443	mcall -1 ;ExitThread
434		444
435	;##################################################################	445	;##################################################################
436	proc DRedrawWin	446	proc DRedrawWin
437	mcall 12,1 ;RedrawWinBeg	447	mcall 12,1 ;RedrawWinBeg
438	mov edx,[sc.work]	448	mov edx,[sc.work]
439	or edx,34000000h	449	or edx,34000000h
440	cmp [DlgSelIcon],-1	450	cmp [DlgSelIcon],-1
441	jne @f	451	jne @f
442	mov edi,DTitleAdd	452	mov edi,DTitleAdd
443	jmp .l1	453	jmp .l1
444	@@:	454	@@:
445	mov edi,DTitleProp	455	mov edi,DTitleProp
446	.l1:	456	.l1:
447	mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+165>,,,	457	mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+165>,,,
448		458
449	stdcall [edit_box_draw],edtName	459	stdcall [edit_box_draw],edtName
450	stdcall [edit_box_draw],edtExePath	460	stdcall [edit_box_draw],edtExePath
451	stdcall [edit_box_draw],edtParams	461	stdcall [edit_box_draw],edtParams
452	; stdcall [edit_box_draw],edtIcon	462	; stdcall [edit_box_draw],edtIcon
453		463
454	call DrawStdIcons	464	call DrawStdIcons
455		465
456		466
457	stdcall [scrollbar_h_draw],sbIcons	467	stdcall [scrollbar_h_draw],sbIcons
458	mcall 38,,\	468	mcall 38,,\
459	,\	469	,\
460	[sc.work_graph]	470	[sc.work_graph]
461	mcall ,,\	471	mcall ,,\
462	,\	472	,\
463	[sc.work_graph]	473	[sc.work_graph]
464		474
465	mcall ,,\	475	mcall ,,\
466	,\	476	,\
467	[sc.work_graph]	477	[sc.work_graph]
468	mcall ,,\	478	mcall ,,\
469	,\	479	,\
470	[sc.work_graph]	480	[sc.work_graph]
471		481
472	;BUTTONS	482	;BUTTONS
473	mcall 8,<250,49>,<30+END_ICONS_AREAH,16>,idbCreate,[sc.work_button]	483	mcall 8,<250,49>,<30+END_ICONS_AREAH,16>,idbCreate,[sc.work_button]
474	mcall ,<305,54>, ,idbCancel	484	mcall ,<305,54>, ,idbCancel
475	mcall ,<351,14>,<26,14> ,idbChange	485	mcall ,<351,14>,<26,14> ,idbChange
476		486
477	;CAPTIONS	487	;CAPTIONS
478	mov ecx,[sc.work_text]	488	mov ecx,[sc.work_text]
479	or ecx,80000000h	489	or ecx,80000000h
480	mcall 4,<30+IMG_SIZE,10>,,DCaptName	490	mcall 4,<30+IMG_SIZE,10>,,DCaptName
481	mcall ,<30+IMG_SIZE,30>,,DCaptPath	491	mcall ,<30+IMG_SIZE,30>,,DCaptPath
482	mcall ,<30+IMG_SIZE,50>,,DCaptParams	492	mcall ,<30+IMG_SIZE,50>,,DCaptParams
483	;mcall ,<30+IMG_SIZE,70>,,DCaptIcon	493	;mcall ,<30+IMG_SIZE,70>,,DCaptIcon
484		494
485	if lang eq ru	495	if lang eq ru
486	mov ecx,[sc.work_button_text]	496	mov ecx,[sc.work_button_text]

Subversion Repositories Kolibri OS

(root)/programs/system/icon_new/DlgAdd.inc @ 5017 – Rev 4146 → 4336