From ed2a89292c27400a795705fbf73fa92b852acdea Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 26 Apr 2018 09:29:27 +0900 Subject: [PATCH] fix --- src/MStringListDlg.hpp | 5 +++++ src/lang/en-US.rc | 5 ++++- src/lang/ja-JP.rc | 5 ++++- src/lang/zh-CN.rc | 5 ++++- src/resource.h | 3 +++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/MStringListDlg.hpp b/src/MStringListDlg.hpp index 8b2406cc..8a2b5305 100644 --- a/src/MStringListDlg.hpp +++ b/src/MStringListDlg.hpp @@ -54,6 +54,11 @@ class MStringListDlg : public MDialogBase MStringA text = mstr_join(vec, "\r\n"); SetDlgItemTextA(hwnd, edt1, text.c_str()); + MString str = LoadStringDx(IDS_DLGINIT1); + str += LoadStringDx(IDS_DLGINIT2); + str += LoadStringDx(IDS_DLGINIT3); + SetDlgItemText(hwnd, stc1, str.c_str()); + return TRUE; } diff --git a/src/lang/en-US.rc b/src/lang/en-US.rc index 5cd6dec8..906384e9 100644 --- a/src/lang/en-US.rc +++ b/src/lang/en-US.rc @@ -420,6 +420,9 @@ STRINGTABLE IDS_MESSAGE, "Message" IDS_STRING, "String" IDS_DATAISINVALID, "Data is invalid." + IDS_DLGINIT1, "You can specify initialization of combo boxes and list boxes by setting initialization data in the RT_DLGINIT resource data of the same name as the dialog resource. " + IDS_DLGINIT2, "When the WM_INITDIALOG message arrives, the application can initialize the dialog by calling the ExecuteDlgInitDx function of the attached file ""DlgInit/DlgInit.h"".\r\n\r\n" + IDS_DLGINIT3, "Please specify a list of character strings separated by line breaks for RT_DLGINIT." } IDD_REPLACERES DIALOGEX 0, 0, 215, 170 @@ -1280,7 +1283,7 @@ CAPTION "Control String List" STYLE WS_POPUPWINDOW | WS_DLGFRAME | WS_THICKFRAME FONT 9, "MS Shell Dlg" { - LTEXT "You can specify initialization of combo boxes and list boxes by setting initialization data in the RT_DLGINIT resource data of the same name as the dialog resource. When the WM_INITDIALOG message arrives, the application can initialize the dialog by calling the ExecuteDlgInitDx function of the attached file "DlgInit/DlgInit.h".\r\n\r\nPlease specify a list of character strings separated by line breaks for RT_DLGINIT.", -1, 5, 5, 195, 70 + LTEXT "", stc1, 5, 5, 195, 70 EDITTEXT edt1, 5, 80, 195, 115, ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL DEFPUSHBUTTON "OK", IDOK, 75, 200, 60, 14 PUSHBUTTON "Cancel", IDCANCEL, 140, 200, 60, 14 diff --git a/src/lang/ja-JP.rc b/src/lang/ja-JP.rc index 4e42d317..ee73cf95 100644 --- a/src/lang/ja-JP.rc +++ b/src/lang/ja-JP.rc @@ -422,6 +422,9 @@ STRINGTABLE IDS_MESSAGE, "メッセージ" IDS_STRING, "文字列" IDS_DATAISINVALID, "データが無効です。" + IDS_DLGINIT1, "ダイアログと同名のRT_DLGINITリソースデータに初期化データを設定して、コンボボックスとリストボックスの初期化を指定できます。" + IDS_DLGINIT2, "WM_INITDIALOGメッセージが来た時に、付属のファイル「DlgInit/DlgInit.h」のExecuteDlgInitDx関数を呼び出せば、ダイアログの初期化を実行できます。\r\n\r\n" + IDS_DLGINIT3, "RT_DLGINITに使う改行区切りの文字列のリストを指定して下さい。" } IDD_REPLACERES DIALOGEX 0, 0, 215, 170 @@ -1282,7 +1285,7 @@ CAPTION "コントロールの文字列リスト" STYLE WS_POPUPWINDOW | WS_DLGFRAME | WS_THICKFRAME FONT 9, "MS UI Gothic" { - LTEXT "ダイアログと同名のRT_DLGINITリソースデータに初期化データを設定して、コンボボックスとリストボックスの初期化を指定できます。WM_INITDIALOGメッセージが来た時に、付属のファイル「DlgInit/DlgInit.h」のExecuteDlgInitDx関数を呼び出せば、ダイアログの初期化を実行できます。\r\n\r\nRT_DLGINITに使う改行区切りの文字列のリストを指定して下さい。", -1, 5, 5, 195, 70 + LTEXT "", stc1, 5, 5, 195, 70 EDITTEXT edt1, 5, 80, 195, 115, ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL DEFPUSHBUTTON "OK", IDOK, 75, 200, 60, 14 PUSHBUTTON "キャンセル", IDCANCEL, 140, 200, 60, 14 diff --git a/src/lang/zh-CN.rc b/src/lang/zh-CN.rc index 230811e5..1f52eb7d 100644 --- a/src/lang/zh-CN.rc +++ b/src/lang/zh-CN.rc @@ -420,6 +420,9 @@ STRINGTABLE IDS_MESSAGE, "信息" IDS_STRING, "串" IDS_DATAISINVALID, "数据无效." + IDS_DLGINIT1, "您可以通过在与对话框同名的RT_DLGINIT资源数据中设置初始化数据来指定组合框和列表框的初始化. " + IDS_DLGINIT2, "当WM_INITDIALOG消息到达时, 您可以通过调用附加文件“DlgInit/DlgInit.h”的ExecuteDlgInitDx函数来初始化对话框.\r\n\r\n" + IDS_DLGINIT3, "请指定用换行符分隔的RT_DLGINIT字符串列表." } IDD_REPLACERES DIALOGEX 0, 0, 215, 170 @@ -1280,7 +1283,7 @@ CAPTION "Control String List" STYLE WS_POPUPWINDOW | WS_DLGFRAME | WS_THICKFRAME FONT 9, "宋体" { - LTEXT "您可以通过在与对话框同名的RT_DLGINIT资源数据中设置初始化数据来指定组合框和列表框的初始化. 当WM_INITDIALOG消息到达时, 您可以通过调用附加文件“DlgInit/DlgInit.h”的ExecuteDlgInitDx函数来初始化对话框.\r\n\r\n请指定用换行符分隔的RT_DLGINIT字符串列表.", -1, 5, 5, 195, 70 + LTEXT "", stc1, 5, 5, 195, 70 EDITTEXT edt1, 5, 80, 195, 115, ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL DEFPUSHBUTTON "OK", IDOK, 75, 200, 60, 14 PUSHBUTTON "取消", IDCANCEL, 140, 200, 60, 14 diff --git a/src/resource.h b/src/resource.h index ecee4464..4b9e59bf 100644 --- a/src/resource.h +++ b/src/resource.h @@ -352,6 +352,9 @@ #define IDS_MESSAGE 244 #define IDS_STRING 245 #define IDS_DATAISINVALID 246 +#define IDS_DLGINIT1 247 +#define IDS_DLGINIT2 248 +#define IDS_DLGINIT3 249 #define IDC_DUMMYCONTROLID1 1000 #define IDC_DUMMYCONTROLID2 1001