[Ttssh2-commit] [3403] Language が Korean のときの動作を調整

svnno****@sourc***** svnno****@sourc*****
2009年 5月 16日 (土) 01:29:12 JST


Revision: 3403
          http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3403
Author:   maya
Date:     2009-05-16 01:29:12 +0900 (Sat, 16 May 2009)

Log Message:
-----------
Language が Korean のときの動作を調整
  KanjiCode の選択肢に UTF-8m を追加
  CodePage により Language を変更する実装を削除
  TERMDLGK のリソース言語を英語(米国)に変更
  TERMDLGK のコントロールの配置を調整
  TERMDLGK の一部項目が i18n 対応されていなかったので対応

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpdlg/ttpdlg.rc


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2009-05-15 15:58:37 UTC (rev 3402)
+++ trunk/installer/release/lang/English.lng	2009-05-15 16:29:12 UTC (rev 3403)
@@ -300,6 +300,8 @@
 DLG_TERM_RUSSHOST=H&ost:
 DLG_TERM_RUSSCLIENT=&Client:
 DLG_TERM_RUSSFONT=&Font:
+DLG_TERMK_KANJI=Coding (r&eceive)
+DLG_TERMK_KANJISEND=Coding (tra&nsmit)
 
 DLG_WIN_TITLE=Tera Term: Window setup
 DLG_WIN_TITLELABEL=&Title:

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2009-05-15 15:58:37 UTC (rev 3402)
+++ trunk/installer/release/lang/German.lng	2009-05-15 16:29:12 UTC (rev 3403)
@@ -299,6 +299,8 @@
 DLG_TERM_RUSSHOST=H&ost:
 DLG_TERM_RUSSCLIENT=&Client:
 DLG_TERM_RUSSFONT=&Font:
+DLG_TERMK_KANJI=Coding (r&eceive)
+DLG_TERMK_KANJISEND=Coding (tra&nsmit)
 
 DLG_WIN_TITLE=Fenster Einstellungen
 DLG_WIN_TITLELABEL=Titel

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2009-05-15 15:58:37 UTC (rev 3402)
+++ trunk/installer/release/lang/Japanese.lng	2009-05-15 16:29:12 UTC (rev 3403)
@@ -300,6 +300,8 @@
 DLG_TERM_RUSSHOST=ƒzƒXƒg(&O):
 DLG_TERM_RUSSCLIENT=ƒNƒ‰ƒCƒAƒ“ƒg(&C):
 DLG_TERM_RUSSFONT=ƒtƒHƒ“ƒg(&F):
+DLG_TERMK_KANJI=ƒR[ƒfƒBƒ“ƒO-ŽóM(&E)
+DLG_TERMK_KANJISEND=ƒR[ƒfƒBƒ“ƒO-‘—M(&N)
 
 DLG_WIN_TITLE=Tera Term: ƒEƒBƒ“ƒhƒE‚̐ݒè
 DLG_WIN_TITLELABEL=ƒ^ƒCƒgƒ‹(&T):

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2009-05-15 15:58:37 UTC (rev 3402)
+++ trunk/teraterm/common/ttlib.c	2009-05-15 16:29:12 UTC (rev 3403)
@@ -781,7 +781,7 @@
 		{1, 2, 3, 4, 5}, /* English (dummy) */
 		{1, 2, 3, 4, 5}, /* Japanese(dummy) */
 		{1, 2, 3, 4, 5}, /* Russian (dummy) */
-		{1, 1, 1, 2, 2}, /* Korean */
+		{1, 1, 1, 2, 3}, /* Korean */
 		{1, 1, 1, 1, 2}, /* Utf8 */
 	};
 	lang--;
@@ -795,7 +795,7 @@
 		{1, 2, 3, 4, 5}, /* English (dummy) */
 		{1, 2, 3, 4, 5}, /* Japanese(dummy) */
 		{1, 2, 3, 4, 5}, /* Russian (dummy) */
-		{1, 4, 4, 1, 1}, /* Korean */
+		{1, 4, 5, 1, 1}, /* Korean */
 		{4, 5, 4, 4, 4}, /* Utf8 */
 	};
 	lang--;

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2009-05-15 15:58:37 UTC (rev 3402)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2009-05-15 16:29:12 UTC (rev 3403)
@@ -64,7 +64,7 @@
 static PCHAR far LocaleList[] = {"japanese","chinese", "chinese-simplified", "chinese-traditional", NULL};
 
 // HKS
