Subversion Repositories Kolibri OS

Rev

Rev 4055 | Rev 4159 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4055 Rev 4061
Line 658... Line 658...
658
.exit_dir:
658
.exit_dir:
659
	call	load_next_dir.exit_dir
659
	call	load_next_dir.exit_dir
660
	jmp	still
660
	jmp	still
661
;---------------------------------------------------------------------
661
;---------------------------------------------------------------------
662
.open_dir_or_file:
662
.open_dir_or_file:
-
 
663
	cmp	[open_dialog_type],0	;Open file
-
 
664
	jne	@f
-
 
665
 
663
	mov	eax,[file_browser_data_1.folder_data]
666
	mov	eax,[file_browser_data_1.folder_data]
664
	mov	eax,[eax+4]
667
	mov	eax,[eax+4]
665
	test	eax,eax
668
	test	eax,eax
666
	jz	button.exit
669
	jz	button.exit
667
 
670
@@:
668
	cmp	[open_dialog_type],2	;Select	dir
671
	cmp	[open_dialog_type],2	;Select	dir
669
	je	file_no_folder
672
	je	file_no_folder
Line 670... Line 673...
670
	
673
	
671
	cmp	[open_dialog_type],1	;Save file
674
	cmp	[open_dialog_type],1	;Save file
-
 
675
	jne	@f
672
	jne	@f
676
 
673
	mov	al,[focus_pointer]
677
	mov	al,[focus_pointer]
674
	test	al,al
678
	test	al,al
675
	jne	file_no_folder	
679
	jne	file_no_folder	
676
@@:
680
@@:
Line 1138... Line 1142...
1138
	mov	esi,dir_path
1142
	mov	esi,dir_path
1139
	call	copy_exit_dir
1143
	call	copy_exit_dir
1140
	jmp	.1
1144
	jmp	.1
1141
;---------------------------------------------------------------------
1145
;---------------------------------------------------------------------
1142
error_handler:
1146
error_handler:
-
 
1147
	mcall	66,2
-
 
1148
	mov	[error_handler_store_input_mode],eax
-
 
1149
	mcall	66,1,1
1143
.red:
1150
.red:
1144
	call	.draw_window
1151
	call	.draw_window
1145
;------------------------------------
1152
;------------------------------------
1146
.still:
1153
.still:
1147
	mcall	10
1154
	mcall	10
Line 1190... Line 1197...
1190
	xor	eax,eax
1197
	xor	eax,eax
1191
	mov	[N_error],eax
1198
	mov	[N_error],eax
1192
	jmp	button.exit
1199
	jmp	button.exit
1193
;------------------------------------
1200
;------------------------------------
1194
.exit:
1201
.exit:
-
 
1202
	cmp	[open_dialog_type],1
-
 
1203
	jne	@f
-
 
1204
 
-
 
1205
	mov	esi,root_pach
-
 
1206
	mov	edi,dir_path
-
 
1207
	call	copy_dir_name.1
-
 
1208
	mov	esi,root_pach
-
 
1209
	mov	edi,previous_dir_path
-
 
1210
	call	copy_dir_name.1
-
 
1211
	jmp	.restore_input_mode
-
 
1212
@@:
1195
	mov	esi,previous_dir_path
1213
	mov	esi,previous_dir_path
1196
	mov	edi,dir_path
1214
	mov	edi,dir_path
1197
	call	copy_dir_name.1
1215
	call	copy_dir_name.1
1198
	mov	esi,start_pach
1216
	mov	esi,start_pach
1199
	mov	edi,previous_dir_path
1217
	mov	edi,previous_dir_path
1200
	call	copy_dir_name.1
1218
	call	copy_dir_name.1
-
 
1219
.restore_input_mode:
-
 
1220
	mcall	66,1,[error_handler_store_input_mode]
1201
	ret
1221
	ret
1202
;---------------------------------------------------------------------
1222
;---------------------------------------------------------------------
1203
file_no_folder:
1223
file_no_folder:
1204
	mov	esi,dir_path
1224
	mov	esi,dir_path
1205
	mov	edi,file_name
1225
	mov	edi,file_name
Line 1673... Line 1693...
1673
	push	ebx ecx
1693
	push	ebx ecx
1674
	add	ebx,10 shl 16
1694
	add	ebx,10 shl 16
1675
	sub	ebx,20
