[Ttssh2-commit] [4445] SSH Setup ダイアログを調整

svnno****@sourc***** svnno****@sourc*****
2011年 4月 17日 (日) 15:37:14 JST


Revision: 4445
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4445
Author:   maya
Date:     2011-04-17 15:37:14 +0900 (Sun, 17 Apr 2011)

Log Message:
-----------
SSH Setup ダイアログを調整
  "Move Up" と "Move Down" のアクセスキーを、必ず隣り合ったキーになるようにした
  SSH1 と SSH2 で圧縮を有効にするために設定する箇所が違うので注記を追加
  追加したダイアログアイテムにフォントをセットするようにした

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/ttssh2/ttxssh/resource.h
    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	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/installer/release/lang/English.lng	2011-04-17 06:37:14 UTC (rev 4445)
@@ -615,25 +615,26 @@
 DLG_SSHSETUP_COMPRESS=&Compression level:
 DLG_SSHSETUP_COMPRESS_NONE=None
 DLG_SSHSETUP_COMPRESS_HIGHEST=Highest
+DLG_SSHSETUP_COMPRESS_NOTE=SSH1: 'Compression level' determines compression on/off.\nSSH2: 'Compression order' and 'Compression level' determines compression on/off.
 DLG_SSHSETUP_CHIPER=&Preferred cipher order
-DLG_SSHSETUP_CHIPER_UP=Move Up(&0)
-DLG_SSHSETUP_CHIPER_DOWN=Move Down(&1)
+DLG_SSHSETUP_CHIPER_UP=Move Up(&1)
+DLG_SSHSETUP_CHIPER_DOWN=Move Down(&2)
 DLG_SSHSETUP_CIPHER_BORDER=<ciphers below this line are disabled>
-DLG_SSHSETUP_KEX=K&EX order
-DLG_SSHSETUP_KEX_UP=Move Up(&2)
-DLG_SSHSETUP_KEX_DOWN=Move Down(&3)
+DLG_SSHSETUP_KEX=K&EX order (SSH2 only)
+DLG_SSHSETUP_KEX_UP=Move Up(&3)
+DLG_SSHSETUP_KEX_DOWN=Move Down(&4)
 DLG_SSHSETUP_KEX_BORDER=<KEXs below this line are disabled>
-DLG_SSHSETUP_HOST_KEY=Ho&st Key order
-DLG_SSHSETUP_HOST_KEY_UP=Move Up(&4)
-DLG_SSHSETUP_HOST_KEY_DOWN=Move Down(&5)
+DLG_SSHSETUP_HOST_KEY=Ho&st Key order (SSH2 only)
+DLG_SSHSETUP_HOST_KEY_UP=Move Up(&5)
+DLG_SSHSETUP_HOST_KEY_DOWN=Move Down(&6)
 DLG_SSHSETUP_HOST_KEY_BORDER=<Host Keys below this line are disabled>
-DLG_SSHSETUP_MAC=MAC or&der
-DLG_SSHSETUP_MAC_UP=Move Up(&6)
-DLG_SSHSETUP_MAC_DOWN=Move Down(&7)
+DLG_SSHSETUP_MAC=MAC or&der (SSH2 only)
+DLG_SSHSETUP_MAC_UP=Move Up(&7)
+DLG_SSHSETUP_MAC_DOWN=Move Down(&8)
 DLG_SSHSETUP_MAC_BORDER=<MACs below this line are disabled>
-DLG_SSHSETUP_COMP=Compress&ion order
-DLG_SSHSETUP_COMP_UP=Move Up(&8)
-DLG_SSHSETUP_COMP_DOWN=Move Down(&9)
+DLG_SSHSETUP_COMP=Compress&ion order (SSH2 only)
+DLG_SSHSETUP_COMP_UP=Move Up(&9)
+DLG_SSHSETUP_COMP_DOWN=Move Down(&0)
 DLG_SSHSETUP_COMP_BORDER=<Compressions below this line are disabled>
 DLG_SSHSETUP_KNOWNHOST=SSH Known Hosts
 DLG_SSHSETUP_KNOWNHOST_RW=Read/&write file:

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/installer/release/lang/French.lng	2011-04-17 06:37:14 UTC (rev 4445)
@@ -614,26 +614,27 @@
 DLG_SSHSETUP_COMPRESS=&Taux compression:
 DLG_SSHSETUP_COMPRESS_NONE=Sans
 DLG_SSHSETUP_COMPRESS_HIGHEST=Maxi
