[Ttssh2-commit] [5764] SSH Key Generator ダイアログを調整

svnno****@sourc***** svnno****@sourc*****
2015年 1月 23日 (金) 15:02:18 JST


Revision: 5764
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5764
Author:   maya
Date:     2015-01-23 15:02:15 +0900 (Fri, 23 Jan 2015)
Log Message:
-----------
SSH Key Generator ダイアログを調整
  ダイアログを閉じるボタンの文字を Cancel から Close に変更
  ED25519 にアクセスキーを追加
  ED25519 を選択したときにビット数を指定
  ED25519 を選択したときに bcrypt KDF にチェックを入れる
  RSA1 を選択したときに bcrypt KDF のチェックをはずす

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/installer/release/lang/Korean.lng
    trunk/installer/release/lang/Russian.lng
    trunk/installer/release/lang/Simplified Chinese.lng
    trunk/installer/release/lang/Traditional Chinese.lng
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/English.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Mar 18 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -825,6 +825,7 @@
 
 BTN_OK=OK
 BTN_CANCEL=Cancel
+BTN_CLOSE=Close
 BTN_DISCONNECT=&Disconnect
 BTN_CONTINUE=&Continue
 

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/French.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Mar 18 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 ; Last translated (French language) by Francois MOCQ (Jul 21 2010)
 
 [Tera Term]
@@ -818,6 +818,7 @@
 
 BTN_OK=OK
 BTN_CANCEL=Effacer
+BTN_CLOSE=Fermer
 BTN_DISCONNECT=&D\xE9connecter
 BTN_CONTINUE=&Continuer
 

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/German.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Mar 18 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 ; Last translated (German language) by Frederik Schwarzer (May 17 2010)
 
 [Tera Term]
@@ -816,6 +816,7 @@
 
 BTN_OK=OK
 BTN_CANCEL=Abbrechen
+BTN_CLOSE=Schlie\xDFen
 BTN_DISCONNECT=&Trennen
 BTN_CONTINUE=&Fortsetzen
 

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/Japanese.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Mar 18 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 
 [Tera Term]
 DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -824,6 +824,7 @@
 
 BTN_OK=OK
 BTN_CANCEL=\x83L\x83\x83\x83\x93\x83Z\x83\x8B
+BTN_CLOSE=\x95‚\xB6\x82\xE9(&C)
 BTN_DISCONNECT=\x90ڑ\xB1\x92f(&D)
 BTN_CONTINUE=\x91\xB1\x8Ds(&C)
 

Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/Korean.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Mar 18 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 ; Last translated (Korean language) by Daehong Kim (Jul 25 2013)
 
 [Tera Term]
@@ -826,6 +826,7 @@
 
 BTN_OK=Ȯ\xC0\xCE
 BTN_CANCEL=\xC3\xEB\xBC\xD2
+BTN_CLOSE=\xB4ݱ\xE2
 BTN_DISCONNECT=\xBF\xAC\xB0\xE1\xB2\xF7\xC0\xBD(&D)
 BTN_CONTINUE=\xB0\xE8\xBC\xD3(&C)
 

Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/Russian.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Aug 31 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 ; Last translated (Russian language) by Ryumik Sergey (Sep 03 2014)
 
 [Tera Term]
@@ -824,6 +824,7 @@
 
 BTN_OK=OK
 BTN_CANCEL=\xC2\xFB\xF5\xEE\xE4
+BTN_CLOSE=\xC7\xE0\xEA\xF0\xFB\xF2\xFC
 BTN_DISCONNECT=&\xD0\xE0\xE7\xFA\xE5\xE4\xE8\xED\xE5\xED\xE8\xE5
 BTN_CONTINUE=&\xCF\xF0\xEE\xE4\xEE\xEB\xE6\xE5\xED\xE8\xE5
 

Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/Simplified Chinese.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Mar 18 2014)
+; Updated by TeraTerm Project (Jan 23 2015)
 ; Last translated (Simplified Chinese language) by LiShaohui (Nov 18 2013)
 
 [Tera Term]
@@ -826,6 +826,7 @@
 
 BTN_OK=ȷ\xB6\xA8
 BTN_CANCEL=ȡ\xCF\xFB
+BTN_CLOSE=\xB9ر\xD5
 BTN_DISCONNECT=\xB6Ͽ\xAA\xC1\xAC\xBD\xD3(&D)
 BTN_CONTINUE=\xBC\xCC\xD0\xF8(&C)
 

Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/installer/release/lang/Traditional Chinese.lng	2015-01-23 06:02:15 UTC (rev 5764)
@@ -1,3 +1,4 @@
+; Updated by TeraTerm Project (Jan 23 2015)
 ; Traditional Chinese Language by kikiqqp (Sep 20 2014) 
 
 [Tera Term]