1695
	sub	ebx,20
1676
	add	ecx,10 shl 16
1696
	add	ecx,10 shl 16
1677
	sub	ecx,20
1697
	sub	ecx,20
1678
	mov	edx,0xff0000
-
 
1679
	mcall
-
 
Line 1680... Line 1698...
1680
 
1698
 
1681
	shr	ecx,16
1699
	shr	ecx,16
1682
	mov	bx,cx
1700
	mov	bx,cx
1683
	add	ebx,5 shl 16+15
1701
	add	ebx,5 shl 16+15
Line 1684... Line 1702...
1684
	mcall	4,,0x90ffffff,load_directory_error_type
1702
	mcall	4,,0x90000000,load_directory_error_type
1685
 
1703
 
Line 1686... Line 1704...
1686
	add	ebx,20
1704
	add	ebx,20
Line 1691... Line 1709...
1691
	add	eax,error_fs_text_pointers
1709
	add	eax,error_fs_text_pointers
1692
	mov	edx,[eax]
1710
	mov	edx,[eax]
1693
	add	ebx,20
1711
	add	ebx,20
1694
	mcall	4
1712
	mcall	4
Line -... Line 1713...
-
 
1713
	
-
 
1714
	add	ebx,20
-
 
1715
	mcall	,,,error_help_text
1695
 
1716
 
Line 1696... Line 1717...
1696
	pop	ecx ebx
1717
	pop	ecx ebx
1697
 
1718
 
1698
	mov	ebx,[file_browser_data_1.x]
1719
	mov	ebx,[file_browser_data_1.x]
Line 1711... Line 1732...
1711
	sub	eax,40
1732
	sub	eax,40
1712
	shl	eax,16
1733
	shl	eax,16
1713
	add	ecx,eax
1734
	add	ecx,eax
1714
	mov	cx,15
1735
	mov	cx,15
Line 1715... Line 1736...
1715
 
1736
 
Line 1716... Line 1737...
1716
	mcall	8,,,5,0xffffff
1737
	mcall	8,,,5,[w_work_button]	;0xffffff
1717
 
1738
 
1718
	shr	ecx,16
1739
	shr	ecx,16
-
 
1740
	mov	bx,cx
-
 
1741
	add	ebx,4 shl 16+4
1719
	mov	bx,cx
1742
	mov	ecx,[w_work_button_text]
1720
	add	ebx,4 shl 16+4
-
 
Line 1721... Line 1743...
1721
	mcall	4,,0x90000000,message_cancel_button
1743
	add	ecx,0x90000000
1722
 
1744
	mcall	4,,,message_cancel_button
1723
 
1745
 
1724
	ret
1746
	ret
Line 2809... Line 2831...
2809
	db 'Error loading directory',0
2831
	db 'Error loading directory',0
Line 2810... Line 2832...
2810
 
2832
 
2811
convert_icons_error_type:
2833
convert_icons_error_type:
2812
	db 'Unsupported or corrupt data for icons file',0
2834
	db 'Unsupported or corrupt data for icons file',0
-
 
2835
;---------------------------------------------------------------------
-
 
2836
error_help_text:
-
 
2837
	db 'For continue press  key or ',0
2813
;---------------------------------------------------------------------
2838
;---------------------------------------------------------------------
2814
align	4
2839
align	4
2815
error_fs_text_pointers:
2840
error_fs_text_pointers:
2816
	dd error_fs_text_0
2841
	dd error_fs_text_0
2817
	dd error_fs_text_1
2842
	dd error_fs_text_1
Line 3207... Line 3232...
3207
w_work_text		rd 1
3232
w_work_text		rd 1
3208
w_work_graph		rd 1
3233
w_work_graph		rd 1
3209
;---------------------------------------------------------------------
3234
;---------------------------------------------------------------------
3210
open_button_coordinates	rd 1
3235
open_button_coordinates	rd 1
3211
;---------------------------------------------------------------------
3236
;---------------------------------------------------------------------
-
 
3237
error_handler_store_input_mode rd 1
-
 
3238
;---------------------------------------------------------------------
3212
menu_text_area_1_1:
3239
menu_text_area_1_1:
3213
rb 256
3240
rb 256
3214
;---------------------------------------------------------------------
3241
;---------------------------------------------------------------------
3215
	rb 1024
3242
	rb 1024
3216
stacktop:
3243
stacktop: