Commit: 5e5cf084f3b774846e8bc10c6c9b9160cd1fc4c1 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: 5e5cf084f3b774846e8bc10c6c9b9160cd1fc4c1 (tree)
• Hora: 2012-02-08 22:33:53
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Change behavior of return key if a directory in the file list is chosen.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/resource.h
• modified: Resource_eng/resource.h
• modified: main.c
• modified: toolmenu.c

Diff

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/resource.h
+++ b/Resource/resource.h
@@ -619,6 +619,7 @@
 #define ID_BUTTON40174                  40174
 #define ID_BUTTON40175                  40175
 #define MENU_SWITCH_OSS                 40176
+#define MENU_OPEN                       40177
 #define FSNOTIFY_TITLE                  65535
 #define HOST_SIZEGRIP                   65535
 

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -619,6 +619,7 @@
 #define ID_BUTTON40174                  40174
 #define ID_BUTTON40175                  40175
 #define MENU_SWITCH_OSS                 40176
+#define MENU_OPEN                       40177
 #define FSNOTIFY_TITLE                  65535
 #define HOST_SIZEGRIP                   65535
 

--- a/main.c
+++ b/main.c
@@ -979,6 +979,22 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 				case MENU_DCLICK :
 					if(hWndCurFocus == GetLocalHwnd())
+						// ローカルフォルダを開く
+//						DoubleClickProc(WIN_LOCAL, YES, -1);
+						DoubleClickProc(WIN_LOCAL, NO, -1);
+					else
+					{
+						SuppressRefresh = 1;
+						// ローカルフォルダを開く
+//						DoubleClickProc(WIN_REMOTE, YES, -1);
+						DoubleClickProc(WIN_REMOTE, NO, -1);
+						SuppressRefresh = 0;
+					}
+					break;
+
+				// ローカルフォルダを開く
+				case MENU_OPEN :
+					if(hWndCurFocus == GetLocalHwnd())
 						DoubleClickProc(WIN_LOCAL, YES, -1);
 					else
 					{

--- a/toolmenu.c
+++ b/toolmenu.c
@@ -1896,7 +1896,9 @@ static void AddOpenMenu(HMENU hMenu, UINT Flg)
 	char Tmp[FMAX_PATH+1];
 	int i;
 
-	AppendMenu(hMenu, MF_STRING | Flg, MENU_DCLICK, MSGJPN274);
+	// ローカルフォルダを開く
+//	AppendMenu(hMenu, MF_STRING | Flg, MENU_DCLICK, MSGJPN274);
+	AppendMenu(hMenu, MF_STRING | Flg, MENU_OPEN, MSGJPN274);
 	for(i = 0; i < VIEWERS; i++)
 	{
 		if(strlen(ViewerName[i]) != 0)