Tera Term

[ttssh2-commit] [9542] 言語=Russian時 Terminal stup を UTF-8 と統合

• 前の記事 (スレッド) [ttssh2-commit] [9541] warning: 'static' is not at beginning of declaration
• 次の記事 (スレッド) [ttssh2-commit] [9543] 設定フォルダダイアログで設定ファイルのパスをexplorerで開くとき、失敗することがあった
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9542
          https://osdn.net/projects/ttssh2/scm/svn/commits/9542
Author:   zmatsuo
Date:     2021-11-23 01:05:12 +0900 (Tue, 23 Nov 2021)
Log Message:
-----------
言語=Russian時 Terminal stup を UTF-8 と統合

- ダイアログ IDD_TERMDLGR を削除
  - IDD_TERMDLGK に統合
- フォントの設定は Setup/Additional settings/font/表示用文字変換コードページ

Modified Paths:
--------------
    trunk/doc/ja/html/menu/setup-terminal_ru.html
    trunk/teraterm/ttpdlg/dlg_res.h
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpdlg/ttpdlg.rc

-------------- next part --------------
Modified: trunk/doc/ja/html/menu/setup-terminal_ru.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_ru.html	2021-11-22 16:04:47 UTC (rev 9541)
+++ trunk/doc/ja/html/menu/setup-terminal_ru.html	2021-11-22 16:05:12 UTC (rev 9542)
@@ -110,6 +110,17 @@
 	TEK window \x82֐\xA7\x8C\xE4\x82\xF0\x88ڂ\xB5\x82܂\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
       </dd>
 
+	  <dt id="RussHost">Host</dt>
+	  <dd>
+	    \x83z\x83X\x83g\x82\xA9\x82瑗\x82\xE7\x82\xEA\x82Ă\xAD\x82郍\x83V\x83A\x8Cꕶ\x8E\x9A\x83Z\x83b\x83g\x81B
+	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
+	  </dd>
+	  <dt id="RussClient">Client</dt>
+	  <dd>
+	    \x91\x97\x8Fo\x82\xB7\x82郍\x83V\x83A\x8Cꕶ\x8E\x9A\x83Z\x83b\x83g\x81B
+	    Windows (CP 1251), KOI8-R, CP 866, ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
+	  </dd>
+
     </dl>
   </body>
 </html>

Modified: trunk/teraterm/ttpdlg/dlg_res.h
===================================================================
--- trunk/teraterm/ttpdlg/dlg_res.h	2021-11-22 16:04:47 UTC (rev 9541)
+++ trunk/teraterm/ttpdlg/dlg_res.h	2021-11-22 16:05:12 UTC (rev 9542)
@@ -157,16 +157,11 @@
 #define IDC_TERMIDLABEL                 1061
 #define IDC_TERMKANJILABEL              1062
 #define IDC_TERMKANJISENDLABEL          1063
-#define IDC_TERMRUSSCHARSET             1065
-#define IDC_TERMRUSSHOSTLABEL           1066
-#define IDC_TERMRUSSCLIENTLABEL         1067
 #define IDC_WINLISTLABEL                1068
 #define IDC_TCPIPTELNETKEEPALIVELABEL   1069
 #define IDC_SELECT_DIR                  1070
 #define IDC_BUILDTIME                   1071
 #define IDC_BUILDTOOL                   1072
-#define IDC_TERMRUSSFONTLABEL           1075
-#define IDC_TERMRUSSFONT                1076
 #define IDC_GENLANG_UI                  1077
 #define IDC_SFMT_VERSION                1078
 #define IDC_SERIALTEXT                  1079
@@ -176,7 +171,6 @@
 #define IDC_WINLISTLIST                 1201
 #define IDC_WINLISTCLOSE                1202
 #define IDC_WINLISTHELP                 1299
