Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7892 → Rev 7959

/programs/network/ftpc/ftpc.asm
933,9 → 933,15
path rb 1024
 
initial_login rb 1
param_user rb 1024
 
param_user: db 'anonymous',0
rb 60
 
param_password rb 1024
param_server_addr rb 1024
 
param_server_addr db 'kolibrios.org'
rb 1024
 
param_path rb 1024
param_port rb 6
 
/programs/network/ftpc/gui.inc
105,7 → 105,6
m2m dword[tree2.data_img], dword[icon_tl_nod]
@@:
mcall 67, 35, 20, 830, 555 ; resize to main gui window's coordinates
call .draw
; create initial tree list for root_dir
call populate_local_tree_list
199,9 → 198,9
mcall 4, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,80+5>, 0xb0000000+STR_COL, str_mkd
; draw "cancel" button
mcall 8, <555,55>, <308,25>, 10, BT_COL
;mcall 8, <555,55>, <308,25>, 10, BT_COL
; string "Cancel"
mcall 4, <555+5,308+5>, 0xb0000000+STR_COL, str_abort
;mcall 4, <555+5,308+5>, 0xb0000000+STR_COL, str_abort
; draw "change volume" button
mcall 8, <TLIST1_X+TLIST_SZ-55,55>, <100-20,22>, 11, BT_COL
; string "Change"
223,9 → 222,6
stdcall [edit_box_draw], edit_volume
stdcall [edit_box_draw], edit_search
 
; progress bar
stdcall [progressbar_draw], pb
 
mcall 12,2
ret
 
892,16 → 888,16
0, el_focus, wScr2, fun_on_enter2
 
; editbox for mkd
edit_mkd edit_box TLIST_SZ-45, TLIST2_X, 82, 0xffffff, 0x6a9480, 0, \
0xAABBCC, 0, 99, new_dir_buf, mouse_dd, 0
edit_mkd edit_box TLIST_SZ-45, TLIST2_X, 80, 0xffffff, 0x94AECE, 0, \
0xAABBCC, 0x10000000, 63, new_dir_buf, mouse_dd, 0
 
; editbox for default volume
edit_volume edit_box TLIST_SZ-60, TLIST1_X, 105-20, 0xffffff, 0x6a9480, 0, \
0xAABBCC, 0, 99, root_dir, mouse_dd, 0
edit_volume edit_box TLIST_SZ-60, TLIST1_X, 80, 0xffffff, 0x94AECE, 0, \
0xAABBCC, 0x10000000, 99, root_dir, mouse_dd, 0
 
; editbox for search
edit_search edit_box TLIST_SZ-60, TLIST2_X, 25, 0xffffff, 0x6a9480, 0, \
0xAABBCC, 0, 99, filter,mouse_dd, 0
edit_search edit_box TLIST_SZ-60, TLIST2_X, 22, 0xffffff, 0x94AECE, 0, \
0xAABBCC, 0x10000000, 99, filter,mouse_dd, 0
; A subsidiary structure for scrolling
align 4
1190,9 → 1186,9
 
auto_list db 1 ; to run LIST immediately after CWD
filter rb 512
root_dir db '/rd/1'
rb 507
new_dir_buf rb 512
root_dir db '/tmp0/1'
rb 505
new_dir_buf rb 64
folder_data rb 32+32*304
node_entry db '1111'
rb 512
/programs/network/ftpc/login_gui.inc
7,7 → 7,7
WIN_W = 390
WIN_H = 230
 
pad = 28 ; padding between editboxes
PAD = 28 ; padding between editboxes
 
;;================================================================================================;;
login_gui: ;//////////////////////////////////////////////////////////////////////////////////////;;
60,10 → 60,10
mov ecx, 0x90000000
or ecx, [sc.work_text]
mcall 4, <3, 8>, , gui_str_usr
mcall , <3,pad*1+8>, , gui_str_pass
mcall , <3,pad*2+8>, , gui_str_server
mcall , <3,pad*3+8>, , gui_str_port
mcall , <3,pad*4+8>, , gui_str_path
mcall , <3,PAD*1+8>, , gui_str_pass
mcall , <3,PAD*2+8>, , gui_str_server
mcall , <3,PAD*3+8>, , gui_str_port
mcall , <3,PAD*4+8>, , gui_str_path
mov ecx, 0x90000000
or ecx, [sc.work_button_text]
124,6 → 124,7
jmp .still
.connect:
mcall 67, 35, 20, 830, 555 ; resize to main gui window's coordinates
cmp [param_server_addr], 0
jne gui.main
191,11 → 192,11
str_error_addr dd gui_str_null
 
; login window components
edit_usr edit_box 300,75,5, 0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_user,mouse_dd,ed_focus
edit_pass edit_box 300,75,pad+5, 0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_password,mouse_dd,ed_pass
edit_server edit_box 300,75,pad*2+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_server_addr,mouse_dd,0
edit_port edit_box 50, 75,pad*3+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_port,mouse_dd,ed_figure_only
edit_path edit_box 300,75,pad*4+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_path,mouse_dd,0
edit_usr edit_box 300,75,5, 0xffffff,0x94AECE,0,0xAABBCC,0x10000000,64,param_user,mouse_dd,ed_focus,9,9
edit_pass edit_box 300,75,PAD+5, 0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_password,mouse_dd,ed_pass
edit_server edit_box 300,75,PAD*2+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,1024,param_server_addr,mouse_dd,0,13,13
edit_port edit_box 50, 75,PAD*3+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_port,mouse_dd,ed_figure_only
edit_path edit_box 300,75,PAD*4+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_path,mouse_dd,0
editboxes_end:
 
mouse_dd rd 1