-static PCHAR far KoreanList[] = {"KS5601", "UTF-8", NULL};
+static PCHAR far KoreanList[] = {"KS5601", "UTF-8", "UTF-8m", NULL};
 static PCHAR far KoreanListSend[] = {"KS5601", "UTF-8", NULL};
 
 // UTF-8
@@ -135,7 +135,11 @@
 					SendDlgItemMessage(Dialog, IDC_TERMRUSSFONTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 					SendDlgItemMessage(Dialog, IDC_TERMRUSSFONT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 				}
-				else if (ts->Language==IdUtf8) {
+				else if (ts->Language==IdUtf8 || ts->Language==IdKorean) {
+					SendDlgItemMessage(Dialog, IDC_TERMKANJILABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+					SendDlgItemMessage(Dialog, IDC_TERMKANJI, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+					SendDlgItemMessage(Dialog, IDC_TERMKANJISENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+					SendDlgItemMessage(Dialog, IDC_TERMKANJISEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 					SendDlgItemMessage(Dialog, IDC_LOCALE_LABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 					SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 					SendDlgItemMessage(Dialog, IDC_CODEPAGE_LABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
@@ -228,7 +232,13 @@
 				get_lang_msg("DLG_TERM_RUSSFONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
 				SetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg);
 			}
-			else if (ts->Language==IdUtf8) {
+			else if (ts->Language==IdUtf8 || ts->Language==IdKorean) {
+				GetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg2, sizeof(uimsg2));
+				get_lang_msg("DLG_TERMK_KANJI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
+				SetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg);
+				GetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg2, sizeof(uimsg2));
+				get_lang_msg("DLG_TERMK_KANJISEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
+				SetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg);
 				GetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg2, sizeof(uimsg2));
 				get_lang_msg("DLG_TERM_LOCALE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
 				SetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg);
@@ -311,8 +321,8 @@
 				SetDropDownList(Dialog,IDC_TERMRUSSFONT,RussList,ts->RussFont);
 			}
 			else if (ts->Language==IdKorean) { // HKS
-				SetDropDownList(Dialog, IDC_TERMKANJI, KoreanList, (ts->KanjiCode==IdUTF8)? 2:1);
-				SetDropDownList(Dialog, IDC_TERMKANJISEND, KoreanListSend, (ts->KanjiCodeSend==IdUTF8)? 2:1);
+				SetDropDownList(Dialog, IDC_TERMKANJI, KoreanList, KanjiCode2List(ts->Language,ts->KanjiCode));
+				SetDropDownList(Dialog, IDC_TERMKANJISEND, KoreanListSend, KanjiCode2List(ts->Language,ts->KanjiCodeSend));
 
 				// ƒƒP[ƒ‹—pƒeƒLƒXƒgƒ{ƒbƒNƒX
 				SetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale);
@@ -322,7 +332,7 @@
 			}
 			else if (ts->Language==IdUtf8) {
 				SetDropDownList(Dialog, IDC_TERMKANJI, Utf8List, KanjiCode2List(ts->Language,ts->KanjiCode));
-				SetDropDownList(Dialog, IDC_TERMKANJISEND, Utf8ListSend, KanjiCode2List(ts->Language,ts->KanjiCode));
+				SetDropDownList(Dialog, IDC_TERMKANJISEND, Utf8ListSend, KanjiCode2List(ts->Language,ts->KanjiCodeSend));
 
 				// ƒƒP[ƒ‹—pƒeƒLƒXƒgƒ{ƒbƒNƒX
 				SetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale);
@@ -394,30 +404,9 @@
 							ts->RussClient = (WORD)GetCurSel(Dialog, IDC_TERMRUSSCLIENT);
 							ts->RussFont = (WORD)GetCurSel(Dialog, IDC_TERMRUSSFONT);
 						}
-						else if (ts->Language==IdKorean) { // HKS
+						else if (ts->Language==IdKorean || // HKS
+						         ts->Language==IdUtf8) {
 							BOOL ret;
-
-							ts->KanjiCode = (WORD)GetCurSel(Dialog, IDC_TERMKANJI);
-							if(ts->KanjiCode==2) {
-								ts->KanjiCode=IdUTF8;
-							}
-							ts->KanjiCodeSend = (WORD)GetCurSel(Dialog, IDC_TERMKANJISEND);
-							if(ts->KanjiCodeSend==2) {
-								ts->KanjiCodeSend=IdUTF8;
-							}
-							ts->JIS7KatakanaSend=0;
-							ts->JIS7Katakana=0;
-							ts->KanjiIn = 0;
-							ts->KanjiOut = 0;
-
-							GetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale));
-							ts->CodePage = GetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, &ret, FALSE);
-							if(ts->CodePage==932) {
-								ts->Language = IdJapanese;
-							}
-						}
-						else if (ts->Language==IdUtf8) {
-							BOOL ret;
 							WORD listId;
 
 							listId = (WORD)GetCurSel(Dialog, IDC_TERMKANJI);

Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2009-05-15 15:58:37 UTC (rev 3402)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2009-05-15 16:29:12 UTC (rev 3403)
@@ -55,12 +55,12 @@
 
 
 /////////////////////////////////////////////////////////////////////////////
-// ŠØ‘Œê resources
+// ‰pŒê (•Ä‘) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-#pragma code_page(949)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 #endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@
 // Dialog
 //
 
-IDD_TERMDLGK DIALOGEX 20, 20, 245, 158
+IDD_TERMDLGK DIALOGEX 20, 20, 245, 145
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Tera Term: Terminal setup"
 FONT 10, "System", 0, 0, 0x0
@@ -90,37 +90,19 @@
     LTEXT           "&Answerback:",IDC_TERMANSBACKTEXT,9,82,44,10,NOT WS_GROUP
     EDITTEXT        IDC_TERMANSBACK,55,80,61,12,ES_AUTOHSCROLL | WS_GROUP
     CONTROL         "A&uto switch (VT<->TEK)",IDC_TERMAUTOSWITCH,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,123,80,110,12
-    GROUPBOX        "Coding (receive)",IDC_TERMKANJILABEL,7,96,65,40
-    COMBOBOX        IDC_TERMKANJI,11,107,39,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Coding (transmit)",IDC_TERMKANJISENDLABEL,77,96,158,40
-    COMBOBOX        IDC_TERMKANJISEND,84,107,40,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Coding (r&eceive)",IDC_TERMKANJILABEL,7,96,110,27
+    COMBOBOX        IDC_TERMKANJI,13,107,39,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Coding (tra&nsmit)",IDC_TERMKANJISENDLABEL,122,96,113,27
+    COMBOBOX        IDC_TERMKANJISEND,128,107,40,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "OK",IDOK,198,10,40,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,198,30,40,14
     PUSHBUTTON      "&Help",IDC_TERMHELP,198,54,40,14
-    RTEXT           "locale:",IDC_LOCALE_LABEL,12,142,38,8
-    EDITTEXT        IDC_LOCALE_EDIT,52,140,63,13,ES_AUTOHSCROLL
-    RTEXT           "CodePage:",IDC_CODEPAGE_LABEL,132,142,39,8
-    EDITTEXT        IDC_CODEPAGE_EDIT,173,140,40,14,ES_AUTOHSCROLL | ES_NUMBER
+    RTEXT           "locale:",IDC_LOCALE_LABEL,12,129,38,8
+    EDITTEXT        IDC_LOCALE_EDIT,52,127,63,13,ES_AUTOHSCROLL
+    RTEXT           "CodePage:",IDC_CODEPAGE_LABEL,132,129,39,8
+    EDITTEXT        IDC_CODEPAGE_EDIT,173,127,40,14,ES_AUTOHSCROLL | ES_NUMBER
 END
 
-#endif    // ŠØ‘Œê resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// ‰pŒê (•Ä‘) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
 IDD_TERMDLGJ DIALOGEX 20, 20, 245, 158
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Tera Term: Terminal setup"



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