-#define IDD_TERMDLGR                    1300
 #define IDD_TERMDLGK                    1301
 #define IDC_STATIC                      -1
 #define IDC_GENLANUI_LABEL              -1

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2021-11-22 16:04:47 UTC (rev 9541)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2021-11-22 16:05:12 UTC (rev 9542)
@@ -219,11 +219,13 @@
 				SetDlgTexts(Dialog, TextInfosJp, _countof(TextInfosJp), UILanguageFile);
 			}
 			else if ( ts->Language==IdRussian ) {
+				// TODO
+				// 		\x8E\x9F\x82̃L\x81[\x82\xF0\x8Eg\x82\xED\x82Ȃ\xAD\x82Ȃ\xC1\x82\xBD,\x90\xAE\x97\x9D\x82\xB7\x82\xE9
+				//			"DLG_TERM_RUSSCHARSET"
+				//			"DLG_TERM_RUSSFONT"
 				static const DlgTextInfo TextInfosRu[] = {
-					{ IDC_TERMRUSSCHARSET, "DLG_TERM_RUSSCHARSET" },
-					{ IDC_TERMRUSSHOSTLABEL, "DLG_TERM_RUSSHOST" },
-					{ IDC_TERMRUSSCLIENTLABEL, "DLG_TERM_RUSSCLIENT" },
-					{ IDC_TERMRUSSFONTLABEL, "DLG_TERM_RUSSFONT" },
+					{ IDC_TERMKANJILABEL, "DLG_TERM_RUSSCLIENT" },
+					{ IDC_TERMKANJISENDLABEL, "DLG_TERM_RUSSHOST" },
 				};
 				SetDlgTexts(Dialog, TextInfosRu, _countof(TextInfosRu), UILanguageFile);
 			}
@@ -3158,11 +3160,9 @@
 	case IdKorean: // Korean mode //HKS
 	case IdUtf8:   // UTF-8 mode
 	case IdChinese:
+	case IdRussian: // Russian mode
 		i = IDD_TERMDLGK;
 		break;
-	case IdRussian: // Russian mode
-		i = IDD_TERMDLGR;
-		break;
 	default:  // English mode
 		i = IDD_TERMDLG;
 	}

Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2021-11-22 16:04:47 UTC (rev 9541)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2021-11-22 16:05:12 UTC (rev 9542)
@@ -356,41 +356,7 @@
     PUSHBUTTON      "&Help",IDC_WINLISTHELP,143,68,50,14
 END
 
-IDD_TERMDLGR DIALOGEX 20, 20, 245, 143
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Tera Term: Terminal setup"
-FONT 14, "System", 0, 0, 0x0
-BEGIN
-    GROUPBOX        "&Terminal size",IDC_TERMWIDTHLABEL,8,7,97,54
-    EDITTEXT        IDC_TERMWIDTH,21,19,22,12,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
-    CTEXT           "X",IDC_TERMX,47,21,14,8,NOT WS_GROUP
-    EDITTEXT        IDC_TERMHEIGHT,65,19,22,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Term &size = win size",IDC_TERMISWIN,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,13,33,84,12
-    CONTROL         "Auto &window resize",IDC_TERMRESIZE,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,13,45,82,12
-    GROUPBOX        "New-line",IDC_TERMNEWLINE,112,7,79,44
-    CONTROL         "&Receive:",IDC_TERMCRRCVLABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,116,20,32,11
-    COMBOBOX        IDC_TERMCRRCV,150,19,36,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Trans&mit:",IDC_TERMCRSENDLABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,116,34,32,11
-    COMBOBOX        IDC_TERMCRSEND,150,34,36,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Terminal &ID:",IDC_TERMIDLABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,66,45,11
-    COMBOBOX        IDC_TERMID,55,64,40,85,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "&Local echo",IDC_TERMLOCALECHO,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,123,64,70,12
-    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        "Character set",IDC_TERMRUSSCHARSET,8,94,221,43
-    RTEXT           "H&ost:",IDC_TERMRUSSHOSTLABEL,14,106,36,11
-    COMBOBOX        IDC_TERMKANJI,52,105,55,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "&Client:",IDC_TERMRUSSCLIENTLABEL,113,106,52,11
-    COMBOBOX        IDC_TERMKANJISEND,167,105,55,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "&Font:",IDC_TERMRUSSFONTLABEL,14,122,36,11
-    COMBOBOX        IDC_TERMRUSSFONT,52,121,55,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
-END
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -399,6 +365,10 @@
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO
 BEGIN
+    IDD_TERMDLGK, DIALOG
+    BEGIN
+    END
+
     IDD_TERMDLGJ, DIALOG
     BEGIN
     END
@@ -442,10 +412,6 @@
         TOPMARGIN, 7
         BOTTOMMARGIN, 93
     END
-
-    IDD_TERMDLGR, DIALOG
-    BEGIN
-    END
 END
 #endif    // APSTUDIO_INVOKED
 

• 前の記事 (スレッド) [ttssh2-commit] [9541] warning: 'static' is not at beginning of declaration
• 次の記事 (スレッド) [ttssh2-commit] [9543] 設定フォルダダイアログで設定ファイルのパスをexplorerで開くとき、失敗することがあった
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]