+DLG_SSHSETUP_COMPRESS_NOTE=SSH1: 'Compression level' determines compression on/off.\nSSH2: 'Compression order' and 'Compression level' determines compression on/off.
 DLG_SSHSETUP_CHIPER=Ordre de Chffrement &Préféré
-DLG_SSHSETUP_CHIPER_UP=Monter
-DLG_SSHSETUP_CHIPER_DOWN=Descendre
-DLG_SSHSETUP_KEX=K&EX order
-DLG_SSHSETUP_KEX_UP=Move Up(&2)
-DLG_SSHSETUP_KEX_DOWN=Move Down(&3)
+DLG_SSHSETUP_CHIPER_UP=Monter(&1)
+DLG_SSHSETUP_CHIPER_DOWN=Descendre(&2)
+DLG_SSHSETUP_CIPHER_BORDER=<chiffrements sous cette ligne dévalidés>
+DLG_SSHSETUP_KEX=K&EX order (SSH2 only)
+DLG_SSHSETUP_KEX_UP=Move Up(&3)
+DLG_SSHSETUP_KEX_DOWN=Move Down(&4)
 DLG_SSHSETUP_KEX_BORDER=<KEXs below this line are disabled>
-DLG_SSHSETUP_HOST_KEY=Ho&st Key order
-DLG_SSHSETUP_HOST_KEY_UP=Move Up(&4)
-DLG_SSHSETUP_HOST_KEY_DOWN=Move Down(&5)
+DLG_SSHSETUP_HOST_KEY=Ho&st Key order (SSH2 only)
+DLG_SSHSETUP_HOST_KEY_UP=Move Up(&5)
+DLG_SSHSETUP_HOST_KEY_DOWN=Move Down(&6)
 DLG_SSHSETUP_HOST_KEY_BORDER=<Host Keys below this line are disabled>
-DLG_SSHSETUP_MAC=MAC or&der
-DLG_SSHSETUP_MAC_UP=Move Up(&6)
-DLG_SSHSETUP_MAC_DOWN=Move Down(&7)
+DLG_SSHSETUP_MAC=MAC or&der (SSH2 only)
+DLG_SSHSETUP_MAC_UP=Move Up(&7)
+DLG_SSHSETUP_MAC_DOWN=Move Down(&8)
 DLG_SSHSETUP_MAC_BORDER=<MACs below this line are disabled>
-DLG_SSHSETUP_COMP=Compress&ion order
-DLG_SSHSETUP_COMP_UP=Move Up(&8)
-DLG_SSHSETUP_COMP_DOWN=Move Down(&9)
+DLG_SSHSETUP_COMP=Compress&ion order (SSH2 only)
+DLG_SSHSETUP_COMP_UP=Move Up(&9)
+DLG_SSHSETUP_COMP_DOWN=Move Down(&0)
 DLG_SSHSETUP_COMP_BORDER=<Compressions below this line are disabled>
-DLG_SSHSETUP_CIPHER_BORDER=<chiffrements sous cette ligne dévalidés>
 DLG_SSHSETUP_KNOWNHOST=SSH Hôtes connus
 DLG_SSHSETUP_KNOWNHOST_RW=Fichier R/W:
 DLG_SSHSETUP_KNOWNHOST_RO=Fichier Lect seule:

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/installer/release/lang/German.lng	2011-04-17 06:37:14 UTC (rev 4445)
@@ -613,25 +613,26 @@
 DLG_SSHSETUP_COMPRESS=&Kompressionsstufe:
 DLG_SSHSETUP_COMPRESS_NONE=Keine
 DLG_SSHSETUP_COMPRESS_HIGHEST=Höchste
+DLG_SSHSETUP_COMPRESS_NOTE=SSH1: 'Compression level' determines compression on/off.\nSSH2: 'Compression order' and 'Compression level' determines compression on/off.
 DLG_SSHSETUP_CHIPER=&Preferred cipher order
-DLG_SSHSETUP_CHIPER_UP=Move Up(&0)
-DLG_SSHSETUP_CHIPER_DOWN=Move Down(&1)
+DLG_SSHSETUP_CHIPER_UP=Move Up(&1)
+DLG_SSHSETUP_CHIPER_DOWN=Move Down(&2)
 DLG_SSHSETUP_CIPHER_BORDER=<ciphers below this line are disabled>
