Fix bugs of automatic detection for Kanji code of filenames.

[ffftp/ffftp.git] / Resource / FFFTP.rc

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index d9a7363..e45b8e7 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -228,21 +228,21 @@ END
 // Dialog\r
 //\r
 \r
-about_dlg DIALOGEX 0, 0, 319, 291\r
+about_dlg DIALOGEX 0, 0, 319, 315\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "FFFTP\82É\82Â\82¢\82Ä"\r
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N", 0, 0, 0x0\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,133,270,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,133,294,50,14\r
     ICON            ffftp,-1,7,4,20,20\r
     CTEXT           "FFFTP  Ver 1.99",-1,113,11,90,8\r
-    CTEXT           "FFFTP\82Ífreeware\82Å\82·",-1,7,255,305,8\r
-    CTEXT           "Copyright(C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto)",-1,7,25,305,20,SS_NOPREFIX\r
-    CTEXT           "",ABOUT_JRE,7,72,305,8\r
-    EDITTEXT        ABOUT_URL,7,52,305,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    CTEXT           "OLE D&&D\8b@\94\ by \95½\93c\96L\82³\82ñ\81Anakka\82³\82ñ\n\83z\83X\83g\93à\82Å\82Ì\83t\83@\83C\83\8b\88Ú\93®\8b@\94\ by \95½\93c\96L\82³\82ñ\n\82¢\82­\82Â\82©\82Ì\8b@\94\ by miau\82³\82ñ\n\83}\83X\83^\81[\83p\83X\83\8f\81[\83h\8b@\94\ by \82°\82ñ\82°\82ñ\82³\82ñ\nAES\88Ã\8d\86\89» by Moca\82³\82ñ\n\n\91¼\81A\91½\82­\82Ì\95û\82Ì\82²\8b¦\97Í\82ð\82¢\82½\82¾\82«\82Ü\82µ\82½\81B",-1,7,119,305,60\r
-    CTEXT           "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,87,305,27\r
-    CTEXT           "FTP over SSL/TLS\82Ì\8eÀ\91\95\82É\82ÍOpenSSL\82ð\8eg\97p\82µ\82Ä\82¢\82Ü\82·\81B\nCopyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.",-1,7,183,305,60\r
+    CTEXT           "FFFTP\82Ífreeware\82Å\82·",-1,7,279,305,8\r
+    CTEXT           "Copyright(C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, \82¤\82È\81[, Asami, fortran90, tomo1192)",-1,7,25,305,44,SS_NOPREFIX\r
+    CTEXT           "",ABOUT_JRE,7,96,305,8\r
+    EDITTEXT        ABOUT_URL,7,76,305,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+    CTEXT           "OLE D&&D\8b@\94\ by \95½\93c\96L\82³\82ñ\81Anakka\82³\82ñ\n\83z\83X\83g\93à\82Å\82Ì\83t\83@\83C\83\8b\88Ú\93®\8b@\94\ by \95½\93c\96L\82³\82ñ\n\82¢\82­\82Â\82©\82Ì\8b@\94\ by miau\82³\82ñ\n\83}\83X\83^\81[\83p\83X\83\8f\81[\83h\8b@\94\ by \82°\82ñ\82°\82ñ\82³\82ñ\nAES\88Ã\8d\86\89» by Moca\82³\82ñ\n\n\91¼\81A\91½\82­\82Ì\95û\82Ì\82²\8b¦\97Í\82ð\82¢\82½\82¾\82«\82Ü\82µ\82½\81B",-1,7,143,305,60\r
+    CTEXT           "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,111,305,27\r
+    CTEXT           "FTP over SSL/TLS\82Ì\8eÀ\91\95\82É\82ÍOpenSSL\82ð\8eg\97p\82µ\82Ä\82¢\82Ü\82·\81B\nCopyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.",-1,7,207,305,60\r
 END\r
 \r
 transfer_dlg DIALOG  0, 0, 199, 91\r
