設定項目 LanguageSelection が不要になったので削除

- ダイアログ上に残っていた Language 設定コントロールを削除
hkanou · Jun 14, 2024 · 1729780 · 1729780
1 parent 697d85f
commit 1729780
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 130 deletions.
diff --git a/doc/en/html/setup/teraterm-ini.html b/doc/en/html/setup/teraterm-ini.html
@@ -769,12 +769,6 @@ <h2>Tera Term</h2>
 		<td style="width:250px;">English</td>
 		<td>* by the installer</td>
 	</tr>
-	<tr>
-		<td id="LanguageSelection"><a href="teraterm-win.html#lang">LanguageSelection</a></td>
-		<td style="width:250px;">on</td>
-		<td style="width:250px;">&lt;-</td>
-		<td></td>
-	</tr>
 	<tr>
 		<td id="ListHiddenFonts"><a href="../menu/setup-additional-general.html#ListHiddenFonts">ListHiddenFonts</a></td>
 		<td style="width:250px;">off</td>

diff --git a/doc/en/html/setup/teraterm-win.html b/doc/en/html/setup/teraterm-win.html
@@ -113,22 +113,6 @@ <h1 id="menubar">Hiding the "Show menu bar" command</h1>
 </pre>
 
 
-<h1 id="lang">Disabling the language mode selection</h1>
-
-<p>
-To disable the language mode selection in the [Setup] General dialog box, edit the LanguageSelection line in the [Tera Term] section of the setup file like the following:
-</p>
-
-<pre>
-LanguageSelection=off
-</pre>
-
-<pre>
-Default:
-LanguageSelection=on
-</pre>
-
-
 <h1 id="scrollbuf">Maximum scroll buffer size</h1>
 
 <p>

diff --git a/doc/ja/html/setup/teraterm-ini.html b/doc/ja/html/setup/teraterm-ini.html
@@ -769,12 +769,6 @@ <h2>Tera Term</h2>
 		<td style="width:250px;">English</td>
 		<td>※インストーラによる</td>
 	</tr>
-	<tr>
-		<td id="LanguageSelection"><a href="teraterm-win.html#lang">LanguageSelection</a></td>
-		<td style="width:250px;">on</td>
-		<td style="width:250px;">&lt;-</td>
-		<td></td>
-	</tr>
 	<tr>
 		<td id="ListHiddenFonts"><a href="../menu/setup-additional-general.html#ListHiddenFonts">ListHiddenFonts</a></td>
 		<td style="width:250px;">off</td>

diff --git a/doc/ja/html/setup/teraterm-win.html b/doc/ja/html/setup/teraterm-win.html
@@ -117,26 +117,6 @@
 </pre>
 
 
-<h1 id="lang">言語モードの選択を不可にする</h1>
-
-<p>
-[Setup] General ダイアログボックスで言語モード (Language) の選択ができないようにするには、設定ファイルの [Tera Term] セクションの LanguageSelection 行を、
-</p>
-
-<pre>
-LanguageSelection=off
-</pre>
-
-<p>
-のように変更してください。
-</p>
-
-<pre>
-省略時:
-LanguageSelection=on
-</pre>
-
-
 <h1 id="scrollbuf">スクロールバッファーの最大行数</h1>
 
 <p>

diff --git a/installer/release/TERATERM.INI b/installer/release/TERATERM.INI
@@ -536,9 +536,6 @@ KmtLongPacket=off
 ; Kermit CAPAS: Ability to accept "A" packets (file attributes)
 KmtFileAttr=off
 
-; Language selection
-LanguageSelection=on
-
 ; List hidden fonts (Windows 7 or later)
 ListHiddenFonts=off
 

diff --git a/installer/release/lang_utf8/English.lng b/installer/release/lang_utf8/English.lng
@@ -1,6 +1,6 @@
 [Info]
 language=English
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=-
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=Select new directory
 
 DLG_GEN_TITLE=Tera Term: General setup
 DLG_GEN_PORT=Default &port:
-DLG_GEN_LANG=&Language:
 DLG_GEN_LANG_UI=Language&UI:
 
 DLG_HOST_TITLE=Tera Term: New connection