-DLG_SSHSETUP_KEX=K&EX order
-DLG_SSHSETUP_KEX_UP=Move Up(&2)
-DLG_SSHSETUP_KEX_DOWN=Move Down(&3)
+DLG_SSHSETUP_KEX=K&EX order (SSH2 only)
+DLG_SSHSETUP_KEX_UP=Move Up(&3)
+DLG_SSHSETUP_KEX_DOWN=Move Down(&4)
 DLG_SSHSETUP_KEX_BORDER=<KEXs below this line are disabled>
-DLG_SSHSETUP_HOST_KEY=Ho&st Key order
-DLG_SSHSETUP_HOST_KEY_UP=Move Up(&4)
-DLG_SSHSETUP_HOST_KEY_DOWN=Move Down(&5)
+DLG_SSHSETUP_HOST_KEY=Ho&st Key order (SSH2 only)
+DLG_SSHSETUP_HOST_KEY_UP=Move Up(&5)
+DLG_SSHSETUP_HOST_KEY_DOWN=Move Down(&6)
 DLG_SSHSETUP_HOST_KEY_BORDER=<Host Keys below this line are disabled>
-DLG_SSHSETUP_MAC=MAC or&der
-DLG_SSHSETUP_MAC_UP=Move Up(&6)
-DLG_SSHSETUP_MAC_DOWN=Move Down(&7)
+DLG_SSHSETUP_MAC=MAC or&der (SSH2 only)
+DLG_SSHSETUP_MAC_UP=Move Up(&7)
+DLG_SSHSETUP_MAC_DOWN=Move Down(&8)
 DLG_SSHSETUP_MAC_BORDER=<MACs below this line are disabled>
-DLG_SSHSETUP_COMP=Compress&ion order
-DLG_SSHSETUP_COMP_UP=Move Up(&8)
-DLG_SSHSETUP_COMP_DOWN=Move Down(&9)
+DLG_SSHSETUP_COMP=Compress&ion order (SSH2 only)
+DLG_SSHSETUP_COMP_UP=Move Up(&9)
+DLG_SSHSETUP_COMP_DOWN=Move Down(&0)
 DLG_SSHSETUP_COMP_BORDER=<Compressions below this line are disabled>
 DLG_SSHSETUP_KNOWNHOST=SSH Known Hosts
 DLG_SSHSETUP_KNOWNHOST_RW=Read/&write file:

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/installer/release/lang/Japanese.lng	2011-04-17 06:37:14 UTC (rev 4445)
@@ -615,25 +615,26 @@
 DLG_SSHSETUP_COMPRESS=ˆ³kƒŒƒxƒ‹(&C):
 DLG_SSHSETUP_COMPRESS_NONE=‚È‚µ
 DLG_SSHSETUP_COMPRESS_HIGHEST=Å‚
-DLG_SSHSETUP_CHIPER=—Dæ‚·‚éƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&P)
-DLG_SSHSETUP_CHIPER_UP=ã‚Ö(&0)
-DLG_SSHSETUP_CHIPER_DOWN=‰º‚Ö(&1)
+DLG_SSHSETUP_COMPRESS_NOTE=SSH1: 'ˆ³kƒŒƒxƒ‹'‚É‚æ‚舳k‚ª—LŒø‚É‚È‚éB\nSSH2: 'ˆ³kƒAƒ‹ƒSƒŠƒYƒ€‚̏‡'‚Æ'ˆ³kƒŒƒxƒ‹'‚É‚æ‚舳k‚ª—LŒø‚É‚È‚éB
+DLG_SSHSETUP_CHIPER=—Dæ‚·‚éˆÃ†ƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&P)
+DLG_SSHSETUP_CHIPER_UP=ã‚Ö(&1)
+DLG_SSHSETUP_CHIPER_DOWN=‰º‚Ö(&2)
 DLG_SSHSETUP_CIPHER_BORDER=<ˆÈ‰º‚̈͆ƒAƒ‹ƒSƒŠƒYƒ€‚ÍŽg—p‚³‚ê‚Ü‚¹‚ñ>
-DLG_SSHSETUP_KEX=—Dæ‚·‚éƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&E)
-DLG_SSHSETUP_KEX_UP=ã‚Ö(&2)
-DLG_SSHSETUP_KEX_DOWN=‰º‚Ö(&3)
+DLG_SSHSETUP_KEX=—Dæ‚·‚錮ŒðŠ·ƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&E) (SSH2‚Ì‚Ý)
+DLG_SSHSETUP_KEX_UP=ã‚Ö(&3)
+DLG_SSHSETUP_KEX_DOWN=‰º‚Ö(&4)
 DLG_SSHSETUP_KEX_BORDER=<ˆÈ‰º‚ÌŒ®ŒðŠ·ƒAƒ‹ƒSƒŠƒYƒ€‚ÍŽg—p‚³‚ê‚Ü‚¹‚ñ>
