Tera TermRevision: 9359
https://osdn.net/projects/ttssh2/scm/svn/commits/9359
Author: zmatsuo
Date: 2021-08-14 12:26:30 +0900 (Sat, 14 Aug 2021)
Log Message:
-----------
UILanguageFile を unicode版(UILanguageFileW)へ切り替え
- SetDlgTexts() -> SetDlgTextsW()
- get_lang_msgW() ->GetI18nStrWW()
- SetI18nList() -> SetI18nListW()
Modified Paths:
--------------
trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c
trunk/teraterm/common/dlglib.c
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/teraterm/clipboarddlg.cpp
trunk/teraterm/teraterm/clipboarddlg.h
trunk/teraterm/teraterm/coding_pp.cpp
trunk/teraterm/teraterm/filesys_log.cpp
trunk/teraterm/teraterm/font_pp.cpp
trunk/teraterm/teraterm/prnabort.cpp
trunk/teraterm/teraterm/sendfiledlg.cpp
trunk/teraterm/teraterm/sendfiledlg.h
trunk/teraterm/teraterm/setupdirdlg.cpp
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpdlg/ttdlg.c
-------------- next part --------------
Modified: trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c 2021-08-14 03:26:30 UTC (rev 9359)
@@ -183,8 +183,8 @@
BOOL result_bool;
size_t json_size;
char *json_ptr;
- const char *UILanguageFile = pvar->ts->UILanguageFile;
- wchar_t update_info_url[MAX_UIMSG];
+ const wchar_t *UILanguageFileW = pvar->ts->UILanguageFileW;
+ wchar_t *update_info_url;
static const TTMessageBoxInfoW info = {
"TTXCheckUpdate",
NULL, L"Tera Term",
@@ -193,9 +193,8 @@
};
/* \x8DX\x90V\x8F\xEE\x95\xF1\x82\xF0\x8E擾\x82\xB5\x82Ă\xE0ok? */
- GetI18nStrW("TTXCheckUpdate", "JSON_URL", update_info_url, _countof(update_info_url), update_info_url_default,
- UILanguageFile);
- result_mb = TTMessageBoxA(hWnd, &info, UILanguageFile, update_info_url);
+ GetI18nStrWW("TTXCheckUpdate", "JSON_URL", update_info_url_default, UILanguageFileW, &update_info_url);
+ result_mb = TTMessageBoxW(hWnd, &info, UILanguageFileW, update_info_url);
if (result_mb == IDNO) {
return;
}
@@ -203,6 +202,7 @@
/* \x8DX\x90V\x8F\xEE\x95\xF1\x8E擾\x81A'\0'\x82\xF0\x92lj\xC1\x82\xB7\x82遨 json\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8D쐬 */
swprintf(agent, _countof(agent), L"%s_%d", agent_base, pvar->ts->RunningVersion);
result_bool = GetContent(update_info_url, agent, (void**)&json_raw_ptr, &json_raw_size);
+ free(update_info_url);
if (!result_bool) {
MessageBoxW(hWnd, L"access error?", L"Tera Term", MB_OK | MB_ICONEXCLAMATION);
return;
@@ -247,12 +247,12 @@
};
const UINT ID_HELP_INDEX2 = 50910;
- const char *UILanguageFile = pvar->ts->UILanguageFile;
+ const wchar_t *UILanguageFileW = pvar->ts->UILanguageFileW;
TTInsertMenuItemA(menu, ID_HELP_INDEX2, MF_ENABLED, ID_MENUITEM, "Check &Update...", FALSE);
TTInsertMenuItemA(menu, ID_HELP_INDEX2, MF_SEPARATOR, 0, NULL, FALSE);
- SetI18nMenuStrs("TTXCheckUpdate", menu, MenuTextInfo, _countof(MenuTextInfo), UILanguageFile);
+ SetI18nMenuStrsW(menu, "TTXCheckUpdate", MenuTextInfo, _countof(MenuTextInfo), UILanguageFileW);
}
static int WINAPI TTXProcessCommand(HWND hWin, WORD cmd)
Modified: trunk/teraterm/common/dlglib.c
===================================================================
--- trunk/teraterm/common/dlglib.c 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/common/dlglib.c 2021-08-14 03:26:30 UTC (rev 9359)
@@ -199,7 +199,6 @@
SendDlgItemMessage(HDlg, Id_Item, CB_SETCURSEL,nsel-1,0);
}
-#if defined(UNICODE)
void SetDropDownListW(HWND HDlg, int Id_Item, const wchar_t *List[], int nsel)
{
int i;
@@ -212,7 +211,6 @@
}
SendDlgItemMessage(HDlg, Id_Item, CB_SETCURSEL,nsel-1,0);
}
-#endif
LONG GetCurSel(HWND HDlg, int Id_Item)
{
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/addsetting.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -84,10 +84,10 @@
CGeneralPropPageDlg::CGeneralPropPageDlg(HINSTANCE inst)
: TTCPropertyPage(inst, CGeneralPropPageDlg::IDD)
{
- wchar_t UIMsg[MAX_UIMSG];
- get_lang_msgW("DLG_TABSHEET_TITLE_GENERAL", UIMsg, _countof(UIMsg),
- L"General", ts.UILanguageFile);
- m_psp.pszTitle = _wcsdup(UIMsg);
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_GENERAL",
+ L"General", ts.UILanguageFileW, &UIMsg);
+ m_psp.pszTitle = UIMsg;
m_psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
}
@@ -212,10 +212,10 @@
CSequencePropPageDlg::CSequencePropPageDlg(HINSTANCE inst)
: TTCPropertyPage(inst, CSequencePropPageDlg::IDD)
{
- wchar_t UIMsg[MAX_UIMSG];
- get_lang_msgW("DLG_TABSHEET_TITLE_SEQUENCE", UIMsg, _countof(UIMsg),
- L"Control Sequence", ts.UILanguageFile);
- m_psp.pszTitle = _wcsdup(UIMsg);
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_SEQUENCE",
+ L"Control Sequence", ts.UILanguageFileW, &UIMsg);
+ m_psp.pszTitle = UIMsg;
m_psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
}
@@ -253,8 +253,8 @@
{ "DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_AHEAD", L"ahead" },
{ "DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_LAST", L"last" },
};
- SetI18nList("Tera Term", m_hWnd, IDC_ACCEPT_TITLE_CHANGING, accept_title_changing, _countof(accept_title_changing),
- ts.UILanguageFile, 0);
+ SetI18nListW("Tera Term", m_hWnd, IDC_ACCEPT_TITLE_CHANGING, accept_title_changing, _countof(accept_title_changing),
+ ts.UILanguageFileW, 0);
const static I18nTextInfo sequence_title_report[] = {
{ "DLG_TAB_SEQUENCE_TITLE_REPORT_IGNORE", L"ignore" },
@@ -261,8 +261,8 @@
{ "DLG_TAB_SEQUENCE_TITLE_REPORT_ACCEPT", L"accept" },
{ "DLG_TAB_SEQUENCE_TITLE_REPORT_EMPTY", L"empty" },
};
- SetI18nList("Tera Term", m_hWnd, IDC_TITLE_REPORT, sequence_title_report, _countof(sequence_title_report),
- ts.UILanguageFile, 0);
+ SetI18nListW("Tera Term", m_hWnd, IDC_TITLE_REPORT, sequence_title_report, _countof(sequence_title_report),
+ ts.UILanguageFileW, 0);
const static I18nTextInfo sequence_clipboard_access[] = {
{ "DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_OFF", L"off" },
@@ -270,8 +270,8 @@
{ "DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_READ", L"read only" },
{ "DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_ON", L"read/write" },
};
- SetI18nList("Tera Term", m_hWnd, IDC_CLIPBOARD_ACCESS, sequence_clipboard_access,
- _countof(sequence_clipboard_access), ts.UILanguageFile, 0);
+ SetI18nListW("Tera Term", m_hWnd, IDC_CLIPBOARD_ACCESS, sequence_clipboard_access,
+ _countof(sequence_clipboard_access), ts.UILanguageFileW, 0);
// (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING
SetCheck(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.MouseEventTracking);
@@ -411,10 +411,10 @@
CCopypastePropPageDlg::CCopypastePropPageDlg(HINSTANCE inst)
: TTCPropertyPage(inst, CCopypastePropPageDlg::IDD)
{
- wchar_t UIMsg[MAX_UIMSG];
- get_lang_msgW("DLG_TABSHEET_TITLE_COPYPASTE", UIMsg, _countof(UIMsg),
- L"Copy and Paste", ts.UILanguageFile);
- m_psp.pszTitle = _wcsdup(UIMsg);
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_COPYPASTE",
+ L"Copy and Paste", ts.UILanguageFileW, &UIMsg);
+ m_psp.pszTitle = UIMsg;
m_psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
}
@@ -622,10 +622,10 @@
CVisualPropPageDlg::CVisualPropPageDlg(HINSTANCE inst)
: TTCPropertyPage(inst, CVisualPropPageDlg::IDD)
{
- wchar_t UIMsg[MAX_UIMSG];
- get_lang_msgW("DLG_TABSHEET_TITLE_VISUAL", UIMsg, _countof(UIMsg),
- L"Visual", ts.UILanguageFile);
- m_psp.pszTitle = _wcsdup(UIMsg);
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_VISUAL",
+ L"Visual", ts.UILanguageFileW, &UIMsg);
+ m_psp.pszTitle = UIMsg;
m_psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
TipWin = new CTipWin(inst);
}
@@ -676,8 +676,8 @@
{ "DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED", L"Antialiased" },
{ "DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE", L"ClearType" },
};
- SetI18nList("Tera Term", m_hWnd, IDC_FONT_QUALITY, visual_font_quality, _countof(visual_font_quality),
- ts.UILanguageFile, 0);
+ SetI18nListW("Tera Term", m_hWnd, IDC_FONT_QUALITY, visual_font_quality, _countof(visual_font_quality),
+ ts.UILanguageFileW, 0);
// (1)AlphaBlend
@@ -1248,10 +1248,10 @@
CLogPropPageDlg::CLogPropPageDlg(HINSTANCE inst)
: TTCPropertyPage(inst, CLogPropPageDlg::IDD)
{
- wchar_t UIMsg[MAX_UIMSG];
- get_lang_msgW("DLG_TABSHEET_TITLE_Log", UIMsg, _countof(UIMsg),
- L"Log", ts.UILanguageFile);
- m_psp.pszTitle = _wcsdup(UIMsg);
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_Log",
+ L"Log", ts.UILanguageFileW, &UIMsg);
+ m_psp.pszTitle = UIMsg;
m_psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
}
@@ -1306,8 +1306,8 @@
{ "DLG_FOPT_TIMESTAMP_ELAPSED_LOGGING", L"Elapsed Time (Logging)" },
{ "DLG_FOPT_TIMESTAMP_ELAPSED_CONNECTION", L"Elapsed Time (Connection)" },
};
- SetI18nList("Tera Term", m_hWnd, IDC_OPT_TIMESTAMP_TYPE, fopt_timestamp, _countof(fopt_timestamp),
- ts.UILanguageFile, 0);
+ SetI18nListW("Tera Term", m_hWnd, IDC_OPT_TIMESTAMP_TYPE, fopt_timestamp, _countof(fopt_timestamp),
+ ts.UILanguageFileW, 0);
// Viewlog Editor path (2005.1.29 yutaka)
SetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
@@ -1616,10 +1616,10 @@
CCygwinPropPageDlg::CCygwinPropPageDlg(HINSTANCE inst)
: TTCPropertyPage(inst, CCygwinPropPageDlg::IDD)
{
- wchar_t UIMsg[MAX_UIMSG];
- get_lang_msgW("DLG_TABSHEET_TITLE_CYGWIN", UIMsg, _countof(UIMsg),
- L"Cygwin", ts.UILanguageFile);
- m_psp.pszTitle = _wcsdup(UIMsg);
+ wchar_t *UIMsg;
+ GetI18nStrWW("Tera Term", "DLG_TABSHEET_TITLE_CYGWIN",
+ L"Cygwin", ts.UILanguageFileW, &UIMsg);
+ m_psp.pszTitle = UIMsg;
m_psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
}
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/clipboar.c 2021-08-14 03:26:30 UTC (rev 9359)
@@ -165,7 +165,7 @@
if (confirm) {
clipboarddlgdata dlg_data;
dlg_data.strW_ptr = str_w;
- dlg_data.UILanguageFile = ts.UILanguageFile;
+ dlg_data.UILanguageFileW = ts.UILanguageFileW;
ret = clipboarddlg(hInst, HWin, &dlg_data);
*out_str_w = dlg_data.strW_edited_ptr;
}
Modified: trunk/teraterm/teraterm/clipboarddlg.cpp
===================================================================
--- trunk/teraterm/teraterm/clipboarddlg.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/clipboarddlg.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -88,7 +88,7 @@
case WM_INITDIALOG:
data = (clipboarddlgdata *)lp;
SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)data);
- SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), data->UILanguageFile);
+ SetDlgTextsW(hDlgWnd, TextInfos, _countof(TextInfos), data->UILanguageFileW);
if (data->strW_ptr != NULL) {
SetDlgItemTextW(hDlgWnd, IDC_EDIT, data->strW_ptr);
Modified: trunk/teraterm/teraterm/clipboarddlg.h
===================================================================
--- trunk/teraterm/teraterm/clipboarddlg.h 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/clipboarddlg.h 2021-08-14 03:26:30 UTC (rev 9359)
@@ -40,7 +40,7 @@
wchar_t *strW_edited_ptr;
char *strA_ptr;
size_t strA_len;
- const char *UILanguageFile;
+ const wchar_t *UILanguageFileW;
} clipboarddlgdata;
INT_PTR clipboarddlg(
Modified: trunk/teraterm/teraterm/coding_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/coding_pp.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/coding_pp.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -100,7 +100,7 @@
DlgData = (CodingPPData *)(((PROPSHEETPAGEW_V1 *)lp)->lParam);
const TTTSet *ts = DlgData->pts;
SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR)DlgData);
- SetDlgTexts(hWnd, TextInfos, _countof(TextInfos), DlgData->pts->UILanguageFile);
+ SetDlgTextsW(hWnd, TextInfos, _countof(TextInfos), DlgData->pts->UILanguageFileW);
int recv_index = 0;
int send_index = 0;
Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/filesys_log.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -489,13 +489,12 @@
case WM_INITDIALOG: {
work = (LogDlgWork_t *)lParam;
TTTSet *pts = work->pts;
- const char *UILanguageFile = pts->UILanguageFile;
SetWindowLongPtr(Dialog, DWLP_USER, (LONG_PTR)work);
::DragAcceptFiles(Dialog, TRUE);
- SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
- SetI18nList("Tera Term", Dialog, IDC_TIMESTAMPTYPE, timestamp_list, _countof(timestamp_list),
- UILanguageFile, 0);
+ SetDlgTextsW(Dialog, TextInfos, _countof(TextInfos), pts->UILanguageFileW);
+ SetI18nListW("Tera Term", Dialog, IDC_TIMESTAMPTYPE, timestamp_list, _countof(timestamp_list),
+ pts->UILanguageFileW, 0);
SendDlgItemMessage(Dialog, IDC_TEXTCODING_DROPDOWN, CB_ADDSTRING, 0, (LPARAM)"UTF-8");
SendDlgItemMessage(Dialog, IDC_TEXTCODING_DROPDOWN, CB_ADDSTRING, 0, (LPARAM)"UTF-16LE");
Modified: trunk/teraterm/teraterm/font_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/font_pp.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/font_pp.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -149,7 +149,7 @@
dlg_data = (FontPPData *)(((PROPSHEETPAGEW_V1 *)lp)->lParam);
ts = dlg_data->pts;
SetWindowLongPtr(hWnd, DWLP_USER, (LONG_PTR)dlg_data);
- SetDlgTexts(hWnd, TextInfos, _countof(TextInfos), dlg_data->pts->UILanguageFile);
+ SetDlgTextsW(hWnd, TextInfos, _countof(TextInfos), dlg_data->pts->UILanguageFileW);
GetDlgLogFont(GetParent(hWnd), ts, &dlg_data->DlgFont);
@@ -175,8 +175,8 @@
{ "DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED", L"Antialiased" },
{ "DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE", L"ClearType" },
};
- SetI18nList("Tera Term", hWnd, IDC_FONT_QUALITY, visual_font_quality, _countof(visual_font_quality),
- ts->UILanguageFile, 0);
+ SetI18nListW("Tera Term", hWnd, IDC_FONT_QUALITY, visual_font_quality, _countof(visual_font_quality),
+ ts->UILanguageFileW, 0);
int cur =
ts->FontQuality == DEFAULT_QUALITY ? 0 :
ts->FontQuality == NONANTIALIASED_QUALITY ? 1 :
Modified: trunk/teraterm/teraterm/prnabort.cpp
===================================================================
--- trunk/teraterm/teraterm/prnabort.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/prnabort.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -51,7 +51,7 @@
{
self = (CPrnAbortDlg *)lp;
SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)self);
- SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), self->m_ts->UILanguageFile);
+ SetDlgTextsW(hDlgWnd, TextInfos, _countof(TextInfos), self->m_ts->UILanguageFileW);
return TRUE;
}
@@ -117,4 +117,3 @@
::DestroyWindow(m_hWnd);
return TRUE;
}
-
Modified: trunk/teraterm/teraterm/sendfiledlg.cpp
===================================================================
--- trunk/teraterm/teraterm/sendfiledlg.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/sendfiledlg.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -136,11 +136,11 @@
work->create_param = data;
work->MsgDlgHelp = RegisterWindowMessage(HELPMSGSTRING);
::DragAcceptFiles(hDlgWnd, TRUE);
- SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), data->UILanguageFile);
+ SetDlgTextsW(hDlgWnd, TextInfos, _countof(TextInfos), data->UILanguageFileW);
CenterWindow(hDlgWnd, GetParent(hDlgWnd));
- SetI18nList("Tera Term", hDlgWnd, IDC_SENDFILE_DELAYTYPE_DROPDOWN, delaytype_list, _countof(delaytype_list),
- data->UILanguageFile, 0);
+ SetI18nListW("Tera Term", hDlgWnd, IDC_SENDFILE_DELAYTYPE_DROPDOWN, delaytype_list, _countof(delaytype_list),
+ data->UILanguageFileW, 0);
for (size_t i = 0; i < _countof(send_size_list); i++) {
char buf[32];
@@ -156,7 +156,8 @@
TipWin2 *tip = TipWin2Create(NULL, hDlgWnd);
work->tip = tip;
- wchar_t *text = TTGetLangStrW("Tera Term", "DLG_SENDFILE_TERATERM4_TOOLTIP", NULL, data->UILanguageFile);
+ wchar_t *text;
+ GetI18nStrWW("Tera Term", "DLG_SENDFILE_TERATERM4_TOOLTIP", NULL, data->UILanguageFileW, &text);
if (text != NULL) {
TipWin2SetTextW(tip, IDC_SENDFILE_CHECK_4, text);
free(text);
@@ -184,7 +185,7 @@
"MSG_TT_ERROR", L"Tera Term: Error",
"MSG_CANTOPEN_FILE_ERROR", L"Cannot open file",
MB_TASKMODAL | MB_ICONEXCLAMATION };
- TTMessageBoxA(hDlgWnd, &mbinfo, data->UILanguageFile);
+ TTMessageBoxW(hDlgWnd, &mbinfo, data->UILanguageFileW);
free(strW);
@@ -221,7 +222,8 @@
wchar_t TempDir[MAX_PATH];
GetCurrentDirectoryW(_countof(TempDir), TempDir);
- wchar_t *uimsg = TTGetLangStrW("Tera Term", "FILEDLG_TRANS_TITLE_SENDFILE", L"Send file", data->UILanguageFile);
+ wchar_t *uimsg;
+ GetI18nStrWW("Tera Term", "FILEDLG_TRANS_TITLE_SENDFILE", L"Send file", data->UILanguageFileW, &uimsg);
wchar_t *title;
aswprintf(&title, L"Tera Term: %s", uimsg);
free(uimsg);
Modified: trunk/teraterm/teraterm/sendfiledlg.h
===================================================================
--- trunk/teraterm/teraterm/sendfiledlg.h 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/sendfiledlg.h 2021-08-14 03:26:30 UTC (rev 9359)
@@ -35,7 +35,8 @@
typedef struct {
// in
- const char* UILanguageFile;
+ const wchar_t* UILanguageFileW;
+ const char* UILanguageFile; // TODO \x82Ȃ\xAD\x82\xB7
const char *filesend_filter;
// out
wchar_t* filename; // IDOK\x8E\x9E\x81A\x91I\x91\xF0\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x95Ԃ\xE9,\x8Eg\x97p\x8C\xE3free()\x82\xB7\x82邱\x82\xC6
Modified: trunk/teraterm/teraterm/setupdirdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/setupdirdlg.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/setupdirdlg.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -343,7 +343,7 @@
SetWindowLongPtr(hDlgWnd, DWLP_USER, (LONG_PTR)pts);
// I18N
- SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), pts->UILanguageFile);
+ SetDlgTextsW(hDlgWnd, TextInfos, _countof(TextInfos), pts->UILanguageFileW);
// \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B(teraterm.ini)\x82̃p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
/// (1)
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/teraterm/vtwin.cpp 2021-08-14 03:26:30 UTC (rev 9359)
@@ -4001,6 +4001,7 @@
SetDialogFont(ts.DialogFontName, ts.DialogFontPoint, ts.DialogFontCharSet,
ts.UILanguageFile, "Tera Term", "DLG_TAHOMA_FONT");
sendfiledlgdata data;
+ data.UILanguageFileW = ts.UILanguageFileW;
data.UILanguageFile = ts.UILanguageFile;
data.filesend_filter = ts.FileSendFilter;
INT_PTR ok = sendfiledlg(m_hInst, m_hWnd, &data);
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2021-08-14 03:26:18 UTC (rev 9358)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2021-08-14 03:26:30 UTC (rev 9359)
@@ -570,7 +570,10 @@
{ IDC_FONTBOLD, "DLG_WIN_BOLDFONT" },
{ IDC_WINHIDETITLE, "DLG_WIN_HIDETITLE" },
{ IDC_WINHIDEMENU, "DLG_WIN_HIDEMENU" },
- { IDC_WINCOLOREMU, "DLG_WIN_COLOREMU" },
+ { IDC_WINCOLOREMU, "DLG_WIN_COLOREMU" }, // "Color emulation"
+#if 0
+ { IDC_WINCOLOREMU, "DLG_WIN_PCBOLD16" }, // "16 Colors (PC style)"
+#endif
{ IDC_WINAIXTERM16, "DLG_WIN_AIXTERM16" },
{ IDC_WINXTERM256, "DLG_WIN_XTERM256" },
{ IDC_WINSCROLL1, "DLG_WIN_SCROLL1" },
@@ -587,7 +590,6 @@
{ IDOK, "BTN_OK" },
{ IDCANCEL, "BTN_CANCEL" },
{ IDC_WINHELP, "BTN_HELP" },
- { IDC_WINCOLOREMU, "DLG_WIN_PCBOLD16" }, // get_lang_msg
};
PTTSet ts;
HWND Wnd, HRed, HGreen, HBlue;
@@ -594,7 +596,6 @@
int IAttr, IOffset;
WORD i, pos, ScrollCode, NewPos;
HDC DC;
- wchar_t uimsg[MAX_UIMSG];
switch (Message) {
case WM_INITDIALOG:
@@ -612,8 +613,11 @@
DisableDlgItem(Dialog,IDC_WINHIDEMENU,IDC_WINHIDEMENU);
if (ts->VTFlag>0) {
- get_lang_msgW("DLG_WIN_PCBOLD16", uimsg, _countof(uimsg), L"&16 Colors (PC style)", UILanguageFile);
- SetDlgItemTextW(Dialog, IDC_WINCOLOREMU,uimsg);
+ wchar_t *uimsg;
+ GetI18nStrWA("Tera Term", "DLG_WIN_PCBOLD16", L"&16 Colors (PC style)", UILanguageFile, &uimsg);
+ SetDlgItemTextW(Dialog, IDC_WINCOLOREMU, uimsg);
+ free(uimsg);
+
SetRB(Dialog, (ts->ColorFlag&CF_PCBOLD16)!=0, IDC_WINCOLOREMU, IDC_WINCOLOREMU);
SetRB(Dialog, (ts->ColorFlag&CF_AIXTERM16)!=0, IDC_WINAIXTERM16, IDC_WINAIXTERM16);
SetRB(Dialog, (ts->ColorFlag&CF_XTERM256)!=0,IDC_WINXTERM256,IDC_WINXTERM256);
@@ -689,18 +693,18 @@
}
}
ShowDlgItem(Dialog,IDC_WINATTRTEXT,IDC_WINATTR);
- get_lang_msgW("DLG_WIN_NORMAL", uimsg, _countof(uimsg), L"Normal", UILanguageFile);
- SendDlgItemMessageW(Dialog, IDC_WINATTR, CB_ADDSTRING, 0, (LPARAM)uimsg);
- get_lang_msgW("DLG_WIN_BOLD", uimsg, _countof(uimsg), L"Bold", UILanguageFile);
- SendDlgItemMessageW(Dialog, IDC_WINATTR, CB_ADDSTRING, 0, (LPARAM)uimsg);
- get_lang_msgW("DLG_WIN_BLINK", uimsg, _countof(uimsg), L"Blink", UILanguageFile);
- SendDlgItemMessageW(Dialog, IDC_WINATTR, CB_ADDSTRING, 0, (LPARAM)uimsg);
- get_lang_msgW("DLG_WIN_REVERSEATTR", uimsg, _countof(uimsg), L"Reverse", UILanguageFile);
- SendDlgItemMessageW(Dialog, IDC_WINATTR, CB_ADDSTRING, 0, (LPARAM)uimsg);
- /* begin - ishizaki */
- SendDlgItemMessageA(Dialog, IDC_WINATTR, CB_ADDSTRING, 0, (LPARAM)"URL");
- /* end - ishizaki */
- SendDlgItemMessage(Dialog, IDC_WINATTR, CB_SETCURSEL, 0,0);
+ {
+ const static I18nTextInfo infos[] = {
+ { "DLG_WIN_NORMAL", L"Normal" },
+ { "DLG_WIN_BOLD", L"Bold" },
+ { "DLG_WIN_BLINK", L"Blink" },
+ { "DLG_WIN_REVERSEATTR", L"Reverse" },
+ { NULL, L"URL" },
+ };
+ wchar_t *UILanguageFileW = ToWcharA(UILanguageFile);
+ SetI18nListW("Tera Term", Dialog, IDC_WINATTR, infos, _countof(infos), UILanguageFileW, 1);
+ free(UILanguageFileW);
+ }
#ifdef USE_NORMAL_BGCOLOR
ShowDlgItem(Dialog,IDC_WINUSENORMALBG,IDC_WINUSENORMALBG);
SetRB(Dialog,ts->UseNormalBGColor,IDC_WINUSENORMALBG,IDC_WINUSENORMALBG);