Add feature to move remote files to their parent directory.

Change behavior of settings for UPnP.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index bc7fadd..cea7cfa 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 d96a764..d1c6d81 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index 1977fc2..d699260 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -222,6 +222,7 @@ BEGIN
         MENUITEM "\91S\82Ä\82ð\83_\83E\83\93\83\8d\81[\83h",                   MENU_DOWNLOAD_ALL\r
         MENUITEM "\91S\82Ä\82ð\83A\83b\83v\83\8d\81[\83h",                   MENU_UPLOAD_ALL\r
         MENUITEM "OSS<->GUARDIAN \90Ø\82è\91Ö\82¦",         MENU_SWITCH_OSS\r
+        MENUITEM "\88ê\82Â\8fã\82Ì\83t\83H\83\8b\83_\82Ö\88Ú\93®",                 MENU_REMOTE_MOVE_UPDIR\r
     END\r
 END\r
 \r
@@ -962,11 +963,11 @@ BEGIN
     CONTROL         "Spin1",CONNECT_HIST_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,116,62,9,14\r
     LTEXT           "(0\81`20)",-1,129,65,31,8\r
     CONTROL         "\90Ú\91±\83q\83X\83g\83\8a\82É\83p\83X\83\8f\81[\83h\82à\8bL\89¯\82·\82é(&P)",CONNECT_HIST_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,80,129,10\r
-    CONTROL         "\83N\83C\83b\83N\90Ú\91±\82Íanonymous-FTP\82ð\8aî\96{\82Æ\82·\82é(&Q)",CONNECT_QUICK_ANONY,\r
+    CONTROL         "\83N\83C\83b\83N\90Ú\91±\82Íanonymous-FTP\82ð\8aî\96{\82Æ\82·\82é(&A)",CONNECT_QUICK_ANONY,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10\r
-    CONTROL         "\90Ø\92f\8e\9e\82ÉQUIT\83R\83}\83\93\83h\82ð\91\97\82é(&U)",CONNECT_SENDQUIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,173,10\r
+    CONTROL         "\90Ø\92f\8e\9e\82ÉQUIT\83R\83}\83\93\83h\82ð\91\97\82é(&Q)",CONNECT_SENDQUIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,173,10\r
     CONTROL         "RAS\82Ì\90§\8cä\82ð\8ds\82í\82È\82¢(&R)",CONNECT_NORAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10\r
-    CONTROL         "\94ñPASV\83\82\81[\83h\8e\9e\82ÉUPnP\82ð\90§\8cä\82·\82é(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10\r
+    CONTROL         "\94ñPASV\83\82\81[\83h\8e\9e\82ÉUPnP\82ð\90§\8cä\82ð\8e\8e\8ds\82·\82é(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10\r
 END\r
 \r
 rasnotify_dlg DIALOG  0, 0, 158, 46\r

diff --git a/Resource/resource.h b/Resource/resource.h
index bcafa9f..f10d9d1 100644 (file)
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -641,6 +641,7 @@
 #define MENU_SWITCH_OSS                 40176\r
 #define MENU_OPEN                       40177\r
 #define MENU_FW_FTP_FILTER              40178\r
+#define MENU_REMOTE_MOVE_UPDIR          40179\r
 #define FSNOTIFY_TITLE                  65535\r
 #define HOST_SIZEGRIP                   65535\r
 \r
@@ -649,7 +650,7 @@
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_NEXT_RESOURCE_VALUE        197\r
-#define _APS_NEXT_COMMAND_VALUE         40179\r
+#define _APS_NEXT_COMMAND_VALUE         40180\r
 #define _APS_NEXT_CONTROL_VALUE         1221\r
 #define _APS_NEXT_SYMED_VALUE           101\r
 #endif\r