-DLG_SSHSETUP_HOST_KEY=—Dæ‚·‚éƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&s)
-DLG_SSHSETUP_HOST_KEY_UP=ã‚Ö(&4)
-DLG_SSHSETUP_HOST_KEY_DOWN=‰º‚Ö(&5)
+DLG_SSHSETUP_HOST_KEY=—Dæ‚·‚éƒzƒXƒgƒL[ƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&S) (SSH2‚Ì‚Ý)
+DLG_SSHSETUP_HOST_KEY_UP=ã‚Ö(&5)
+DLG_SSHSETUP_HOST_KEY_DOWN=‰º‚Ö(&6)
 DLG_SSHSETUP_HOST_KEY_BORDER=<ˆÈ‰º‚̃zƒXƒgƒL[ƒAƒ‹ƒSƒŠƒYƒ€‚ÍŽg—p‚³‚ê‚Ü‚¹‚ñ>
-DLG_SSHSETUP_MAC=—Dæ‚·‚éƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&d)
-DLG_SSHSETUP_MAC_UP=ã‚Ö(&6)
-DLG_SSHSETUP_MAC_DOWN=‰º‚Ö(&7)
-DLG_SSHSETUP_MAC_BORDER=<ˆÈ‰º‚ÌHMACƒAƒ‹ƒSƒŠƒYƒ€‚ÍŽg—p‚³‚ê‚Ü‚¹‚ñ>
-DLG_SSHSETUP_COMP=—Dæ‚·‚éƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&i)
-DLG_SSHSETUP_COMP_UP=ã‚Ö(&8)
-DLG_SSHSETUP_COMP_DOWN=‰º‚Ö(&9)
+DLG_SSHSETUP_MAC=—Dæ‚·‚éMACƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&D) (SSH2‚Ì‚Ý)
+DLG_SSHSETUP_MAC_UP=ã‚Ö(&7)
+DLG_SSHSETUP_MAC_DOWN=‰º‚Ö(&8)
+DLG_SSHSETUP_MAC_BORDER=<ˆÈ‰º‚ÌMACƒAƒ‹ƒSƒŠƒYƒ€‚ÍŽg—p‚³‚ê‚Ü‚¹‚ñ>
+DLG_SSHSETUP_COMP=—Dæ‚·‚鈳kƒAƒ‹ƒSƒŠƒYƒ€‚̏‡(&I) (SSH2‚Ì‚Ý)
+DLG_SSHSETUP_COMP_UP=ã‚Ö(&9)
+DLG_SSHSETUP_COMP_DOWN=‰º‚Ö(&0)
 DLG_SSHSETUP_COMP_BORDER=<ˆÈ‰º‚̈³kƒAƒ‹ƒSƒŠƒYƒ€‚ÍŽg—p‚³‚ê‚Ü‚¹‚ñ>
 DLG_SSHSETUP_KNOWNHOST=SSH Known Hosts
 DLG_SSHSETUP_KNOWNHOST_RW=“ǂݏ‘‚«(&W):

Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/ttssh2/ttxssh/resource.h	2011-04-17 06:37:14 UTC (rev 4445)
@@ -139,6 +139,7 @@
 #define IDC_XFORWARD                    1079
 #define IDC_COMP_ORDER                  1079
 #define IDC_SSHFWDLOCALTOREMOTE_HOST    1080
