X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=Resource%2FFFFTP.rc;h=4f3f343287d9924daa01a3a02b9cc2f21377e42d;hp=af6bc89e142e5437d316fc57c7a28a707c29dbd1;hb=4a6f29d2616cdecbb9366e5f462c5815c64fbaf6;hpb=4d0ff566a1043fd0411a21f5d6097045e2d94ac8

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index af6bc89..4f3f343 100644
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -228,21 +228,21 @@ END
 // Dialog
 //
 
-about_dlg DIALOGEX 0, 0, 319, 291
+about_dlg DIALOGEX 0, 0, 319, 315
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "FFFTP‚ɂ‚¢‚Ä"
 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,133,270,50,14
+    DEFPUSHBUTTON   "OK",IDOK,133,294,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP  Ver 1.98",-1,113,11,90,8
-    CTEXT           "FFFTP‚Ífreeware‚Å‚·",-1,7,255,305,8
-    CTEXT           "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011 Hiromichi Matsushima, Suguru Kawamoto.",-1,7,25,305,20,SS_NOPREFIX
-    CTEXT           "",ABOUT_JRE,7,72,305,8
-    EDITTEXT        ABOUT_URL,7,52,305,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    CTEXT           "OLE D&&D‹@”\ by •½“c–L‚³‚ñAnakka‚³‚ñ\nƒzƒXƒg“à‚ł̃tƒ@ƒCƒ‹ˆÚ“®‹@”\ by •½“c–L‚³‚ñ\n‚¢‚­‚‚©‚Ì‹@”\ by miau‚³‚ñ\nƒ}ƒXƒ^[ƒpƒXƒ[ƒh‹@”\ by ‚°‚ñ‚°‚ñ‚³‚ñ\nAESˆÃ†‰» by Moca‚³‚ñ\n\n‘¼A‘½‚­‚Ì•û‚Ì‚²‹¦—Í‚ð‚¢‚½‚¾‚«‚Ü‚µ‚½B",-1,7,119,305,60
-    CTEXT           "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,87,305,27
-    CTEXT           "FTP over SSL/TLS‚ÌŽÀ‘•‚É‚ÍOpenSSL‚ªŽg—p‚³‚ê‚Ä‚¢‚Ü‚·B\nCopyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.",-1,7,183,305,60
+    CTEXT           "FFFTP  Ver 1.99",-1,113,11,90,8
+    CTEXT           "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
+    CTEXT           "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, raido)",-1,7,25,305,44,SS_NOPREFIX
+    CTEXT           "",ABOUT_JRE,7,96,305,8
+    EDITTEXT        ABOUT_URL,7,76,305,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    CTEXT           "OLE D&&D‹@”\ by •½“c–L‚³‚ñAnakka‚³‚ñ\nƒzƒXƒg“à‚ł̃tƒ@ƒCƒ‹ˆÚ“®‹@”\ by •½“c–L‚³‚ñ\n‚¢‚­‚‚©‚Ì‹@”\ by miau‚³‚ñ\nƒ}ƒXƒ^[ƒpƒXƒ[ƒh‹@”\ by ‚°‚ñ‚°‚ñ‚³‚ñ\nAESˆÃ†‰» by Moca‚³‚ñ\n\n‘¼A‘½‚­‚Ì•û‚Ì‚²‹¦—Í‚ð‚¢‚½‚¾‚«‚Ü‚µ‚½B",-1,7,143,305,60
+    CTEXT           "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,111,305,27
+    CTEXT           "FTP over SSL/TLS‚ÌŽÀ‘•‚É‚ÍOpenSSL‚ðŽg—p‚µ‚Ä‚¢‚Ü‚·B\nCopyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.",-1,7,207,305,60
 END
 
 transfer_dlg DIALOG  0, 0, 199, 91
@@ -495,10 +495,10 @@ END
 
 newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "V‚µ‚¢ƒ}ƒXƒ^[ƒpƒXƒ[ƒh‚ð“ü‚ê‚Ä‚­‚¾‚³‚¢"
+CAPTION "V‚µ‚¢ƒ}ƒXƒ^[ƒpƒXƒ[ƒh‚ð2‰ñ“ü‚ê‚Ä‚­‚¾‚³‚¢"
 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN", 0, 0, 0x0
 BEGIN
-    EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
+    EDITTEXT        INP_INPSTR,7,7,173,12,ES_PASSWORD | ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,16,25,50,14
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,68,25,50,14
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,172,31,8,8
@@ -1346,9 +1346,23 @@ hset_crypt_dlg DIALOG  0, 0, 207, 139
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN"
 BEGIN
-    CONTROL         "FTPS (Explicit)‚Őڑ±",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10
-    CONTROL         "FTPS (Implicit)‚Őڑ±",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
-    CONTROL         "SFTP‚Őڑ±",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
+    CONTROL         "ˆÃ†‰»‚È‚µ‚Őڑ±‚ð‹–‰Â",HSET_NO_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
+    CONTROL         "FTPS (Explicit)‚Őڑ±",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
+    CONTROL         "FTPS (Implicit)‚Őڑ±",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
+    CONTROL         "SFTP‚Őڑ±",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
+    LTEXT           "”é–§Œ®‚̃eƒLƒXƒg",-1,7,63,64,8
+    PUSHBUTTON      "...",PKEY_FILE_BR,72,63,13,12
+    EDITTEXT        HSET_PRIVATE_KEY,7,79,193,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
+END
+
+hset_adv3_dlg DIALOG  0, 0, 207, 139
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+FONT 9, "‚l‚r ‚oƒSƒVƒbƒN"
+BEGIN
+    LTEXT           "Å‘哯ŽžÚ‘±”",-1,7,10,64,8
+    EDITTEXT        HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14
+    LTEXT           "(1`4)",-1,102,10,31,8
 END
 
 
@@ -1365,7 +1379,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 312
         TOPMARGIN, 4
-        BOTTOMMARGIN, 284
+        BOTTOMMARGIN, 308
     END
 
     transfer_dlg, DIALOG
@@ -1974,6 +1988,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 132
     END
+
+    hset_adv3_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 200
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 132
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -1994,8 +2016,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,98,0,0
- PRODUCTVERSION 1,98,0,0
+ FILEVERSION 1,99,0,0
+ PRODUCTVERSION 1,99,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2013,12 +2035,12 @@ BEGIN
             VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
             VALUE "CompanyName", " "
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 98, 0, 0"
+            VALUE "FileVersion", "1, 99, 0, 0"
             VALUE "InternalName", "FFFTP"
-            VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011 Hiromichi Matsushima, Suguru Kawamoto."
+            VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, raido)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 98, 0, 0"
+            VALUE "ProductVersion", "1, 99, 0, 0"
         END
     END
     BLOCK "VarFileInfo"