diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 2bffe939c9..f9cf7b3048 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -253,6 +253,12 @@ extra_files = { {"kolibrios/media/minimp3", "common/media/minimp3"}, {"kolibrios/media/updf", "common/media/updf"}, {"kolibrios/media/vttf", "common/media/vttf"}, + {"kolibrios/media/beat/Beat", PROGS .. "/media/Beat/Beat"}, + {"kolibrios/media/beat/Beep1.raw", PROGS .. "/media/Beat/Beep1.raw"}, + {"kolibrios/media/beat/Beep2.raw", PROGS .. "/media/Beat/Beep2.raw"}, + {"kolibrios/media/beat/PlayNote", PROGS .. "/media/Beat/PlayNote/PlayNote"}, + {"kolibrios/media/beat/Readme-en.txt", PROGS .. "/media/Beat/Readme-en.txt"}, + {"kolibrios/media/beat/Readme-ru.txt", PROGS .. "/media/Beat/Readme-ru.txt"}, {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"}, {"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"}, {"kolibrios/res/skins/", "../skins/authors.txt"}, diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini index 48880a4596..218cf240d5 100644 --- a/data/common/settings/app_plus.ini +++ b/data/common/settings/app_plus.ini @@ -11,6 +11,7 @@ GrafX2=/k/grafx2/grafx2,48 uPDF=/k/media/updf,73 IconEdit=media/iconedit,98 EasyShot=easyshot,62 +Beat=/k/media/beat/Beat,64 [3D Tools and Demos] Info3DsPro=/k/3d/info3ds/info3ds,75 @@ -33,7 +34,4 @@ TinyBasic=/k/develop/TinyBasic/TinyBasic,91 Notes=/k/utils/notes,117 Table=table,28 FtpClient=network/ftpc,90 -VncViewer=network/vncc,77 -Timer=demos/timer,119 -ASCII View=asciivju,118 diff --git a/programs/develop/libraries/box_lib/trunk/tree_list.asm b/programs/develop/libraries/box_lib/trunk/tree_list.asm index bace53bdfa..13d59052cc 100644 --- a/programs/develop/libraries/box_lib/trunk/tree_list.asm +++ b/programs/develop/libraries/box_lib/trunk/tree_list.asm @@ -240,7 +240,12 @@ push eax ebx ;------------------------------------------------ .mouse_next: - mcall SF_MOUSE_GET,SSF_BUTTON + mcall SF_MOUSE_GET,SSF_BUTTON_EXT + test eax,$01000000 + jz @f + call tl_on_press + ret +@@: bt eax,0 ;left mouse button press pop ebx eax jae .no_draw diff --git a/programs/network/ftpc/ftpc.asm b/programs/network/ftpc/ftpc.asm index a527ff64a1..0aa0eabfb7 100644 --- a/programs/network/ftpc/ftpc.asm +++ b/programs/network/ftpc/ftpc.asm @@ -933,9 +933,15 @@ logfile_offset rd 1 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 diff --git a/programs/network/ftpc/gui.inc b/programs/network/ftpc/gui.inc index fd09682295..baaa929121 100755 --- a/programs/network/ftpc/gui.inc +++ b/programs/network/ftpc/gui.inc @@ -105,7 +105,6 @@ gui: ;////////////////////////////////////////////////////////////////////////// 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 @@ gui: ;////////////////////////////////////////////////////////////////////////// mcall 4, , 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, , <100-20,22>, 11, BT_COL ; string "Change" @@ -223,9 +222,6 @@ gui: ;////////////////////////////////////////////////////////////////////////// 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 @@ tree2 tree_list 64, 500, tl_list_box_mode, 16, 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 @@ run_file_70 FileInfoBlock ; required for libimg 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 diff --git a/programs/network/ftpc/login_gui.inc b/programs/network/ftpc/login_gui.inc index 81d3864a37..71c27df6e5 100755 --- a/programs/network/ftpc/login_gui.inc +++ b/programs/network/ftpc/login_gui.inc @@ -7,7 +7,7 @@ WIN_Y = 300 WIN_W = 390 WIN_H = 230 -pad = 28 ; padding between editboxes +PAD = 28 ; padding between editboxes ;;================================================================================================;; login_gui: ;//////////////////////////////////////////////////////////////////////////////////////;; @@ -60,10 +60,10 @@ login_gui: ;//////////////////////////////////////////////////////////////////// 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 @@ login_gui: ;//////////////////////////////////////////////////////////////////// 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 @@ gui_str_null db ' ',0 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