+#define IDC_COMPRESSNOTE                1080
 #define IDC_SSHFWDLOCALTOREMOTE_PORT    1081
 #define IDC_SSHFWDREMOTETOLOCAL_HOST    1082
 #define IDC_SSHFWDREMOTETOLOCAL_PORT    1083

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2011-04-17 06:37:14 UTC (rev 4445)
@@ -2573,6 +2573,9 @@
 	GetDlgItemText(dlg, IDC_COMPRESSHIGH, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_COMPRESS_HIGHEST", pvar, uimsg);
 	SetDlgItemText(dlg, IDC_COMPRESSHIGH, pvar->ts->UIMsg);
+	GetDlgItemText(dlg, IDC_COMPRESSNOTE, uimsg, sizeof(uimsg));
+	UTIL_get_lang_msg("DLG_SSHSETUP_COMPRESS_NOTE", pvar, uimsg);
+	SetDlgItemText(dlg, IDC_COMPRESSNOTE, pvar->ts->UIMsg);
 
 	GetDlgItemText(dlg, IDC_CIPHERORDER, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_CHIPER", pvar, uimsg);
@@ -3159,17 +3162,39 @@
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgSetupFont, pvar)) {
 			SendDlgItemMessage(dlg, IDC_COMPRESSLABEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_COMPRESSNONE, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_COMPRESSHIGH, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_COMPRESSNOTE, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
 			SendDlgItemMessage(dlg, IDC_CIPHERORDER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_SSHCIPHERPREFS, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_SSHMOVECIPHERUP, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_SSHMOVECIPHERDOWN, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
+			SendDlgItemMessage(dlg, IDC_KEX_ORDER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHKEX_LIST, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHKEX_MOVEUP, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHKEX_MOVEDOWN, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
+			SendDlgItemMessage(dlg, IDC_HOST_KEY_ORDER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHHOST_KEY_LIST, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHHOST_KEY_MOVEUP, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHHOST_KEY_MOVEDOWN, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
+			SendDlgItemMessage(dlg, IDC_MAC_ORDER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHMAC_LIST, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHMAC_MOVEUP, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHMAC_MOVEDOWN, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
+			SendDlgItemMessage(dlg, IDC_COMP_ORDER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHCOMP_LIST, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHCOMP_MOVEUP, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_SSHCOMP_MOVEDOWN, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
 			SendDlgItemMessage(dlg, IDC_CHOOSEREADWRITEFILE, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_READWRITEFILENAME, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_CHOOSEREADONLYFILE, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_READONLYFILENAME, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(dlg, IDC_COMPRESSNONE, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(dlg, IDC_COMPRESSHIGH, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(dlg, IDC_NOTICEBANNER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_KNOWNHOSTS, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_HEARTBEATLABEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_HEARTBEAT_EDIT, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
@@ -3177,6 +3202,7 @@
 			SendDlgItemMessage(dlg, IDC_REMEMBERPASSWORD, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_FORWARDAGENT, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_FORWARDAGENTCONFIRM, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_NOTICEBANNER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 		}

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2011-04-17 05:01:09 UTC (rev 4444)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2011-04-17 06:37:14 UTC (rev 4445)
@@ -135,35 +135,36 @@
     CONTROL         "S&erial",IDC_HOSTSERIAL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,89,37,8
 END
 
-IDD_SSHSETUP DIALOGEX 0, 0, 626, 258
+IDD_SSHSETUP DIALOGEX 0, 0, 626, 271
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: Setup"
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
     GROUPBOX        "&Preferred cipher order",IDC_CIPHERORDER,17,7,187,98
     LISTBOX         IDC_SSHCIPHERPREFS,31,19,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Move Up(&0)",IDC_SSHMOVECIPHERUP,43,84,58,13,WS_GROUP
-    PUSHBUTTON      "Move Down(&1)",IDC_SSHMOVECIPHERDOWN,117,84,58,13
-    GROUPBOX        "K&EX order",IDC_KEX_ORDER,224,8,187,98
+    PUSHBUTTON      "Move Up(&1)",IDC_SSHMOVECIPHERUP,43,84,58,13,WS_GROUP
+    PUSHBUTTON      "Move Down(&2)",IDC_SSHMOVECIPHERDOWN,117,84,58,13
+    GROUPBOX        "K&EX order (SSH2 only)",IDC_KEX_ORDER,224,8,187,98
     LISTBOX         IDC_SSHKEX_LIST,238,20,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Move Up(&2)",IDC_SSHKEX_MOVEUP,250,85,58,13,WS_GROUP
-    PUSHBUTTON      "Move Down(&3)",IDC_SSHKEX_MOVEDOWN,324,85,58,13
-    GROUPBOX        "Ho&st Key order",IDC_HOST_KEY_ORDER,423,8,187,98
+    PUSHBUTTON      "Move Up(&3)",IDC_SSHKEX_MOVEUP,250,85,58,13,WS_GROUP
+    PUSHBUTTON      "Move Down(&4)",IDC_SSHKEX_MOVEDOWN,324,85,58,13
+    GROUPBOX        "Ho&st Key order (SSH2 only)",IDC_HOST_KEY_ORDER,423,8,187,98
     LISTBOX         IDC_SSHHOST_KEY_LIST,437,23,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Move Up(&4)",IDC_SSHHOST_KEY_MOVEUP,449,85,58,13,WS_GROUP
-    PUSHBUTTON      "Move Down(&5)",IDC_SSHHOST_KEY_MOVEDOWN,523,85,58,13
-    GROUPBOX        "MAC or&der",IDC_MAC_ORDER,224,114,187,98
-    LISTBOX         IDC_SSHMAC_LIST,238,127,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Move Up(&6)",IDC_SSHMAC_MOVEUP,250,191,58,13,WS_GROUP
-    PUSHBUTTON      "Move Down(&7)",IDC_SSHMAC_MOVEDOWN,324,191,58,13
-    GROUPBOX        "Compress&ion order",IDC_COMP_ORDER,423,114,187,139
-    LISTBOX         IDC_SSHCOMP_LIST,437,127,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Move Up(&8)",IDC_SSHCOMP_MOVEUP,449,191,58,13,WS_GROUP
-    PUSHBUTTON      "Move Down(&9)",IDC_SSHCOMP_MOVEDOWN,523,191,58,13
-    LTEXT           "None",IDC_COMPRESSNONE,494,216,18,8
-    LTEXT           "Highest",IDC_COMPRESSHIGH,584,216,25,8
-    RTEXT           "&Compression level:",IDC_COMPRESSLABEL,420,224,68,13
-    CONTROL         "Slider1",IDC_SSHCOMPRESSIONLEVEL,"msctls_trackbar32",TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,494,224,107,20
+    PUSHBUTTON      "Move Up(&5)",IDC_SSHHOST_KEY_MOVEUP,449,85,58,13,WS_GROUP
+    PUSHBUTTON      "Move Down(&6)",IDC_SSHHOST_KEY_MOVEDOWN,523,85,58,13
+    GROUPBOX        "MAC or&der (SSH2 only)",IDC_MAC_ORDER,224,110,187,98
+    LISTBOX         IDC_SSHMAC_LIST,238,123,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "Move Up(&7)",IDC_SSHMAC_MOVEUP,250,187,58,13,WS_GROUP
+    PUSHBUTTON      "Move Down(&8)",IDC_SSHMAC_MOVEDOWN,324,187,58,13
+    GROUPBOX        "Compress&ion order (SSH2 only)",IDC_COMP_ORDER,423,110,187,98
+    LISTBOX         IDC_SSHCOMP_LIST,437,123,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "Move Up(&9)",IDC_SSHCOMP_MOVEUP,449,187,58,13,WS_GROUP
+    PUSHBUTTON      "Move Down(&0)",IDC_SSHCOMP_MOVEDOWN,523,187,58,13
+    LTEXT           "None",IDC_COMPRESSNONE,499,210,18,8
+    LTEXT           "Highest",IDC_COMPRESSHIGH,584,210,25,8
+    RTEXT           "&Compression level:",IDC_COMPRESSLABEL,430,218,62,13
+    CONTROL         "Slider1",IDC_SSHCOMPRESSIONLEVEL,"msctls_trackbar32",TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,497,218,104,20
+    LTEXT           "SSH1: 'Compression level' determines compression on/off.\nSSH2: 'Compression order' and 'Compression level' determines compression on/off.",IDC_COMPRESSNOTE,431,241,188,25
     GROUPBOX        "SSH Known Hosts",IDC_KNOWNHOSTS,7,108,209,52
     PUSHBUTTON      "Read/&write file:",IDC_CHOOSEREADWRITEFILE,14,119,63,14
     EDITTEXT        IDC_READWRITEFILENAME,83,120,126,13,ES_AUTOHSCROLL | WS_GROUP
@@ -178,8 +179,8 @@
     CONTROL         "C&onfirm agent forwarding",IDC_FORWARDAGENTCONFIRM,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,209,187,10
     LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,223,187,12
-    DEFPUSHBUTTON   "OK",IDOK,49,237,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,119,237,50,14
+    DEFPUSHBUTTON   "OK",IDOK,48,252,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,118,252,50,14
 END
 
 IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 242
@@ -434,7 +435,7 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 619
         TOPMARGIN, 4
-        BOTTOMMARGIN, 253
+        BOTTOMMARGIN, 266
     END
 
     IDD_SSHUNKNOWNHOST, DIALOG



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