diff --git a/Resource_eng/FFFTP-eng.rc b/Resource_eng/FFFTP-eng.rc
index 194886b..a04f22a 100644 (file)
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -222,6 +222,7 @@ BEGIN
         MENUITEM "Download all",                MENU_DOWNLOAD_ALL\r
         MENUITEM "Upload all",                  MENU_UPLOAD_ALL\r
         MENUITEM "Switch OSS<->GUARDIAN",       MENU_SWITCH_OSS\r
+        MENUITEM "Move to parent folder",       MENU_REMOTE_MOVE_UPDIR\r
     END\r
 END\r
 \r
@@ -984,13 +985,13 @@ BEGIN
     CONTROL         "Spin1",CONNECT_HIST_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,130,65,9,14\r
     LTEXT           "(0 to 20 entries)",-1,143,68,53,8\r
     CONTROL         "&Save password in history",CONNECT_HIST_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,82,129,10\r
-    CONTROL         "&Use anonymous FTP for quick connect",CONNECT_QUICK_ANONY,\r
+    CONTROL         "Use &anonymous FTP for quick connect",CONNECT_QUICK_ANONY,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,196,10\r
     CONTROL         "Send &QUIT command at disconnect",CONNECT_SENDQUIT,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,109,173,10\r
     CONTROL         "Do not control dialup (&RAS) connection",CONNECT_NORAS,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10\r
-    CONTROL         "Control &UPnP when using non PASV mode",CONNECT_UPNP,\r
+    CONTROL         "Try to control &UPnP when using non PASV mode",CONNECT_UPNP,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10\r
 END\r
 \r

diff --git a/Resource_eng/resource.h b/Resource_eng/resource.h
index 4b9a5b0..802d099 100644 (file)
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -641,6 +641,7 @@
 #define MENU_SWITCH_OSS                 40176\r
 #define MENU_OPEN                       40177\r
 #define MENU_FW_FTP_FILTER              40178\r
+#define MENU_REMOTE_MOVE_UPDIR          40179\r
 #define FSNOTIFY_TITLE                  65535\r
 #define HOST_SIZEGRIP                   65535\r
 \r
@@ -649,7 +650,7 @@
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_NEXT_RESOURCE_VALUE        197\r
-#define _APS_NEXT_COMMAND_VALUE         40179\r
+#define _APS_NEXT_COMMAND_VALUE         40180\r
 #define _APS_NEXT_CONTROL_VALUE         1221\r
 #define _APS_NEXT_SYMED_VALUE           101\r
 #endif\r

diff --git a/ftpproc.c b/ftpproc.c
index b3a99c5..09f376c 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -2654,7 +2654,12 @@ void MoveRemoteFileProc(int drop_index)
        AskRemoteCurDir(HostDir, FMAX_PATH);\r
 \r
        // ドロップ先のフォルダ名を得る\r
