From: s_kawamoto Date: Fri, 18 Nov 2011 14:30:26 +0000 (+0900) Subject: Add UI for MLSD command. X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=b973cd74709d6f624fdc31d6008c1b8c521c87b7;p=ffftp%2Fffftp.git Add UI for MLSD command. --- diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe index aac2807..d4e2d2a 100644 Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe index 6d5c6e8..08399a4 100644 Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc index 45f1ae5..e62d918 100644 --- a/Resource/FFFTP.rc +++ b/Resource/FFFTP.rc @@ -999,16 +999,17 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 9, "‚l‚r ‚oƒSƒVƒbƒN" BEGIN CONTROL "LISTƒRƒ}ƒ“ƒh‚Ńtƒ@ƒCƒ‹ˆê——‚ðŽæ“¾(&L)",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10 - CONTROL "NLST -R ‚ðŽg‚Á‚č‚‘¬‚ɍċAŒŸõ(&N)",HSET_NLST_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10 - CONTROL "ƒtƒ‹ƒpƒX‚Ńtƒ@ƒCƒ‹‚ðƒAƒNƒZƒX‚µ‚È‚¢(&F)",HSET_FULLPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10 - LTEXT "‘®«•ÏXƒRƒ}ƒ“ƒh(&A)",-1,7,51,83,8 - EDITTEXT HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL - PUSHBUTTON "•W€",HSET_CHMOD_NOR,70,61,25,13 - LTEXT "ƒzƒXƒg‚ÌŽí—Þ(&H)",-1,7,80,69,8 - COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "NLSTƒtƒ@ƒCƒ‹–¼/ƒIƒvƒVƒ‡ƒ“",-1,7,109,89,8 - EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL - PUSHBUTTON "•W€",HSET_LS_FNAME_NOR,70,119,25,13 + CONTROL "‰Â”\‚Å‚ ‚ê‚ÎMLSDƒRƒ}ƒ“ƒh‚ňꗗ‚ðŽæ“¾(&M)",HSET_MLSDCMD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10 + CONTROL "NLST -R ‚ðŽg‚Á‚č‚‘¬‚ɍċAŒŸõ(&N)",HSET_NLST_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10 + CONTROL "ƒtƒ‹ƒpƒX‚Ńtƒ@ƒCƒ‹‚ðƒAƒNƒZƒX‚µ‚È‚¢(&F)",HSET_FULLPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10 + LTEXT "‘®«•ÏXƒRƒ}ƒ“ƒh(&A)",-1,7,65,83,8 + EDITTEXT HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL + PUSHBUTTON "•W€",HSET_CHMOD_NOR,70,75,25,13 + LTEXT "ƒzƒXƒg‚ÌŽí—Þ(&H)",-1,7,94,69,8 + COMBOBOX HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "NLSTƒtƒ@ƒCƒ‹–¼/ƒIƒvƒVƒ‡ƒ“",-1,7,123,89,8 + EDITTEXT HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL + PUSHBUTTON "•W€",HSET_LS_FNAME_NOR,70,133,25,13 END cwderr_dlg DIALOG 0, 0, 154, 69 diff --git a/Resource/resource.h b/Resource/resource.h index ed87acc..12173b9 100644 --- a/Resource/resource.h +++ b/Resource/resource.h @@ -437,6 +437,7 @@ #define HSET_NOOP_INTERVAL_SPN 1209 #define HSET_NETTYPE 1210 #define HSET_ERROR_MODE 1211 +#define HSET_MLSDCMD 1212 #define MENU_END 40001 #define MENU_EXIT 40001 #define MENU_CONNECT 40003 @@ -623,7 +624,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 193 #define _APS_NEXT_COMMAND_VALUE 40176 -#define _APS_NEXT_CONTROL_VALUE 1212 +#define _APS_NEXT_CONTROL_VALUE 1213 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/Resource_eng/FFFTP-eng.rc b/Resource_eng/FFFTP-eng.rc index 6d8d073..8013da3 100644 --- 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 FONT 9, "MS Sans Serif" BEGIN CONTROL "Use &LIST command to get file list",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10 - CONTROL "Use &NLST -R for high-speed recursive search",HSET_NLST_R, + CONTROL "Use &MLSD command to get file list if possible",HSET_MLSDCMD, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,167,10 + CONTROL "Use &NLST -R for high-speed recursive search",HSET_NLST_R, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,167,10 CONTROL "&Do not use full path to access files",HSET_FULLPATH, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10 - LTEXT "&Permissions Change Command",-1,7,51,110,8 - EDITTEXT HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL - PUSHBUTTON "Default",HSET_CHMOD_NOR,70,61,28,13 - LTEXT "&Host Type",-1,7,80,69,8 - COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "NLST &Filename/Option",-1,7,109,89,8 - EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL - PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,119,28,13 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10 + LTEXT "&Permissions Change Command",-1,7,65,110,8 + EDITTEXT HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL + PUSHBUTTON "Default",HSET_CHMOD_NOR,70,75,28,13 + LTEXT "&Host Type",-1,7,94,69,8 + COMBOBOX HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "NLST &Filename/Option",-1,7,123,89,8 + EDITTEXT HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL + PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,133,28,13 END cwderr_dlg DIALOG 0, 0, 155, 57 @@ -1402,7 +1404,8 @@ BEGIN EDITTEXT HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14 LTEXT "(1 to 4 threads)",-1,102,10,53,8 - CONTROL "Reuse socket of the main window",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10 + CONTROL "Reuse socket of the main window",HSET_REUSE_SOCKET, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10 LTEXT "Command for Keep Alive",-1,7,44,84,8 EDITTEXT HSET_NOOP_INTERVAL,92,42,17,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "Spin1",HSET_NOOP_INTERVAL_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,109,41,9,14 diff --git a/Resource_eng/resource.h b/Resource_eng/resource.h index 8e996d5..05d49bf 100644 --- a/Resource_eng/resource.h +++ b/Resource_eng/resource.h @@ -437,6 +437,7 @@ #define HSET_NOOP_INTERVAL_SPN 1209 #define HSET_NETTYPE 1210 #define HSET_ERROR_MODE 1211 +#define HSET_MLSDCMD 1212 #define MENU_END 40001 #define MENU_EXIT 40001 #define MENU_CONNECT 40003 @@ -623,7 +624,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 193 #define _APS_NEXT_COMMAND_VALUE 40176 -#define _APS_NEXT_CONTROL_VALUE 1212 +#define _APS_NEXT_CONTROL_VALUE 1213 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/hostman.c b/hostman.c index 25c758d..afd2e4e 100644 --- a/hostman.c +++ b/hostman.c @@ -2083,6 +2083,10 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_SETCHECK, TmpHost.ListCmdOnly, 0); if(TmpHost.ListCmdOnly == YES) EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE); + // MLSD対応 + else + EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), FALSE); + SendDlgItemMessage(hDlg, HSET_MLSDCMD, BM_SETCHECK, TmpHost.UseMLSD, 0); SendDlgItemMessage(hDlg, HSET_NLST_R, BM_SETCHECK, TmpHost.UseNLST_R, 0); SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_SETCHECK, TmpHost.NoFullPath, 0); SendDlgItemMessage(hDlg, HSET_HOSTTYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN139); @@ -2110,6 +2114,8 @@ static BOOL CALLBACK Adv2SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP SendDlgItemMessage(hDlg, HSET_CHMOD_CMD, WM_GETTEXT, CHMOD_CMD_LEN+1, (LPARAM)TmpHost.ChmodCmd); SendDlgItemMessage(hDlg, HSET_LS_FNAME, WM_GETTEXT, NLST_NAME_LEN+1, (LPARAM)TmpHost.LsName); TmpHost.ListCmdOnly = SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0); + // MLSD対応 + TmpHost.UseMLSD = SendDlgItemMessage(hDlg, HSET_MLSDCMD, BM_GETCHECK, 0, 0); TmpHost.UseNLST_R = SendDlgItemMessage(hDlg, HSET_NLST_R, BM_GETCHECK, 0, 0); TmpHost.NoFullPath = SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_GETCHECK, 0, 0); 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 case HSET_LISTCMD : if(SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0) == 0) + // MLSD対応 +// EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE); + { + EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), FALSE); EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE); + } else + // MLSD対応 +// EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE); + { + EnableWindow(GetDlgItem(hDlg, HSET_MLSDCMD), TRUE); EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE); + } break; case HSET_HOSTTYPE :