@@ -495,10 +495,10 @@ END
 \r
 newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43\r
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION\r
-CAPTION "\90V\82µ\82¢\83}\83X\83^\81[\83p\83X\83\8f\81[\83h\82ð\93ü\82ê\82Ä\82­\82¾\82³\82¢"\r
+CAPTION "\90V\82µ\82¢\83}\83X\83^\81[\83p\83X\83\8f\81[\83h\82ð2\89ñ\93ü\82ê\82Ä\82­\82¾\82³\82¢"\r
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N", 0, 0, 0x0\r
 BEGIN\r
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL\r
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_PASSWORD | ES_AUTOHSCROLL\r
     DEFPUSHBUTTON   "OK",IDOK,16,25,50,14\r
     PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,68,25,50,14\r
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,31,8,8\r
@@ -726,13 +726,14 @@ hset_code_dlg DIALOGEX 0, 0, 207, 139
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N", 0, 0, 0x0\r
 BEGIN\r
-    GROUPBOX        "\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h(&K)",-1,7,7,98,94,WS_GROUP\r
+    GROUPBOX        "\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h(&K)",-1,7,7,98,106,WS_GROUP\r
     CONTROL         "\96³\95Ï\8a·",HSET_NO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,21,81,10\r
     CONTROL         "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10\r
     CONTROL         "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10\r
     CONTROL         "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10\r
     CONTROL         "UTF-8",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
-    CONTROL         "\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,86,87,10\r
+    CONTROL         "UTF-8 BOM",HSET_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,81,81,10\r
+    CONTROL         "\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,98,87,10\r
     GROUPBOX        "\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h(&N)",-1,110,7,90,115,WS_GROUP\r
     CONTROL         "\8e©\93®",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10\r
     CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,114,33,65,10\r
@@ -1346,9 +1347,13 @@ hset_crypt_dlg DIALOG  0, 0, 207, 139
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N"\r
 BEGIN\r
-    CONTROL         "FTPS (Explicit)\82Å\90Ú\91±",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10\r
-    CONTROL         "FTPS (Implicit)\82Å\90Ú\91±",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
-    CONTROL         "SFTP\82Å\90Ú\91±",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
+    CONTROL         "\88Ã\8d\86\89»\82È\82µ\82Å\90Ú\91±\82ð\8b\96\89Â",HSET_NO_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10\r
+    CONTROL         "FTPS (Explicit)\82Å\90Ú\91±",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
+    CONTROL         "FTPS (Implicit)\82Å\90Ú\91±",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
+    CONTROL         "SFTP\82Å\90Ú\91±",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10\r
+    LTEXT           "\94é\96§\8c®\82Ì\83e\83L\83X\83g",-1,7,63,64,8\r
+    PUSHBUTTON      "...",PKEY_FILE_BR,72,63,13,12\r
+    EDITTEXT        HSET_PRIVATE_KEY,7,79,193,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL\r
 END\r
 \r
 hset_adv3_dlg DIALOG  0, 0, 207, 139\r
@@ -1359,6 +1364,7 @@ BEGIN
     EDITTEXT        HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER\r
     CONTROL         "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14\r
     LTEXT           "(1\81`4)",-1,102,10,31,8\r
+    CONTROL         "\83\81\83C\83\93\83E\83B\83\93\83h\83E\82Ì\83\\83P\83b\83g\82ð\8dÄ\97\98\97p",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10\r
 END\r
 \r
 \r
@@ -1375,7 +1381,7 @@ BEGIN
         LEFTMARGIN, 7\r
         RIGHTMARGIN, 312\r
         TOPMARGIN, 4\r
-        BOTTOMMARGIN, 284\r
+        BOTTOMMARGIN, 308\r
     END\r
 \r
     transfer_dlg, DIALOG\r
@@ -2033,7 +2039,7 @@ BEGIN
             VALUE "FileDescription", "FFFTP"\r
             VALUE "FileVersion", "1, 99, 0, 0"\r
             VALUE "InternalName", "FFFTP"\r
-            VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto)."\r
+            VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, \82¤\82È\81[, Asami, fortran90, tomo1192)."\r
             VALUE "OriginalFilename", "FFFTP.exe"\r
             VALUE "ProductName", "FFFTP"\r
             VALUE "ProductVersion", "1, 99, 0, 0"\r
@@ -2117,6 +2123,7 @@ BEGIN
     BUTTON      ID_BUTTON40156\r
     BUTTON      ID_BUTTON40173\r
     BUTTON      ID_BUTTON40174\r
+    BUTTON      ID_BUTTON40175\r
 END\r
 \r
 remote_toolbar_bmp TOOLBAR  16, 16\r