提交: b45196d972e21f6b5880d9c335207c2000603544 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修订版: b45196d972e21f6b5880d9c335207c2000603544 (tree)
• 时间: 2013-08-29 05:39:34
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add options for automatic file list refresh.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: main.c
• modified: option.c
• modified: registry.c

差异

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
@@ -1458,6 +1458,7 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "ファイルの属性を数字で表示する(&P)",DISP2_PERMIT_NUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,196,10
+    CONTROL         "ファイル一覧を自動で更新する(&R)",DISP2_AUTO_REFRESH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,196,10
 END
 
 

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -230,6 +230,7 @@
 #define PERM_O_EXEC                     1016
 #define TOOL_EDITOR2_BR                 1016
 #define CONNECT_QUICK_ANONY             1016
+#define DISP2_AUTO_REFRESH              1016
 #define PERM_G_EXEC                     1017
 #define TOOL_EDITOR3_BR                 1017
 #define CONNECT_SENDQUIT                1017

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1493,6 +1493,8 @@ FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Display file &permissions in numbers",DISP2_PERMIT_NUM,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,196,10
+    CONTROL         "&Refresh the file list automatically",DISP2_AUTO_REFRESH,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,196,10
 END
 
 

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -230,6 +230,7 @@
 #define PERM_O_EXEC                     1016
 #define TOOL_EDITOR2_BR                 1016
 #define CONNECT_QUICK_ANONY             1016
+#define DISP2_AUTO_REFRESH              1016
 #define PERM_G_EXEC                     1017
 #define TOOL_EDITOR3_BR                 1017
 #define CONNECT_SENDQUIT                1017

--- a/main.c
+++ b/main.c
@@ -261,6 +261,8 @@ int UPnPEnabled = YES;
 time_t LastDataConnectionTime = 0;
 // 全設定暗号化対応
 int EncryptAllSettings = NO;
+// ローカル側自動更新
+int AutoRefreshFileList = YES;
 
 
 
@@ -944,19 +946,22 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				{
 					if(AskUserOpeDisabled() == NO)
 					{
-						FILELIST* Base;
-						char Name[FMAX_PATH+1];
-						int Pos;
 						FindNextChangeNotification(ChangeNotification);
-						Base = NULL;
-						MakeSelectedFileList(WIN_LOCAL, NO, NO, &Base, &CancelFlg);
-						GetHotSelected(WIN_LOCAL, Name);
-						Pos = SendMessage(GetLocalHwnd(), LVM_GETTOPINDEX, 0, 0);
-						GetLocalDirForWnd();
-						SelectFileInList(GetLocalHwnd(), SELECT_LIST, Base);
-						SetHotSelected(WIN_LOCAL, Name);
-						SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)(SendMessage(GetLocalHwnd(), LVM_GETITEMCOUNT, 0, 0) - 1), (LPARAM)TRUE);
-						SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)Pos, (LPARAM)TRUE);
+						if(AutoRefreshFileList == YES)
+						{
+							FILELIST* Base;
+							char Name[FMAX_PATH+1];
+							int Pos;
+							Base = NULL;
+							MakeSelectedFileList(WIN_LOCAL, NO, NO, &Base, &CancelFlg);
+							GetHotSelected(WIN_LOCAL, Name);
+							Pos = SendMessage(GetLocalHwnd(), LVM_GETTOPINDEX, 0, 0);
+							GetLocalDirForWnd();
+							SelectFileInList(GetLocalHwnd(), SELECT_LIST, Base);
+							SetHotSelected(WIN_LOCAL, Name);
+							SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)(SendMessage(GetLocalHwnd(), LVM_GETITEMCOUNT, 0, 0) - 1), (LPARAM)TRUE);
+							SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)Pos, (LPARAM)TRUE);
+						}
 					}
 				}
 				if(NoopEnable == YES && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())

--- a/option.c
+++ b/option.c
@@ -182,6 +182,8 @@ extern int MakeAllDir;
 extern int UPnPEnabled;
 // 全設定暗号化対応
 extern int EncryptAllSettings;
+// ローカル側自動更新
+extern int AutoRefreshFileList;
 
 
 /*----- オプションのプロパティシート ------------------------------------------
@@ -1191,6 +1193,7 @@ static INT_PTR CALLBACK Disp1SettingProc(HWND hDlg, UINT message, WPARAM wParam,
 
 
 // ファイルの属性を数字で表示
+// ローカル側自動更新
 static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	NMHDR *pnmhdr;
@@ -1200,6 +1203,7 @@ static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam,
 	{
 		case WM_INITDIALOG :
 			SendDlgItemMessage(hDlg, DISP2_PERMIT_NUM, BM_SETCHECK, DispPermissionsNumber, 0);
+			SendDlgItemMessage(hDlg, DISP2_AUTO_REFRESH, BM_SETCHECK, AutoRefreshFileList, 0);
 		    return(TRUE);
 
 		case WM_NOTIFY:
@@ -1208,6 +1212,7 @@ static INT_PTR CALLBACK Disp2SettingProc(HWND hDlg, UINT message, WPARAM wParam,
 			{
 				case PSN_APPLY :
 					DispPermissionsNumber = SendDlgItemMessage(hDlg, DISP2_PERMIT_NUM, BM_GETCHECK, 0, 0);
+					AutoRefreshFileList = SendDlgItemMessage(hDlg, DISP2_AUTO_REFRESH, BM_GETCHECK, 0, 0);
 					break;
 
 				case PSN_RESET :

--- a/registry.c
+++ b/registry.c
@@ -217,6 +217,8 @@ extern int LocalKanjiCode;
 extern int UPnPEnabled;
 // 全設定暗号化対応
 extern int EncryptAllSettings;
+// ローカル側自動更新
+extern int AutoRefreshFileList;
 
 /*----- マスタパスワードの設定 ----------------------------------------------
 *
@@ -669,6 +671,8 @@ void SaveRegistry(void)
 				WriteIntValueToReg(hKey4, "Kanji", LocalKanjiCode);
 				// UPnP対応
 				WriteIntValueToReg(hKey4, "UPnP", UPnPEnabled);
+				// ローカル側自動更新
+				WriteIntValueToReg(hKey4, "ListRefresh", AutoRefreshFileList);
 			}
 			CloseSubKey(hKey4);
 		}
@@ -1118,6 +1122,8 @@ int LoadRegistry(void)
 			ReadIntValueFromReg(hKey4, "Kanji", &LocalKanjiCode);
 			// UPnP対応
 			ReadIntValueFromReg(hKey4, "UPnP", &UPnPEnabled);
+			// ローカル側自動更新
+			ReadIntValueFromReg(hKey4, "ListRefresh", &AutoRefreshFileList);
 
 			CloseSubKey(hKey4);
 		}