diff --git a/installer/release/lang_utf8/French.lng b/installer/release/lang_utf8/French.lng
@@ -1,6 +1,6 @@
 [Info]
 language=French
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=Selectionner un nouveau répertoire
 
 DLG_GEN_TITLE=Tera Term: Configuration générale
 DLG_GEN_PORT=Port par défaut:
-DLG_GEN_LANG=&Langage:
 DLG_GEN_LANG_UI=Language&UI:
 
 DLG_HOST_TITLE=Tera Term: Nouvelle connexion

diff --git a/installer/release/lang_utf8/German.lng b/installer/release/lang_utf8/German.lng
@@ -1,6 +1,6 @@
 [Info]
 language=German
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=Neues Verzeichnis wählen
 
 DLG_GEN_TITLE=Tera-Grundeinstellungen
 DLG_GEN_PORT=Standard-Port
-DLG_GEN_LANG=Sprache
 DLG_GEN_LANG_UI=Language&UI:
 
 DLG_HOST_TITLE=Tera Term: Neue Verbindung

diff --git a/installer/release/lang_utf8/Japanese.lng b/installer/release/lang_utf8/Japanese.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Japanese(日本語)
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=-
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=新しいディレクトリを選択してください
 
 DLG_GEN_TITLE=Tera Term: 全般設定
 DLG_GEN_PORT=標準のポート(&P):
-DLG_GEN_LANG=言語(&L):
 DLG_GEN_LANG_UI=言語UI(&U):
 
 DLG_HOST_TITLE=Tera Term: 新しい接続

diff --git a/installer/release/lang_utf8/Korean.lng b/installer/release/lang_utf8/Korean.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Korean
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=새로운 경로를 선택하세요
 
 DLG_GEN_TITLE=Tera Term: 일반설정
 DLG_GEN_PORT=기본 포트(&P):
-DLG_GEN_LANG=언어(&L):
 DLG_GEN_LANG_UI=UI 언어(&U):
 
 DLG_HOST_TITLE=Tera Term: 새 연결

diff --git a/installer/release/lang_utf8/Russian.lng b/installer/release/lang_utf8/Russian.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Russian
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=Ryumik Sergey (2017-07-19)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=Выбрать новую папку
 
 DLG_GEN_TITLE=Tera Term: Общие настройки
 DLG_GEN_PORT=&Порт:
-DLG_GEN_LANG=&Кодировка:
 DLG_GEN_LANG_UI=&Язык меню:
 
 DLG_HOST_TITLE=Tera Term: Новое соединение

diff --git a/installer/release/lang_utf8/Simplified Chinese.lng b/installer/release/lang_utf8/Simplified Chinese.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Simplified Chinese
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=选择新文件夹
 
 DLG_GEN_TITLE=Tera Term：常规设置
 DLG_GEN_PORT=端口(&P)：
-DLG_GEN_LANG=语言(&L)：
 DLG_GEN_LANG_UI=界面语言(&U)：
 
 DLG_HOST_TITLE=Tera Term：新建连接

diff --git a/installer/release/lang_utf8/Spanish.lng b/installer/release/lang_utf8/Spanish.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Spanish
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=Filiberto Olguin Ascona (2022-05-26)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=Select new directory
 
 DLG_GEN_TITLE=Tera Term: General setup
 DLG_GEN_PORT=Default &port:
-DLG_GEN_LANG=&Language:
 DLG_GEN_LANG_UI=Language&UI:
 
 DLG_HOST_TITLE=Tera Term: New connection

diff --git a/installer/release/lang_utf8/Tamil.lng b/installer/release/lang_utf8/Tamil.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Tamil(தமிழ்)
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=திட்டத்தால் புதுப்பிக்கப்பட்டது (2024-02-24)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=புதிய கோப்பகத்தைத் தே
 
 DLG_GEN_TITLE=தேரா முனை: பொது அமைப்பு
 DLG_GEN_PORT=இயல்புநிலை &துறைமுகம்:
-DLG_GEN_LANG=&மொழி:
 DLG_GEN_LANG_UI=மொழி இடைமுகம்:
 
 DLG_HOST_TITLE=தேரா முனை: புதிய இணைப்பு

diff --git a/installer/release/lang_utf8/Traditional Chinese.lng b/installer/release/lang_utf8/Traditional Chinese.lng
@@ -1,6 +1,6 @@
 [Info]
 language=Traditional Chinese
-date=2024-05-16 by TeraTerm Project
+date=2024-06-15 by TeraTerm Project
 contributor=kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -377,7 +377,6 @@ DLG_SELECT_DIR_TITLE=選擇新文件夾
 
 DLG_GEN_TITLE=Tera Term：設定設定
 DLG_GEN_PORT=端口(&P)：
-DLG_GEN_LANG=語言(&L)：
 DLG_GEN_LANG_UI=界面語言(&U)：
 
 DLG_HOST_TITLE=Tera Term：建立新連線

diff --git a/teraterm/common/tttypes.h b/teraterm/common/tttypes.h
@@ -158,7 +158,7 @@ enum LogTimestampType {
 // menu flags (used in ts.MenuFlag)
 #define MF_NOSHOWMENU   1
 #define MF_NOPOPUP      2
-#define MF_NOLANGUAGE   4
+//#define MF_NOLANGUAGE   4
 #define MF_SHOWWINMENU  8
 
 // Terminal flags (used in ts.TermFlag)

diff --git a/teraterm/ttpdlg/dlg_res.h b/teraterm/ttpdlg/dlg_res.h
@@ -114,8 +114,6 @@
 #define IDD_ABOUTDLG                    800
 #define IDC_FONTBOLD                    901
 #define IDD_GENDLG                      1000
-#define IDC_GENLANGLABEL                1002
-#define IDC_GENLANG                     1003
 #define IDC_HOSTTCPPROTOCOLLABEL        1019
 #define IDC_HOSTTCPPROTOCOL             1020
 #define IDC_LOCALE_BOX                  1022

diff --git a/teraterm/ttpdlg/generaldlg.c b/teraterm/ttpdlg/generaldlg.c
@@ -171,15 +171,13 @@ static INT_PTR CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM
 {
 	static const DlgTextInfo TextInfos[] = {
 		{ 0, "DLG_GEN_TITLE" },
-		{ IDC_GENLANGLABEL, "DLG_GEN_LANG" },
 		{ IDC_GENLANGUI_LABEL, "DLG_GEN_LANG_UI" },
 		{ IDOK, "BTN_OK" },
 		{ IDCANCEL, "BTN_CANCEL" },
 		{ IDC_GENHELP, "BTN_HELP" },
 	};
 	DlgData *data;
 	PTTSet ts;
-	WORD w;
 
 	switch (Message) {
 		case WM_INITDIALOG:
@@ -189,26 +187,6 @@ static INT_PTR CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM
 			ts = data->ts;
 			SetDlgTextsW(Dialog, TextInfos, _countof(TextInfos), ts->UILanguageFileW);
 
-#if 0
-			if ((ts->MenuFlag & MF_NOLANGUAGE)==0) {
-				int sel = 0;
-				int i;
-				ShowDlgItem(Dialog,IDC_GENLANGLABEL,IDC_GENLANG);
-				for (i = 0;; i++) {
-					const TLanguageList *lang = GetLanguageList(i);
-					if (lang == NULL) {
-						break;
-					}
-					if (ts->Language == lang->language) {
-						sel = i;
-					}
-					SendDlgItemMessageA(Dialog, IDC_GENLANG, CB_ADDSTRING, 0, (LPARAM)lang->str);
-					SendDlgItemMessageA(Dialog, IDC_GENLANG, CB_SETITEMDATA, i, (LPARAM)lang->language);
-				}
-				SendDlgItemMessage(Dialog, IDC_GENLANG, CB_SETCURSEL, sel, 0);
-			}
-#endif
-
 			data->selected_lang = 0;
 			{
 				LangInfo *infos = data->lng_infos;
@@ -233,31 +211,14 @@ static INT_PTR CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM
 
 		case WM_COMMAND:
 			switch (wParam) {
-				case IDOK | (BN_CLICKED << 16):
-					data = (DlgData *)GetWindowLongPtr(Dialog,DWLP_USER);
+				case IDOK | (BN_CLICKED << 16): {
+					LRESULT w;
+					data = (DlgData *)GetWindowLongPtrW(Dialog,DWLP_USER);
 					ts = data->ts;
 					assert(ts != NULL);
-#if 0
-					if ((ts->MenuFlag & MF_NOLANGUAGE)==0) {
-						WORD language;
-						w = (WORD)GetCurSel(Dialog, IDC_GENLANG);
-						language = (int)SendDlgItemMessageA(Dialog, IDC_GENLANG, CB_GETITEMDATA, w - 1, 0);
-
-						// Language が変更されたとき、
-						// KanjiCode/KanjiCodeSend を変更先の Language に存在する値に置き換える
-						if (1 <= language && language < IdLangMax && language != ts->Language) {
-							WORD KanjiCode = ts->KanjiCode;
-							WORD KanjiCodeSend = ts->KanjiCodeSend;
-							ts->KanjiCode = KanjiCodeTranslate(language,KanjiCode);
-							ts->KanjiCodeSend = KanjiCodeTranslate(language,KanjiCodeSend);
-
-							ts->Language = language;
-						}
-					}
-#endif
 
 					// 言語ファイルが変更されていた場合
-					w = SendDlgItemMessage(Dialog, IDC_GENLANG_UI, CB_GETCURSEL, 0, 0);
+					w = SendDlgItemMessageA(Dialog, IDC_GENLANG_UI, CB_GETCURSEL, 0, 0);
 					if (w != data->selected_lang) {
 						const LangInfo *p = data->lng_infos + w;
 						ts->UILanguageFileW = _wcsdup(p->fullname);
@@ -273,7 +234,7 @@ static INT_PTR CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM
 
 					TTEndDialog(Dialog, 1);
 					return TRUE;
-
+				}
 				case IDCANCEL | (BN_CLICKED << 16):
 					TTEndDialog(Dialog, 0);
 					return TRUE;

diff --git a/teraterm/ttpdlg/ttpdlg.rc b/teraterm/ttpdlg/ttpdlg.rc
@@ -213,8 +213,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTIO
 CAPTION "Tera Term: General setup"
 FONT 14, "System", 0, 0, 0x0
 BEGIN
-    LTEXT           "&Language:",IDC_GENLANGLABEL,102,5,39,11,NOT WS_VISIBLE
-    COMBOBOX        IDC_GENLANG,138,4,70,81,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Language&UI:",IDC_GENLANGUI_LABEL,8,8,44,8
     COMBOBOX        IDC_GENLANG_UI,17,20,127,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_GENLANUI_INFO,18,36,181,73,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY
@@ -338,6 +336,10 @@ BEGIN
         BOTTOMMARGIN, 128
     END
 
+    IDD_KEYBDLG, DIALOG
+    BEGIN
+    END
+
     IDD_WINDLG, DIALOG
     BEGIN
         BOTTOMMARGIN, 233

diff --git a/teraterm/ttpset/ttset.c b/teraterm/ttpset/ttset.c
@@ -1305,10 +1305,6 @@ void PASCAL _ReadIniFile(const wchar_t *FName, PTTSet ts)
 	if (GetOnOff(Section, "KmtFileAttr", FName, FALSE))
 		ts->KermitOpt |= KmtOptFileAttr;
 
-	// Enable language selection -- special option
-	if (!GetOnOff(Section, "LanguageSelection", FName, TRUE))
-		ts->MenuFlag |= MF_NOLANGUAGE;
-
 	/* Maximum scroll buffer size  -- special option */
 	ts->ScrollBuffMax =
 		GetPrivateProfileInt(Section, "MaxBuffSize", 10000, FName);
@@ -2762,12 +2758,6 @@ void PASCAL _WriteIniFile(const wchar_t *FName, PTTSet ts)
 	WriteOnOff(Section, "KmtLongPacket", FName, (WORD) (ts->KermitOpt & KmtOptLongPacket));
 	WriteOnOff(Section, "KmtFileAttr", FName, (WORD) (ts->KermitOpt & KmtOptFileAttr));
 
-	// Enable language selection -- special option
-	if ((ts->MenuFlag & MF_NOLANGUAGE) == 0)
-		WriteOnOff(Section, "LanguageSelection", FName, 1);
-	else
-		WriteOnOff(Section, "LanguageSelection", FName, 0);
-
 	/* Maximum scroll buffer size  -- special option */
 	WriteInt(Section, "MaxBuffSize", FName, ts->ScrollBuffMax);