-       GetNodeName(WIN_REMOTE, drop_index, Pkt.File, FMAX_PATH);\r
+       // 上位のディレクトリへ移動対応\r
+//     GetNodeName(WIN_REMOTE, drop_index, Pkt.File, FMAX_PATH);\r
+       if(drop_index >= 0)\r
+               GetNodeName(WIN_REMOTE, drop_index, Pkt.File, FMAX_PATH);\r
+       else\r
+               strcpy(Pkt.File, "..");\r
 \r
        if(MoveMode == MOVE_DLG)\r
        {\r

diff --git a/main.c b/main.c
index db8f722..9ecb145 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1640,6 +1640,11 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
                                        break;\r
 #endif\r
 \r
+                               // 上位のディレクトリへ移動対応\r
+                               case MENU_REMOTE_MOVE_UPDIR :\r
+                                       MoveRemoteFileProc(-1);\r
+                                       break;\r
+\r
                                default :\r
                                        if((LOWORD(wParam) >= MENU_BMARK_TOP) &&\r
                                           (LOWORD(wParam) < MENU_BMARK_TOP+100))\r

diff --git a/mesg-eng.h b/mesg-eng.h
index a712d84..f60a02b 100644 (file)
--- a/mesg-eng.h
+++ b/mesg-eng.h
@@ -354,6 +354,7 @@
 #define MSGJPN353              _Tu8("Encrypted: FTPES", "Encrypted: FTPES")\r
 #define MSGJPN354              _Tu8("Encrypted: FTPIS", "Encrypted: FTPIS")\r
 #define MSGJPN355              _Tu8("Encrypted: SFTP", "Encrypted: SFTP")\r
+#define MSGJPN356              _Tu8("Move to &parent folder...", "Move to &parent folder...")\r
 #if defined(HAVE_TANDEM)\r
 #define MSGJPN2000             _Tu8("NonStop Server", "NonStop Server")\r
 #define MSGJPN2001             _Tu8("OSS<->GUARDIAN Switch(&O)", "OSS<->GUARDIAN Switch(&O)")\r

diff --git a/mesg-jpn.h b/mesg-jpn.h
index 23b62bd..abc41ec 100644 (file)
--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -354,6 +354,7 @@
 #define MSGJPN353              _Tu8("暗号化されています: FTPES", "\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99: FTPES")\r
 #define MSGJPN354              _Tu8("暗号化されています: FTPIS", "\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99: FTPIS")\r
 #define MSGJPN355              _Tu8("暗号化されています: SFTP", "\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99: SFTP")\r
+#define MSGJPN356              _Tu8("一つ上のフォルダへ移動(&P)...", "\xE4\xB8\x80\xE3\x81\xA4\xE4\xB8\x8A\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA9\xE3\x83\xAB\xE3\x83\x80\xE3\x81\xB8\xE7\xA7\xBB\xE5\x8B\x95(&P)...")\r
 #if defined(HAVE_TANDEM)\r
 #define MSGJPN2000             _Tu8("NonStop Server", "NonStop Server")\r
 #define MSGJPN2001             _Tu8("OSS<->GUARDIAN 切り替え(&O)", "OSS<->GUARDIAN \xE5\x88\x87\xE3\x82\x8A\xE6\x9B\xBF\xE3\x81\x88(&O)")\r

diff --git a/option.c b/option.c
index daf3a56..fa7246a 100644 (file)
--- a/option.c
+++ b/option.c
@@ -1303,13 +1303,7 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
                        SendDlgItemMessage(hDlg, CONNECT_SENDQUIT, BM_SETCHECK, SendQuit, 0);\r
                        SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_SETCHECK, NoRasControl, 0);\r
                        // UPnP対応\r
-                       if(IsUPnPLoaded() == YES)\r
-                               SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_SETCHECK, UPnPEnabled, 0);\r
-                       else\r
-                       {\r
-                               SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_SETCHECK, BST_UNCHECKED, 0);\r
-                               EnableWindow(GetDlgItem(hDlg, CONNECT_UPNP), FALSE);\r
-                       }\r
+                       SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_SETCHECK, UPnPEnabled, 0);\r
                    return(TRUE);\r
 \r
                case WM_NOTIFY:\r

diff --git a/toolmenu.c b/toolmenu.c
index 9daa69c..9eba6e3 100644 (file)
--- a/toolmenu.c
+++ b/toolmenu.c
@@ -1885,6 +1885,8 @@ void RemoteRbuttonMenu(int Pos)
                if (AskRealHostType() == HTYPE_TANDEM)\r
                        AppendMenu(hMenu, MF_STRING | Flg1, MENU_SWITCH_OSS, MSGJPN2001);\r
 #endif\r
+               // 上位のディレクトリへ移動対応\r
+               AppendMenu(hMenu, MF_STRING | Flg1 | Flg2, MENU_REMOTE_MOVE_UPDIR, MSGJPN356);\r
                AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);\r
                AppendMenu(hMenu, MF_STRING | Flg1, MENU_FILESIZE, MSGJPN272);\r
                AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);\r