Tera TermRevision: 10056
https://osdn.net/projects/ttssh2/scm/svn/commits/10056
Author: zmatsuo
Date: 2022-07-15 21:59:00 +0900 (Fri, 15 Jul 2022)
Log Message:
-----------
フォントタブのi18n化,リソースから日本語文字列削除
- lngファイルを使用するよう修正
- 日本語と英語のlngファイル修正
- レイアウト、文言変更に合わせてヘルプを修正
Modified Paths:
--------------
trunk/doc/en/html/menu/setup-additional-font.html
trunk/doc/ja/html/menu/setup-additional-font.html
trunk/installer/release/lang_utf8/English.lng
trunk/installer/release/lang_utf8/Japanese.lng
trunk/teraterm/teraterm/font_pp.cpp
trunk/teraterm/teraterm/font_pp.rc
trunk/teraterm/teraterm/font_pp_res.h
-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-additional-font.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional-font.html 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/doc/en/html/menu/setup-additional-font.html 2022-07-15 12:59:00 UTC (rev 10056)
@@ -16,6 +16,12 @@
<dd>
Specify VTWin font.
<dl>
+ <dt>Unicode API</dt>
+ <dd>
+ User Unicode Draw API.<br>
+ Normally not used.
+ </dd>
+
<dt>ANSI API</dt>
<dd>
Use ANSI(not Unicode) Draw API.<br>
@@ -24,12 +30,6 @@
Normally not used.
</dd>
- <dt>Unicode API</dt>
- <dd>
- User Unicode Draw API.<br>
- Normally not used.
- </dd>
-
<dt id="FontQuality">Font quality</dt>
<dd>
Specifies the font quality. This feature will work well only if the operating system supports.
Modified: trunk/doc/ja/html/menu/setup-additional-font.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional-font.html 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/doc/ja/html/menu/setup-additional-font.html 2022-07-15 12:59:00 UTC (rev 10056)
@@ -16,6 +16,12 @@
<dd>
VTWin\x82̃t\x83H\x83\x93\x83g\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
<dl>
+ <dt>Unicode API</dt>
+ <dd>
+ Unicode\x82ڎg\x97p\x82ł\xAB\x82\xE9\x95`\x89\xE6API\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B<br>
+ \x92ʏ\xED\x82͂\xB1\x82\xBF\x82\xE7\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
+ </dd>
+
<dt>ANSI API</dt>
<dd>
ANSI(Unicode\x82ł͂Ȃ\xA2)\x95`\x89\xE6API\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B<br>
@@ -24,12 +30,6 @@
\x92ʏ\xED\x82͎g\x97p\x82\xB5\x82܂\xB9\x82\xF1\x81B
</dd>
- <dt>Unicode API</dt>
- <dd>
- Unicode\x82ڎg\x97p\x82ł\xAB\x82\xE9\x95`\x89\xE6API\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B<br>
- \x92ʏ\xED\x82͂\xB1\x82\xBF\x82\xE7\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
- </dd>
-
<dt id="FontQuality">Font quality</dt>
<dd>
\x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x90ݒ肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81BOS\x82\xAA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82\xE9\x8E\xED\x97ނ̂ݗL\x8C\xF8\x82ɓ\xAE\x8D삵\x82܂\xB7\x81B
Modified: trunk/installer/release/lang_utf8/English.lng
===================================================================
--- trunk/installer/release/lang_utf8/English.lng 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/installer/release/lang_utf8/English.lng 2022-07-15 12:59:00 UTC (rev 10056)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-04-23)
+; Updated by TeraTerm Project (2022-07-15)
[Tera Term]
DLG_SYSTEM_FONT=System,14,0
@@ -175,6 +175,7 @@
DLG_TABSHEET_TITLE_VISUAL=Visual
DLG_TABSHEET_TITLE_LOG=Log
DLG_TABSHEET_TITLE_CYGWIN=Cygwin
+DLG_TABSHEET_TITLE_FONT=Font
DLG_TAB_GENERAL_CLICKURL=&Enable clickable URL
DLG_TAB_GENERAL_DISABLESENDBREAK=Disable accelerator &send break
@@ -263,6 +264,15 @@
DLG_TAB_CYGWIN_PATH=Cygwin install &path
+DLG_TAB_FONT_VTWINFONT=&VTWindow Font
+DLG_TAB_FONT_BTN_SELECT=&Select...
+DLG_TAB_FONT_VTFONT_TITLE=API for drawing
+DLG_TAB_FONT_DLGFONT=&Dialog font
+DLG_TAB_FONT_BTN_DEFAULT=D&efault
+DLG_TAB_FONT_CODEPAGE_LABEL=&Code page for display character conversion
+DLG_TAB_FONT_LIST_PRO_FONTS=List &proportional fonts in font dialog"
+DLG_TAB_FONT_CHARACTER_SPACE=character space
+
DLG_COMMENT_TITLE=Comment to Log
DLG_BROADCAST_TITLE=Tera Term: Broadcast command
Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/installer/release/lang_utf8/Japanese.lng 2022-07-15 12:59:00 UTC (rev 10056)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2022-04-23)
+; Updated by TeraTerm Project (2022-07-15)
[Tera Term]
DLG_SYSTEM_FONT=ＭＳ Ｐゴシック,12,128
@@ -175,6 +175,7 @@
DLG_TABSHEET_TITLE_VISUAL=表示
DLG_TABSHEET_TITLE_LOG=ログ
DLG_TABSHEET_TITLE_CYGWIN=Cygwin
+DLG_TABSHEET_TITLE_FONT=フォント
DLG_TAB_GENERAL_CLICKURL=クリッカブルURLを有効にする(&E)
DLG_TAB_GENERAL_DISABLESENDBREAK=ブレーク送信のアクセラレータキーを無効にする(&S)
@@ -263,6 +264,15 @@
DLG_TAB_CYGWIN_PATH=Cygwinインストール先のパス(&P)
+DLG_TAB_FONT_VTWINFONT=VTウィンドウフォント(&V)
+DLG_TAB_FONT_BTN_SELECT=選択(&S)...
+DLG_TAB_FONT_VTFONT_TITLE=文字描画で使用するAPI
+DLG_TAB_FONT_DLGFONT=ダイアログフォント(&D)
+DLG_TAB_FONT_BTN_DEFAULT=デフォルト(&E)
+DLG_TAB_FONT_CODEPAGE_LABEL=表示用文字変換コードページ(&C)
+DLG_TAB_FONT_LIST_PRO_FONTS=プロポーショナルフォントをフォントダイアログの一覧に表示する(&P)
+DLG_TAB_FONT_CHARACTER_SPACE=文字間スペース
+
DLG_COMMENT_TITLE=ログにコメントを付加
DLG_BROADCAST_TITLE=Tera Term: コマンドのブロードキャスト
Modified: trunk/teraterm/teraterm/font_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/font_pp.cpp 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/teraterm/teraterm/font_pp.cpp 2022-07-15 12:59:00 UTC (rev 10056)
@@ -115,8 +115,8 @@
static void EnableCodePage(HWND hWnd, BOOL enable)
{
- EnableWindow(GetDlgItem(hWnd, IDC_VTFONT_PAGECODE_LABEL), enable);
- EnableWindow(GetDlgItem(hWnd, IDC_VTFONT_PAGECODE_EDIT), enable);
+ EnableWindow(GetDlgItem(hWnd, IDC_VTFONT_CODEPAGE_LABEL), enable);
+ EnableWindow(GetDlgItem(hWnd, IDC_VTFONT_CODEPAGE_EDIT), enable);
}
static void SetFontString(HWND hWnd, int item, const LOGFONTA *logfont)
@@ -141,9 +141,17 @@
static INT_PTR CALLBACK Proc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
static const DlgTextInfo TextInfos[] = {
- {0, "DLG_GEN_TITLE"},
+ { IDC_VTWINFONT, "DLG_TAB_FONT_VTWINFONT" },
+ { IDC_VTFONT_CHOOSE, "DLG_TAB_FONT_BTN_SELECT" },
+ { IDC_VTFONT_TITLE, "DLG_TAB_FONT_VTFONT_TITLE" },
+ { IDC_VTFONT_CODEPAGE_LABEL, "DLG_TAB_FONT_CODEPAGE_LABEL" },
+ { IDC_FONT_QUALITY_LABEL, "DLG_TAB_VISUAL_FONT_QUALITY" },
+ { IDC_DLGFONT, "DLG_TAB_FONT_DLGFONT"},
+ { IDC_DLGFONT_CHOOSE, "DLG_TAB_FONT_BTN_SELECT" },
+ { IDC_DLGFONT_DEFAULT, "DLG_TAB_FONT_BTN_DEFAULT" },
{ IDC_LIST_HIDDEN_FONTS, "DLG_TAB_GENERAL_LIST_HIDDEN_FONTS" },
- { IDC_FONT_QUALITY_LABEL, "DLG_TAB_VISUAL_FONT_QUALITY" },
+ { IDC_LIST_PRO_FONTS, "DLG_TAB_FONT_LIST_PRO_FONTS" },
+ { IDC_CHARACTER_SPACE_TITLE, "DLG_TAB_FONT_CHARACTER_SPACE" },
};
FontPPData *dlg_data = (FontPPData *)GetWindowLongPtr(hWnd, DWLP_USER);
TTTSet *ts = dlg_data == NULL ? NULL : dlg_data->pts;
@@ -162,7 +170,7 @@
CheckDlgButton(hWnd,
UnicodeDebugParam.UseUnicodeApi ? IDC_VTFONT_UNICODE : IDC_VTFONT_ANSI,
BST_CHECKED);
- SetDlgItemInt(hWnd, IDC_VTFONT_PAGECODE_EDIT, UnicodeDebugParam.CodePageForANSIDraw, FALSE);
+ SetDlgItemInt(hWnd, IDC_VTFONT_CODEPAGE_EDIT, UnicodeDebugParam.CodePageForANSIDraw, FALSE);
EnableCodePage(hWnd, UnicodeDebugParam.UseUnicodeApi ? FALSE : TRUE);
CheckDlgButton(hWnd, IDC_LIST_HIDDEN_FONTS, ts->ListHiddenFonts);
@@ -199,7 +207,7 @@
UnicodeDebugParam.UseUnicodeApi =
IsDlgButtonChecked(hWnd, IDC_VTFONT_UNICODE) == BST_CHECKED;
UnicodeDebugParam.CodePageForANSIDraw =
- GetDlgItemInt(hWnd, IDC_VTFONT_PAGECODE_EDIT, NULL, FALSE);
+ GetDlgItemInt(hWnd, IDC_VTFONT_CODEPAGE_EDIT, NULL, FALSE);
// ANSI\x95\\x8E\xA6\x97p\x82̃R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x90ݒ肷\x82\xE9
BuffSetDispCodePage(UnicodeDebugParam.CodePageForANSIDraw);
ts->ListHiddenFonts = IsDlgButtonChecked(hWnd, IDC_LIST_HIDDEN_FONTS) == BST_CHECKED;
@@ -237,7 +245,7 @@
}
case IDC_VTFONT_CHOOSE | (BN_CLICKED << 16): {
DispSetupFontDlg();
- SetDlgItemInt(hWnd, IDC_VTFONT_PAGECODE_EDIT, UnicodeDebugParam.CodePageForANSIDraw, FALSE);
+ SetDlgItemInt(hWnd, IDC_VTFONT_CODEPAGE_EDIT, UnicodeDebugParam.CodePageForANSIDraw, FALSE);
SetVTFontString(hWnd, IDC_VTFONT_EDIT, ts);
break;
}
@@ -298,7 +306,10 @@
psp.dwFlags = PSP_DEFAULT | PSP_USECALLBACK | PSP_USETITLE | PSP_HASHELP;
psp.hInstance = inst;
psp.pfnCallback = CallBack;
- psp.pszTitle = L"font"; // TODO lng \x83t\x83@\x83C\x83\x8B\x82ɓ\xFC\x82\xEA\x82\xE9
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_FONT",
+ L"Font", pts->UILanguageFileW, &UIMsg);
+ psp.pszTitle = UIMsg;
psp.pszTemplate = MAKEINTRESOURCEW(id);
#if defined(REWRITE_TEMPLATE)
psp.dwFlags |= PSP_DLGINDIRECT;
@@ -310,5 +321,6 @@
psp.lParam = (LPARAM)Param;
HPROPSHEETPAGE hpsp = CreatePropertySheetPageW((LPPROPSHEETPAGEW)&psp);
+ free(UIMsg);
return hpsp;
}
Modified: trunk/teraterm/teraterm/font_pp.rc
===================================================================
--- trunk/teraterm/teraterm/font_pp.rc 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/teraterm/teraterm/font_pp.rc 2022-07-15 12:59:00 UTC (rev 10056)
@@ -13,11 +13,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// \x93\xFA\x96{\x8C\xEA (\x93\xFA\x96{) resources
+// \x89p\x8C\xEA (\x95č\x91) resources
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -52,28 +52,28 @@
IDD_TABSHEET_FONT DIALOGEX 0, 0, 309, 267
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "\x95\\x8E\xA6/\x83t\x83H\x83\x93\x83g"
+CAPTION "font"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- LTEXT "\x83^\x81[\x83~\x83i\x83\x8B\x83t\x83H\x83\x93\x83g",IDC_STATIC,7,7,115,8
+ LTEXT "&VTWindow Font",IDC_VTWINFONT,7,7,115,8
EDITTEXT IDC_VTFONT_EDIT,19,27,148,12,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "\x95ύX",IDC_VTFONT_CHOOSE,177,27,50,14
- LTEXT "\x95\xB6\x8E\x9A\x95`\x89\xE6\x82Ŏg\x97p\x82\xB7\x82\xE9API",IDC_STATIC,19,50,123,8
- CONTROL "ANSI API",IDC_VTFONT_ANSI,"Button",BS_AUTORADIOBUTTON,31,66,88,10
- CONTROL "Unicode API",IDC_VTFONT_UNICODE,"Button",BS_AUTORADIOBUTTON,31,110,93,10
- LTEXT "\x95\\x8E\xA6\x97p\x95\xB6\x8E\x9A\x95ϊ\xB7\x83R\x81[\x83h\x83y\x81[\x83W",IDC_VTFONT_PAGECODE_LABEL,43,81,131,8
- EDITTEXT IDC_VTFONT_PAGECODE_EDIT,44,92,40,12,ES_AUTOHSCROLL
+ PUSHBUTTON "&Select...",IDC_VTFONT_CHOOSE,177,26,50,14
+ LTEXT "API for drawing",IDC_VTFONT_TITLE,19,50,123,8
+ CONTROL "&Unicode API",IDC_VTFONT_UNICODE,"Button",BS_AUTORADIOBUTTON,31,64,93,10
+ CONTROL "&ANSI API",IDC_VTFONT_ANSI,"Button",BS_AUTORADIOBUTTON,31,82,88,10
+ LTEXT "&Code page for display character conversion",IDC_VTFONT_CODEPAGE_LABEL,43,97,131,8
+ EDITTEXT IDC_VTFONT_CODEPAGE_EDIT,44,108,40,12,ES_AUTOHSCROLL
LTEXT "&Font Quality",IDC_FONT_QUALITY_LABEL,19,129,91,8
COMBOBOX IDC_FONT_QUALITY,30,141,87,69,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g",IDC_STATIC,7,162,115,8
- EDITTEXT IDC_DLGFONT_EDIT,19,175,148,12,ES_AUTOHSCROLL | ES_READONLY
- PUSHBUTTON "\x95ύX",IDC_DLGFONT_CHOOSE,177,175,50,14
- PUSHBUTTON "\x83f\x83t\x83H\x83\x8B\x83g",IDC_DLGFONT_DEFAULT,231,175,50,14
+ LTEXT "&Dialog font",IDC_DLGFONT,7,162,115,8
+ EDITTEXT IDC_DLGFONT_EDIT,19,177,148,12,ES_AUTOHSCROLL | ES_READONLY
+ PUSHBUTTON "Select...",IDC_DLGFONT_CHOOSE,177,176,50,14
+ PUSHBUTTON "&default",IDC_DLGFONT_DEFAULT,231,176,50,14
CONTROL "List &hidden fonts in font dialog",IDC_LIST_HIDDEN_FONTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,194,234,10
- CONTROL "\x83v\x83\x8D\x83|\x81[\x83V\x83\x87\x83i\x83\x8B\x83t\x83H\x83\x93\x83g\x82\xE0\x83t\x83H\x83\x93\x83g\x83_\x83C\x83A\x83\x8D\x83O\x82̈ꗗ\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9",IDC_LIST_PRO_FONTS,
+ CONTROL "List &proportional fonts in font dialog",IDC_LIST_PRO_FONTS,
"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,209,240,10
- LTEXT "\x95\xB6\x8E\x9A\x8AԃX\x83y\x81[\x83X",IDC_STATIC,187,51,115,8,WS_DISABLED
+ LTEXT "character space",IDC_CHARACTER_SPACE_TITLE,187,51,115,8,WS_DISABLED
EDITTEXT IDC_SPACE_TOP,224,68,40,14,ES_AUTOHSCROLL | WS_DISABLED
EDITTEXT IDC_SPACE_BOTTOM,224,87,40,14,ES_AUTOHSCROLL | WS_DISABLED
EDITTEXT IDC_SPACE_LEFT,224,105,40,14,ES_AUTOHSCROLL | WS_DISABLED
@@ -95,6 +95,8 @@
RIGHTMARGIN, 302
TOPMARGIN, 7
BOTTOMMARGIN, 260
+ HORZGUIDE, 33
+ HORZGUIDE, 183
END
END
#endif // APSTUDIO_INVOKED
@@ -110,7 +112,7 @@
0
END
-#endif // \x93\xFA\x96{\x8C\xEA (\x93\xFA\x96{) resources
+#endif // \x89p\x8C\xEA (\x95č\x91) resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/teraterm/teraterm/font_pp_res.h
===================================================================
--- trunk/teraterm/teraterm/font_pp_res.h 2022-07-15 12:58:48 UTC (rev 10055)
+++ trunk/teraterm/teraterm/font_pp_res.h 2022-07-15 12:59:00 UTC (rev 10056)
@@ -3,36 +3,35 @@
// font_pp.rc \x82Ŏg\x97p
//
#define IDD_TABSHEET_FONT 129
-#define IDC_SPACE_TOP 1001
-#define IDC_SPACE_BOTTOM 1002
-#define IDC_SPACE_LEFT 1003
-#define IDC_SPACE_RIGHT 1004
-#define IDC_VTFONT_PAGECODE_LABEL 1005
-#define IDC_FONT_QUALITY_LABEL 1006
-#define IDC_VTFONT_EDIT 2607
-#define IDC_BUTTON1 2608
-#define IDC_VTFONT_CHOOSE 2608
-#define IDC_VTFONT_ANSI 2609
-#define IDC_VTFONT_UNICODE 2610
-#define IDC_VTFONT_PAGECODE_EDIT 2611
-#define IDC_LIST_HIDDEN_FONTS 2612
-#define IDC_FONT_QUALITY 2613
-#define IDC_CHECK2 2614
-#define IDC_LIST_PRO_FONTS 2614
-#define IDC_EDIT3 2615
-#define IDC_DLGFONT_EDIT 2615
-#define IDC_BUTTON2 2616
-#define IDC_DLGFONT_CHOOSE 2616
-#define IDC_BUTTON3 2617
-#define IDC_DLGFONT_DEFAULT 2617
+#define IDC_VTWINFONT 1000
+#define IDC_VTFONT_TITLE 1001
+#define IDC_VTFONT_EDIT 1002
+#define IDC_VTFONT_CHOOSE 1003
+#define IDC_VTFONT_UNICODE 1004
+#define IDC_VTFONT_ANSI 1005
+#define IDC_VTFONT_CODEPAGE_LABEL 1006
+#define IDC_VTFONT_CODEPAGE_EDIT 1007
+#define IDC_FONT_QUALITY_LABEL 1008
+#define IDC_FONT_QUALITY 1009
+#define IDC_CHARACTER_SPACE_TITLE 1010
+#define IDC_SPACE_TOP 1011
+#define IDC_SPACE_BOTTOM 1012
+#define IDC_SPACE_LEFT 1013
+#define IDC_SPACE_RIGHT 1014
+#define IDC_DLGFONT 1015
+#define IDC_DLGFONT_EDIT 1016
+#define IDC_DLGFONT_CHOOSE 1017
+#define IDC_DLGFONT_DEFAULT 1018
+#define IDC_LIST_HIDDEN_FONTS 1019
+#define IDC_LIST_PRO_FONTS 1020
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1007
+#define _APS_NEXT_CONTROL_VALUE 1021
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif