OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

FFFTPのソースコードです。


Commit MetaInfo

Revisiónb973cd74709d6f624fdc31d6008c1b8c521c87b7 (tree)
Tiempo2011-11-18 23:30:26
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Add UI for MLSD command.

Cambiar Resumen

Diferencia incremental

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -999,16 +999,17 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
999999 FONT 9, "ＭＳ Ｐゴシック"
10001000 BEGIN
10011001 CONTROL "LISTコマンドでファイル一覧を取得(&L)",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10
1002- CONTROL "NLST -R を使って高速に再帰検索(&N)",HSET_NLST_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
1003- CONTROL "フルパスでファイルをアクセスしない(&F)",HSET_FULLPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1004- LTEXT "属性変更コマンド(&A)",-1,7,51,83,8
1005- EDITTEXT HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL
1006- PUSHBUTTON "標準",HSET_CHMOD_NOR,70,61,25,13
1007- LTEXT "ホストの種類(&H)",-1,7,80,69,8
1008- COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
1009- LTEXT "NLSTファイル名/オプション",-1,7,109,89,8
1010- EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL
1011- PUSHBUTTON "標準",HSET_LS_FNAME_NOR,70,119,25,13
1002+ CONTROL "可能であればMLSDコマンドで一覧を取得(&M)",HSET_MLSDCMD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
1003+ CONTROL "NLST -R を使って高速に再帰検索(&N)",HSET_NLST_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1004+ CONTROL "フルパスでファイルをアクセスしない(&F)",HSET_FULLPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
1005+ LTEXT "属性変更コマンド(&A)",-1,7,65,83,8
1006+ EDITTEXT HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL
1007+ PUSHBUTTON "標準",HSET_CHMOD_NOR,70,75,25,13
1008+ LTEXT "ホストの種類(&H)",-1,7,94,69,8
1009+ COMBOBOX HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
1010+ LTEXT "NLSTファイル名/オプション",-1,7,123,89,8
1011+ EDITTEXT HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL
1012+ PUSHBUTTON "標準",HSET_LS_FNAME_NOR,70,133,25,13
10121013 END
10131014
10141015 cwderr_dlg DIALOG 0, 0, 154, 69
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -437,6 +437,7 @@
437437 #define HSET_NOOP_INTERVAL_SPN 1209
438438 #define HSET_NETTYPE 1210
439439 #define HSET_ERROR_MODE 1211
440+#define HSET_MLSDCMD 1212
440441 #define MENU_END 40001
441442 #define MENU_EXIT 40001
442443 #define MENU_CONNECT 40003
@@ -623,7 +624,7 @@
623624 #ifndef APSTUDIO_READONLY_SYMBOLS
624625 #define _APS_NEXT_RESOURCE_VALUE 193
625626 #define _APS_NEXT_COMMAND_VALUE 40176
626-#define _APS_NEXT_CONTROL_VALUE 1212
627+#define _APS_NEXT_CONTROL_VALUE 1213
627628 #define _APS_NEXT_SYMED_VALUE 101
628629 #endif
629630 #endif
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1020,18 +1020,20 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
10201020 FONT 9, "MS Sans Serif"
10211021 BEGIN
10221022 CONTROL "Use &LIST command to get file list",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10
1023- CONTROL "Use &NLST -R for high-speed recursive search",HSET_NLST_R,
1023+ CONTROL "Use &MLSD command to get file list if possible",HSET_MLSDCMD,
10241024 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,167,10
1025+ CONTROL "Use &NLST -R for high-speed recursive search",HSET_NLST_R,
1026+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,167,10
10251027 CONTROL "&Do not use full path to access files",HSET_FULLPATH,
1026- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1027- LTEXT "&Permissions Change Command",-1,7,51,110,8
1028- EDITTEXT HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL
1029- PUSHBUTTON "Default",HSET_CHMOD_NOR,70,61,28,13
1030- LTEXT "&Host Type",-1,7,80,69,8
1031- COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
1032- LTEXT "NLST &Filename/Option",-1,7,109,89,8
1033- EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL
1034- PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,119,28,13
1028+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
1029+ LTEXT "&Permissions Change Command",-1,7,65,110,8
1030+ EDITTEXT HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL
1031+ PUSHBUTTON "Default",HSET_CHMOD_NOR,70,75,28,13
1032+ LTEXT "&Host Type",-1,7,94,69,8
1033+ COMBOBOX HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
1034+ LTEXT "NLST &Filename/Option",-1,7,123,89,8
1035+ EDITTEXT HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL
1036+ PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,133,28,13
10351037 END
10361038
10371039 cwderr_dlg DIALOG 0, 0, 155, 57
@@ -1402,7 +1404,8 @@ BEGIN
14021404 EDITTEXT HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER
14031405 CONTROL "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14
14041406 LTEXT "(1 to 4 threads)",-1,102,10,53,8
1405- CONTROL "Reuse socket of the main window",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10
1407+ CONTROL "Reuse socket of the main window",HSET_REUSE_SOCKET,
1408+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10
14061409 LTEXT "Command for Keep Alive",-1,7,44,84,8
14071410 EDITTEXT HSET_NOOP_INTERVAL,92,42,17,12,ES_AUTOHSCROLL | ES_NUMBER
14081411 CONTROL "Spin1",HSET_NOOP_INTERVAL_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,109,41,9,14
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -437,6 +437,7 @@
437437 #define HSET_NOOP_INTERVAL_SPN 1209
438438 #define HSET_NETTYPE 1210
439439 #define HSET_ERROR_MODE 1211
440+#define HSET_MLSDCMD 1212
440441 #define MENU_END 40001
441442 #define MENU_EXIT 40001
442443 #define MENU_CONNECT 40003
@@ -623,7 +624,7 @@
623624 #ifndef APSTUDIO_READONLY_SYMBOLS
624625 #define _APS_NEXT_RESOURCE_VALUE 193
625626 #define _APS_NEXT_COMMAND_VALUE 40176
626-#define _APS_NEXT_CONTROL_VALUE 1212
627+#define _APS_NEXT_CONTROL_VALUE 1213
627628 #define _APS_NEXT_SYMED_VALUE 101
628629 #endif
629630 #endif
--- a/hostman.c
+++ b/hostman.c
@@ -2083,6 +2083,10 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
20832083 SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_SETCHECK, TmpHost.ListCmdOnly, 0);
20842084 if(TmpHost.ListCmdOnly == YES)
20852085 EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);
2086+ // MLSD対応
2087+ else
2088+ EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), FALSE);
2089+ SendDlgItemMessage(hDlg, HSET_MLSDCMD, BM_SETCHECK, TmpHost.UseMLSD, 0);
20862090 SendDlgItemMessage(hDlg, HSET_NLST_R, BM_SETCHECK, TmpHost.UseNLST_R, 0);
20872091 SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_SETCHECK, TmpHost.NoFullPath, 0);
20882092 SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN139);
@@ -2110,6 +2114,8 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
21102114 SendDlgItemMessage(hDlg, HSET_CHMOD_CMD, WM_GETTEXT, CHMOD_CMD_LEN+1, (LPARAM)TmpHost.ChmodCmd);
21112115 SendDlgItemMessage(hDlg, HSET_LS_FNAME, WM_GETTEXT, NLST_NAME_LEN+1, (LPARAM)TmpHost.LsName);
21122116 TmpHost.ListCmdOnly = SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0);
2117+ // MLSD対応
2118+ TmpHost.UseMLSD = SendDlgItemMessage(hDlg, HSET_MLSDCMD, BM_GETCHECK, 0, 0);
21132119 TmpHost.UseNLST_R = SendDlgItemMessage(hDlg, HSET_NLST_R, BM_GETCHECK, 0, 0);
21142120 TmpHost.NoFullPath = SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_GETCHECK, 0, 0);
21152121 TmpHost.HostType = SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_GETCURSEL, 0, 0);
@@ -2138,9 +2144,19 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
21382144
21392145 case HSET_LISTCMD :
21402146 if(SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0) == 0)
2147+ // MLSD対応
2148+// EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE);
2149+ {
2150+ EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), FALSE);
21412151 EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE);
2152+ }
21422153 else
2154+ // MLSD対応
2155+// EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);
2156+ {
2157+ EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), TRUE);
21432158 EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE);
2159+ }
21442160 break;
21452161
21462162 case HSET_HOSTTYPE :