WebSVN – Kolibri OS – Diff – /programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm

 ;*****************************************************************************
 ; Open Dialog - for Kolibri OS
-; Copyright (c) 2009, Marat Zakiyanov aka Mario79, aka Mario
+; Copyright (c) 2009, 2010, Marat Zakiyanov aka Mario79, aka Mario
 ; All rights reserved.
+;
 ; Redistribution and use in source and binary forms, with or without
 ; modification, are permitted provided that the following conditions are met:
 ;        * Redistributions of source code must retain the above copyright
 include '../../../../../macros.inc'
 include '../../load_lib.mac'
 include '../../trunk/box_lib.mac'
 ;include 'macros.inc'
 ;include 'load_lib.mac'
+;include 'box_lib.mac'
 @use_library
 ;---------------------------------------------------------------------
 ;---------------------------------------------------------------------
 START:
 	mcall	68,11
 key_ASCII:
 	mcall	2
 	cmp	ah,9
 	je	change_focus_area_Tab_key_ASCII
 	cmp	ah,13
-	je	.load_dir
+	je	.13
 	cmp	ah,27
 	je	button.exit
 	push	dword name_editboxes
 	call	[edit_box_key]
 	jmp	still
+.13:
+	cmp	[open_dialog_type],2 ; Select dir
+	je	file_no_folder
+	cmp	[open_dialog_type],1 ; Save file
+	jne .load_dir
+	inc	[open_dialog_type]
+	jmp file_no_folder
 .load_dir:
 	mov	[file_browser_data_1.select_panel_counter],1
 	xor	eax,eax
 	mov	[focus_pointer],al
 	mcall	66, 1, 1
 	jne	still
 .exit:
 	mov	eax,[communication_area]
 	test	eax,eax
 	jz	@f
-	cmp	[eax],dword 1
+	cmp	[eax],word 1
 	je	@f
-	mov	[eax],dword 3
+	mov	[eax],word 3
 @@:
 	mov	eax,[N_error]
 	test	eax,eax
 	jz	@f
 	call	start_error_window_thread
 .exit_dir:
 	call	load_next_dir.exit_dir
 	jmp	still
 ;---------------------------------------------------------------------
 .open_dir_or_file:
+	cmp	[open_dialog_type],2 ;Select dir
+	je	file_no_folder
+;	cmp	[open_dialog_type],1 ;Save file
+;	je	file_no_folder
 	xor	ebx,ebx
 	jmp	key.7
 ;---------------------------------------------------------------------
 thread_start:
 	mov	eax,[N_error]
 	jmp	.still
 ;---------------------------------------------------------------------
 draw_error_window:
 	mcall	12, 1
 	mcall	0,[error_window_x] ,[error_window_y], 0x03ff0000
-	mcall	71,1,title
+	call	type_title
 	mcall	4,<10,30>,0x90ffffff,[N_error]
 	mov	eax,[error_path]
 	test	eax,eax
 	jz	@f
 	mcall	4,<10,50>, ,[error_path]
 	mov	al,[param]
 	test	eax,eax
 	jz	@f
 	mcall	68,22,param,,0x01
 	mov	[communication_area],eax
+	movzx eax,word [eax+2]
+	mov [open_dialog_type],eax
 @@:
 	ret
 ;---------------------------------------------------------------------
 load_start_directory:
 	mov	eax,[communication_area]
 	test	eax,eax
 	jz	@f
-	mov	ebx,[eax]
+	movzx	ebx,word [eax]
 	test	eax,eax
 	jz	@f
 	add	eax,4
 	mov	esi,eax
 	jmp	.1
 file_no_folder:
 	mov	esi,dir_pach
 	mov	edi,file_name
 	call	copy_dir_name
+	cmp	[open_dialog_type],2
 	je	@f
 	mov	esi,file_name
 	call	copy_dir_path
 @@:
 	mov	eax,[communication_area]
 	test	eax,eax
 	jnz	@f
 	call	control_minimal_window_size
 	mov	edi,eax
 	add	edi,4
 	mov	esi,file_name
 	call	copy_dir_name
 	mov	eax,[communication_area]
-	mov	[eax],dword 1
+	mov	[eax],word 1
 	jmp	button.exit
 ;---------------------------------------------------------------------
 load_root_directory:
 	mov	esi,root_pach
 	mov	edi,dir_pach
 ;---------------------------------------------------------------------
 memory_get_error:
 	mov	[N_error],4
 	jmp	button.exit
 ;---------------------------------------------------------------------
+type_title:
+	mov	ecx,[open_dialog_type]
+	shl ecx,2
+	add ecx,open_dialog_title_pointer
+	mov ecx,[ecx]
+	test	ecx,ecx
+	jz	@f
+	mcall	71,1,  ; title ;;param  ;file_name   ;dir_pach
+@@:
+	ret
+;---------------------------------------------------------------------
 draw_window:
 	mcall	12,1
 	mcall	0,<10,420>,<10,320>,0x63AABBCC,
-;       mov     ecx,[communication_area]
-;       add     ecx,4096+4+4
 ;       mov     ecx,[communication_area]
-	mcall	71,1,  title ;;param  ;file_name   ;dir_pach
+;       add     ecx,4096+4+4
 	call	type_title
 	call	get_window_param
 	pusha
 	shr	ecx,16
 	mov	bx,cx
+	add	ebx,12 shl 16+ 4
+	mov	edx,[open_dialog_type]
+	shl edx,2
+	add edx,message_open_dialog_button
+	mov edx,[edx]
+	cmp	[open_dialog_type],2 ; Select dir
+	jne	@f
+	sub	ebx,5 shl 16
+@@:
-	add	ebx,12 shl 16+ 4
-	mcall	4,,0x90000000,message_open_button
+	mcall	4,,0x90000000    ;message_open_button
 	popa
 	je	.delete
 @@:
 	test	[eax-40],byte 0x10
 	jnz	.start
+	cmp	[open_dialog_type],2 ; Select dir
+	je	.delete
 	push	eax ebx
 	mov	esi,eax
 	call	search_expansion
 	test	eax,eax
 root1_folder_area	dd 0
 root1_folder_block	dd 0
 temp_counter_1		dd 0
 retrieved_devices_table_counter dd 0
 communication_area	dd 0
+open_dialog_type	dd 0
+open_dialog_title_pointer:
+	dd	title_0
+	dd	title_1
+	dd	title_2
+	dd	0
+message_open_dialog_button:
+	dd	message_0
+	dd	message_1
+	dd	message_2
+	dd	0
 ;---------------------------------------------------------------------
 expansion_length	dd	0
 ;---------------------------------------------------------------------
 N_error 		dd 0
 error_type		dd 0
 	db 'Press any key...',0
 message_cancel_button:
-	db 'Cancel',0
-message_open_button:
-	db 'Open',0
+	db 'Cancel',0
 message_ReloadDir_button:
 	db 'Refresh',0
+message_ExitDir_button:
+	db '^',0
+message_0:
+	db 'Open',0
+message_1:
+	db 'Save',0
+message_2:
-message_ExitDir_button:
+	db 'Select',0
+title_0:
+	db 'Open Dialog',0
-	db '^',0
+title_1:
 	db 'Save Dialog',0
-title:
+title_2:
-	db 'Open Dialog',0
+	db 'Select Dir',0
 ;---------------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm – Rev 1373 → 1417