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

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 55fdec3..af6eb05 100644 (file)
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 6a4de86..26aa5b5 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Resource/resource.h b/Resource/resource.h
index ec5a51a..4d95428 100644 (file)
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -619,6 +619,7 @@
 #define ID_BUTTON40174                  40174\r
 #define ID_BUTTON40175                  40175\r
 #define MENU_SWITCH_OSS                 40176\r
+#define MENU_OPEN                       40177\r
 #define FSNOTIFY_TITLE                  65535\r
 #define HOST_SIZEGRIP                   65535\r
 \r

diff --git a/Resource_eng/resource.h b/Resource_eng/resource.h
index 427bdf8..1afb49f 100644 (file)
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -619,6 +619,7 @@
 #define ID_BUTTON40174                  40174\r
 #define ID_BUTTON40175                  40175\r
 #define MENU_SWITCH_OSS                 40176\r
+#define MENU_OPEN                       40177\r
 #define FSNOTIFY_TITLE                  65535\r
 #define HOST_SIZEGRIP                   65535\r
 \r

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

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