@@ -825,6 +826,7 @@
 
 BTN_OK=\xBDT\xA9w
 BTN_CANCEL=\xA8\xFA\xAE\xF8
+BTN_CLOSE=\xC3\xF6\xB3\xAC
 BTN_DISCONNECT=\xA4\xA4\xC2_\xB3s\xB1\xB5(&D)
 BTN_CONTINUE=\xC4~\xC4\xF2(&C)
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2015-01-23 06:02:15 UTC (rev 5764)
@@ -4368,7 +4368,7 @@
 		UTIL_get_lang_msg("DLG_KEYGEN_GENERATE", pvar, uimsg);
 		SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
 		GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
-		UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);
+		UTIL_get_lang_msg("BTN_CLOSE", pvar, uimsg);
 		SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
 		GetDlgItemText(dlg, IDC_BCRYPT_KDF_CHECK, uimsg, sizeof(uimsg));
 		UTIL_get_lang_msg("DLG_BCRYPT_KDF", pvar, uimsg);
@@ -4469,7 +4469,7 @@
 					SetDlgItemInt(dlg, IDC_KEYBITS, 521, FALSE);
 					break;
 				case KEY_ED25519:
-					bits = 0;
+					SetDlgItemInt(dlg, IDC_KEYBITS, 256, FALSE);
 					break;
 			}
 
@@ -4553,6 +4553,7 @@
 				EnableWindow(GetDlgItem(dlg, IDC_KEYBITS), TRUE);
 				SetDlgItemInt(dlg, IDC_KEYBITS, saved_key_bits, FALSE);
 			}
+			SendMessage(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), BM_SETCHECK, BST_UNCHECKED, 0);
 			EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), FALSE);
 			key_type = KEY_RSA1;
 			break;
@@ -4612,9 +4613,10 @@
 				EnableWindow(GetDlgItem(dlg, IDC_KEYBITS), FALSE);
 				saved_key_bits = GetDlgItemInt(dlg, IDC_KEYBITS, NULL, FALSE);
 			}
+			SendMessage(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), BM_SETCHECK, BST_CHECKED, 0);
 			EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), FALSE);
 			key_type = KEY_ED25519;
-			SetDlgItemInt(dlg, IDC_KEYBITS, 0, FALSE);
+			SetDlgItemInt(dlg, IDC_KEYBITS, 256, FALSE);
 			break;
 
 		// saving public key file

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2015-01-18 14:59:47 UTC (rev 5763)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2015-01-23 06:02:15 UTC (rev 5764)
@@ -336,7 +336,7 @@
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "&Generate",IDOK,199,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,199,24,50,14
+    PUSHBUTTON      "Close",IDCANCEL,199,24,50,14
     GROUPBOX        "Key type",IDC_KEYTYPE,11,7,130,47
     CONTROL         "RS&A1",IDC_RSA1_TYPE,"Button",BS_AUTORADIOBUTTON,17,17,35,10
     CONTROL         "&RSA",IDC_RSA_TYPE,"Button",BS_AUTORADIOBUTTON,57,17,30,10
@@ -344,7 +344,7 @@
     CONTROL         "ECDSA-&256",IDC_ECDSA256_TYPE,"Button",BS_AUTORADIOBUTTON,17,29,55,10
     CONTROL         "ECDSA-&384",IDC_ECDSA384_TYPE,"Button",BS_AUTORADIOBUTTON,80,29,55,10
     CONTROL         "ECDSA-&521",IDC_ECDSA521_TYPE,"Button",BS_AUTORADIOBUTTON,17,41,55,10
-    CONTROL         "ED25519",IDC_ED25519_TYPE,"Button",BS_AUTORADIOBUTTON,80,42,45,10
+    CONTROL         "&ED25519",IDC_ED25519_TYPE,"Button",BS_AUTORADIOBUTTON,80,42,45,10
     CONTROL         "bcrypt KDF format",IDC_BCRYPT_KDF_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,58,93,10
     RTEXT           "Key &Bits:",IDC_KEYBITS_LABEL,143,14,40,10,NOT WS_GROUP
     EDITTEXT        IDC_KEYBITS,155,26,25,12,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP



Ttssh2-commit メーリングリストの案内