[Ttssh2-commit] [3389] フォント設定ダイアログのテンプレートを廃止し、コモンダイアログをそのまま使うようにした。

svnno****@sourc***** svnno****@sourc*****
2009年 5月 11日 (月) 22:35:05 JST


Revision: 3389
          http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3389
Author:   maya
Date:     2009-05-11 22:35:05 +0900 (Mon, 11 May 2009)

Log Message:
-----------
フォント設定ダイアログのテンプレートを廃止し、コモンダイアログをそのまま使うようにした。
  フォントの文字セット(Script)を選択できるようにした。
  Enable bold style を [Setup]-[Window] に移動した。
  ロシア語モードの Font charset を、ロシア語モードの [Setup]-[Terminal] に移動した。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-font.html
    trunk/doc/en/html/menu/setup-terminalr.html
    trunk/doc/en/html/menu/setup-window.html
    trunk/doc/en/html/menutek/setup-font.html
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-font.html
    trunk/doc/ja/html/menu/setup-terminalr.html
    trunk/doc/ja/html/menu/setup-window.html
    trunk/doc/ja/html/menutek/setup-font.html
    trunk/doc/ja/teraterm.hhp
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/teraterm/ttpdlg/dlg_res.h
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpdlg/ttpdlg.rc

Removed Paths:
-------------
    trunk/doc/en/html/menu/setup-fontr.html
    trunk/doc/ja/html/menu/setup-fontr.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/html/about/history.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -58,6 +58,12 @@
       <li>Changed the BroadcastCommand functional specification. When the BroadcastCommand is not the realtime mode, a user cand send a message at the selected window in the listbox.</li>
       <!-- li><a href="../menu/setup-general.html">Œ¾Œêƒ‚[ƒh</a>‚ðŽw’è‚·‚é <a href="../commandline/teraterm.html#la">/LA</a> ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ƒIƒvƒVƒ‡ƒ“‚ŁAŠØ‘Œêƒ‚[ƒh‚ðŽw’è‚Å‚«‚é‚悤‚É‚µ‚½B</li -->
       <!--li>IME‚̃Cƒ“ƒ‰ƒCƒ“•ÏŠ·‚ðŠØ‘Œêƒ‚[ƒh‚Å‚às‚¦‚é‚悤‚É‚µ‚½B</li-->
+      <!--li>ƒtƒHƒ“ƒgÝ’èƒ_ƒCƒAƒƒO‚ŁAOS‚̃Rƒ‚ƒ“ƒ_ƒCƒAƒƒO‚ð‚»‚Ì‚Ü‚Ü•\Ž¦‚·‚é‚悤‚É‚µ‚½B
+        <ul>
+          <li>•¶ŽšƒZƒbƒg(‰pŒêWindows‚Å‚Í"Script"‚Æ•\Ž¦‚³‚ê‚é)‚ð‘I‘ð‚Å‚«‚é‚悤‚É‚µ‚½B</li>
+          <li>Enable bold style ‚ð <a href="../menu/setup-window.html">[Setup]-[Window]</a> ‚Ɉړ®‚µ‚½B</li>
+          <li>ƒƒVƒAŒêƒ‚[ƒh‚Ì Font char set ‚ðA<a href="../menu/setup-terminalr.html">ƒƒVƒAŒêƒ‚[ƒh‚Ì [Setup]-[Terminal]</a> ‚Ɉړ®‚µ‚½B</li>
+        </ul></li-->
     </ul></li>
 
   <li>Bug fixes

Modified: trunk/doc/en/html/menu/setup-font.html
===================================================================
--- trunk/doc/en/html/menu/setup-font.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/html/menu/setup-font.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -14,7 +14,7 @@
       Changes the font.
     </p>
 
-    <h2>"Font setup" dialog box</h2>
+    <h2>"Font" dialog box</h2>
     <dl>
       <dt>Font</dt>
       <dd>
@@ -25,12 +25,6 @@
       <dd>
 	Select a font size in points.
       </dd>
-
-      <dt>Enable bold style</dt>
-      <dd>
-	Enables the use of bold style font for characters with the
-	bold attribute.
-      </dd>
     </dl>
 
     <p class="indent1">
@@ -39,9 +33,5 @@
       can not be selected in this dialog box. It is used automatically by
       Tera Term.
     </p>
-
-    <p>
-      <a href="setup-fontr.html">Help for Russian mode</a>
-    </p>
   </body>
 </html>

Deleted: trunk/doc/en/html/menu/setup-fontr.html
===================================================================
--- trunk/doc/en/html/menu/setup-fontr.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/html/menu/setup-fontr.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Font ([Setup] menu; Russian mode)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Font ([Setup] menu; Russian mode)</h1>
-    <p>
-      Changes the font.
-    </p>
-
-    <h2>"Font setup" dialog box</h2>
-    <dl>
-      <dt>Font</dt>
-      <dd>
-	Select a font from the list.
-      </dd>
-
-      <dt>Size</dt>
-      <dd>
-	Select a font size in points.
-      </dd>
-
-      <dt>Enable bold style</dt>
-      <dd>
-	Enables the use of bold style font for characters with the
-	bold attribute.
-      </dd>
-
-      <dt>Font char set</dt>
-      <dd>
-	Character code set of the specified font, Windows (CP 1251),
-	KOI8-R, CP 866 or ISO 8859-5.
-      </dd>
-    </dl>
-
-    <p class="indent1">
-      Note:<br>
-      The Tera Special font, which is included in the distribution package,
-      can not be selected in this dialog box. It is used automatically by
-      Tera Term.
-    </p>
-  </body>
-</html>

Modified: trunk/doc/en/html/menu/setup-terminalr.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalr.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/html/menu/setup-terminalr.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -88,6 +88,12 @@
 	    KOI8-R, CP 866 or ISO 8859-5. If you are using Russian version
 	    of Windows, you should select Windows.
 	  </dd>
+
+      <dt>Font</dt>
+      <dd>
+	Character code set of the specified font, Windows (CP 1251),
+	KOI8-R, CP 866 or ISO 8859-5.
+      </dd>
 	</dl>
       </dd>
     </dl>

Modified: trunk/doc/en/html/menu/setup-window.html
===================================================================
--- trunk/doc/en/html/menu/setup-window.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/html/menu/setup-window.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -23,6 +23,11 @@
 	Cursor shape. Block, Vertical line or Horizontal line.
       </dd>
 
+      <dt>Enable bold font</dt>
+      <dd>
+	Enables the use of bold style font for characters with the bold attribute.
+      </dd>
+
       <dt>Hide title bar</dt>
       <dd>
 	Hides the title bar and menu bar. You can move the window by

Modified: trunk/doc/en/html/menutek/setup-font.html
===================================================================
--- trunk/doc/en/html/menutek/setup-font.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/html/menutek/setup-font.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -13,7 +13,7 @@
 
 <p>Changes the font.</p>
 
-<h2>"Font setup" dialog box</h2>
+<h2>"Font" dialog box</h2>
 
 <dl>
 

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/en/teraterm.hhp	2009-05-11 13:35:05 UTC (rev 3389)
@@ -34,7 +34,6 @@
 HlpSetupTerminalRuss=html\menu\setup-terminalr.html
 HlpSetupWindow=html\menu\setup-window.html
 HlpSetupFont=html\menu\setup-font.html
-HlpSetupFontRuss=html\menu\setup-fontr.html
 HlpSetupKeyboard=html\menu\setup-keyboard.html
 HlpSetupKeyboardRuss=html\menu\setup-keyboardr.html
 HlpSetupSerialPort=html\menu\setup-serialport.html

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/html/about/history.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -58,6 +58,12 @@
       <li>BroadcastCommandi”ñRealtime modej‚É‚¨‚¢‚āAƒŠƒXƒgƒ{ƒbƒNƒX‚Å‘I‘ð‚³‚ê‚½’[––‚ɑ΂µ‚Ă̂݁AƒƒbƒZ[ƒW‚𑗐M‚·‚é‚悤‚É‚µ‚½B</li>
       <li><a href="../menu/setup-general.html">Œ¾Œêƒ‚[ƒh</a>‚ðŽw’è‚·‚é <a href="../commandline/teraterm.html#la">/LA</a> ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ƒIƒvƒVƒ‡ƒ“‚ŁAŠØ‘Œêƒ‚[ƒh‚ðŽw’è‚Å‚«‚é‚悤‚É‚µ‚½B</li>
       <li>IME‚̃Cƒ“ƒ‰ƒCƒ“•ÏŠ·‚ðŠØ‘Œêƒ‚[ƒh‚Å‚às‚¦‚é‚悤‚É‚µ‚½B</li>
+      <li>ƒtƒHƒ“ƒgÝ’èƒ_ƒCƒAƒƒO‚ŁAOS‚̃Rƒ‚ƒ“ƒ_ƒCƒAƒƒO‚ð‚»‚Ì‚Ü‚Ü•\Ž¦‚·‚é‚悤‚É‚µ‚½B
+        <ul>
+          <li>•¶ŽšƒZƒbƒg‚ð‘I‘ð‚Å‚«‚é‚悤‚É‚µ‚½B</li>
+          <li>Enable bold style ‚ð <a href="../menu/setup-window.html">[Setup]-[Window]</a> ‚Ɉړ®‚µ‚½B</li>
+          <li>ƒƒVƒAŒêƒ‚[ƒh‚Ì Font char set ‚ðA<a href="../menu/setup-terminalr.html">ƒƒVƒAŒêƒ‚[ƒh‚Ì [Setup]-[Terminal]</a> ‚Ɉړ®‚µ‚½B</li>
+        </ul></li>
     </ul></li>
 
   <li>ƒoƒOC³

Modified: trunk/doc/ja/html/menu/setup-font.html
===================================================================
--- trunk/doc/ja/html/menu/setup-font.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/html/menu/setup-font.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -14,25 +14,18 @@
       ƒtƒHƒ“ƒg‚ð•ÏX‚µ‚Ü‚·B
     </p>
 
-    <h2>"Font setup" ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX</h2>
+    <h2>ƒtƒHƒ“ƒg ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX</h2>
     <dl>
-      <dt>Font</dt>
+      <dt>ƒtƒHƒ“ƒg</dt>
       <dd>
 	•ÏX‚µ‚½‚¢ƒtƒHƒ“ƒg‚ðƒŠƒXƒg‚Ì’†‚©‚ç‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B
 	“ú–{Œê‚ð•\Ž¦‚·‚邽‚ß‚É‚Í“ú–{ŒêƒtƒHƒ“ƒg‚ð‘I‘ð‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
       </dd>
 
-      <dt>Size</dt>
+      <dt>ƒTƒCƒY</dt>
       <dd>
 	ƒtƒHƒ“ƒg‚̃TƒCƒY‚ðƒ|ƒCƒ“ƒg”‚ÅŽw’肵‚Ä‚­‚¾‚³‚¢B
       </dd>
-
-      <dt>Enable bold style</dt>
-      <dd>
-	Bold (‹­’²)‘®«‚Ì•¶Žš‚ð bold ƒXƒ^ƒCƒ‹‚̃tƒHƒ“ƒg‚Å•\Ž¦‚·‚é‚悤‚É‚µ‚Ü‚·B
-	‚±‚̏ꍇA‰æ–ʂɃSƒ~‚ªŽc‚Á‚½‚èA
-	×‚©‚¢•¶Žš‚ª‚‚Ԃê‚Ä“Ç‚Ý‚É‚­‚­‚È‚Á‚½‚è‚·‚邱‚Æ‚ª‚ ‚è‚Ü‚·B
-      </dd>
     </dl>
 
     <p class="indent1">
@@ -41,9 +34,5 @@
       ‚Í‚±‚̃_ƒCƒAƒƒOƒ{ƒbƒNƒX‚Å‚Í‘I‘ð‚Å‚«‚Ü‚¹‚ñB
       Tera Term ‚É‚æ‚Á‚ÄŽ©“®“I‚ÉŽg—p‚³‚ê‚Ü‚·B
     </p>
-
-    <p>
-      <a href="setup-fontr.html">ƒƒVƒAŒêƒ‚[ƒh‚̃wƒ‹ƒv</a>
-    </p>
   </body>
 </html>

Deleted: trunk/doc/ja/html/menu/setup-fontr.html
===================================================================
--- trunk/doc/ja/html/menu/setup-fontr.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/html/menu/setup-fontr.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <title>Font ([Setup] ƒƒjƒ…[; ƒƒVƒAŒêƒ‚[ƒh)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Font ([Setup] ƒƒjƒ…[; ƒƒVƒAŒêƒ‚[ƒh)</h1>
-    <p>
-      ƒtƒHƒ“ƒg‚ð•ÏX‚µ‚Ü‚·B
-    </p>
-
-    <h2>"Font setup" ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX</h2>
-    <dl>
-      <dt>Font</dt>
-      <dd>
-	•ÏX‚µ‚½‚¢ƒtƒHƒ“ƒg‚ðƒŠƒXƒg‚Ì’†‚©‚ç‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B
-	“ú–{Œê‚ð•\Ž¦‚·‚邽‚ß‚É‚Í“ú–{ŒêƒtƒHƒ“ƒg‚ð‘I‘ð‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-      </dd>
-
-      <dt>Size</dt>
-      <dd>
-	ƒtƒHƒ“ƒg‚̃TƒCƒY‚ðƒ|ƒCƒ“ƒg”‚ÅŽw’肵‚Ä‚­‚¾‚³‚¢B
-      </dd>
-
-      <dt>Enable bold style</dt>
-      <dd>
-	Bold (‹­’²)‘®«‚Ì•¶Žš‚ð bold ƒXƒ^ƒCƒ‹‚̃tƒHƒ“ƒg‚Å•\Ž¦‚·‚é‚悤‚É‚µ‚Ü‚·B
-	‚±‚̏ꍇA‰æ–ʂɃSƒ~‚ªŽc‚Á‚½‚èA
-	×‚©‚¢•¶Žš‚ª‚‚Ԃê‚Ä“Ç‚Ý‚É‚­‚­‚È‚Á‚½‚è‚·‚邱‚Æ‚ª‚ ‚è‚Ü‚·B
-      </dd>
-
-      <dt>Font char set</dt>
-      <dd>
-	Žw’肳‚ꂽƒtƒHƒ“ƒg‚Ì•¶ŽšƒR[ƒh‚ðAWindows (CP 1251), KOI8-R,
-	CP 866, ISO 8859-5 ‚Ì’†‚©‚ç‘I‘ð‚µ‚Ü‚·B
-      </dd>
-    </dl>
-
-    <p class="indent1">
-      ’:<br>
-      Tera Term •t‘®‚̃tƒHƒ“ƒg Tera Special
-      ‚Í‚±‚̃_ƒCƒAƒƒOƒ{ƒbƒNƒX‚Å‚Í‘I‘ð‚Å‚«‚Ü‚¹‚ñB
-      Tera Term ‚É‚æ‚Á‚ÄŽ©“®“I‚ÉŽg—p‚³‚ê‚Ü‚·B
-    </p>
-  </body>
-</html>

Modified: trunk/doc/ja/html/menu/setup-terminalr.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalr.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/html/menu/setup-terminalr.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -90,6 +90,12 @@
 	    ‚à‚µ‚ ‚È‚½‚ªƒƒVƒAŒê Windows ‚ðŽg—p‚µ‚Ä‚¢‚é‚È‚çAWindows
 	    ‚ð‘I‘ð‚·‚×‚«‚Å‚·B
 	  </dd>
+
+      <dt>Font</dt>
+      <dd>
+	Žw’肳‚ꂽƒtƒHƒ“ƒg‚Ì•¶ŽšƒR[ƒh‚ðAWindows (CP 1251), KOI8-R,
+	CP 866, ISO 8859-5 ‚Ì’†‚©‚ç‘I‘ð‚µ‚Ü‚·B
+      </dd>
 	</dl>
       </dd>
     </dl>

Modified: trunk/doc/ja/html/menu/setup-window.html
===================================================================
--- trunk/doc/ja/html/menu/setup-window.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/html/menu/setup-window.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -23,6 +23,12 @@
 	ƒJ[ƒ\ƒ‹‚ÌŒ`BBlock, Vertical line, Horizontal line ‚Ì3‚‚©‚ç‘I‚ׂ܂·B
       </dd>
 
+      <dt>Enable bold font</dt>
+      <dd>
+	Bold (‹­’²)‘®«‚Ì•¶Žš‚ð bold ƒXƒ^ƒCƒ‹‚̃tƒHƒ“ƒg‚Å•\Ž¦‚·‚é‚悤‚É‚µ‚Ü‚·B
+	‚±‚̏ꍇA‰æ–ʂɃSƒ~‚ªŽc‚Á‚½‚èA×‚©‚¢•¶Žš‚ª‚‚Ԃê‚Ä“Ç‚Ý‚É‚­‚­‚È‚Á‚½‚è‚·‚邱‚Æ‚ª‚ ‚è‚Ü‚·B
+      </dd>
+
       <dt>Hide title bar</dt>
       <dd>
 	ƒ^ƒCƒgƒ‹ƒo[‚ƃƒjƒ…[ƒo[‚ðÁ‚µ‚Ü‚·B

Modified: trunk/doc/ja/html/menutek/setup-font.html
===================================================================
--- trunk/doc/ja/html/menutek/setup-font.html	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/html/menutek/setup-font.html	2009-05-11 13:35:05 UTC (rev 3389)
@@ -13,14 +13,14 @@
 
 <p>ƒtƒHƒ“ƒg‚ð•ÏX‚µ‚Ü‚·¡</p>
 
-<h2>"Font setup"ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX</h2>
+<h2>ƒtƒHƒ“ƒg ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX</h2>
 
 <dl>
 
-<dt>Font</dt>
+<dt>ƒtƒHƒ“ƒg</dt>
 <dd>•ÏX‚µ‚½‚¢ƒtƒHƒ“ƒg‚ðƒŠƒXƒg‚Ì’†‚©‚ç‘I‘ð‚µ‚Ä‰º‚³‚¢B</dd>
 
-<dt>Size</dt>
+<dt>ƒTƒCƒY</dt>
 <dd>ƒtƒHƒ“ƒg‚̃TƒCƒY‚ðƒ|ƒCƒ“ƒg”‚ÅŽw’肵‚ĉº‚³‚¢¡</dd>
 
 </dl>

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/doc/ja/teraterm.hhp	2009-05-11 13:35:05 UTC (rev 3389)
@@ -34,7 +34,6 @@
 HlpSetupTerminalRuss=html\menu\setup-terminalr.html
 HlpSetupWindow=html\menu\setup-window.html
 HlpSetupFont=html\menu\setup-font.html
-HlpSetupFontRuss=html\menu\setup-fontr.html
 HlpSetupKeyboard=html\menu\setup-keyboard.html
 HlpSetupKeyboardRuss=html\menu\setup-keyboardr.html
 HlpSetupSerialPort=html\menu\setup-serialport.html

Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/installer/release/lang/English.lng	2009-05-11 13:35:05 UTC (rev 3389)
@@ -231,13 +231,6 @@
 DLG_DIR_NEW=&New dir:
 DLG_SELECT_DIR_TITLE=Select new directory
 
-DLG_FONT_TITLE=Tera Term: Font setup
-DLG_FONT_FONT=&Font:
-DLG_FONT_SIZE=&Size:
-DLG_FONT_BOLD=Enable &bold style
-DLG_FONT_CHARSET=Font &char set:
-DLG_FONT_SAMPLE=Sample
-
 DLG_GEN_TITLE=Tera Term: General setup
 DLG_GEN_PORT=Default &port:
 DLG_GEN_LANG=&Language:
@@ -306,6 +299,7 @@
 DLG_TERM_RUSSCHARSET=Character set
 DLG_TERM_RUSSHOST=H&ost:
 DLG_TERM_RUSSCLIENT=&Client:
+DLG_TERM_RUSSFONT=&Font:
 
 DLG_WIN_TITLE=Tera Term: Window setup
 DLG_WIN_TITLELABEL=&Title:
@@ -313,6 +307,7 @@
 DLG_WIN_BLOCK=B&lock
 DLG_WIN_VERT=&Vertical line
 DLG_WIN_HORZ=H&orizontal line
+DLG_WIN_BOLD=Enable bol&d font
 DLG_WIN_HIDETITLE=H&ide title bar
 DLG_WIN_HIDEMENU=Hide &menu bar
 DLG_WIN_COLOREMU=&Color emulation

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/installer/release/lang/German.lng	2009-05-11 13:35:05 UTC (rev 3389)
@@ -230,13 +230,6 @@
 DLG_DIR_NEW=&Neu:
 DLG_SELECT_DIR_TITLE=Neues Verzeichniss wählen
 
-DLG_FONT_TITLE=Schriftart einstellen
-DLG_FONT_FONT=Schriftart
-DLG_FONT_SIZE=Größe
-DLG_FONT_BOLD=fettschreiben
-DLG_FONT_CHARSET=Font &char set:
-DLG_FONT_SAMPLE=Bespiel
-
 DLG_GEN_TITLE=Tera Grundeinstellungen
 DLG_GEN_PORT=Standard Port
 DLG_GEN_LANG=Sprache
@@ -305,6 +298,7 @@
 DLG_TERM_RUSSCHARSET=Character set
 DLG_TERM_RUSSHOST=H&ost:
 DLG_TERM_RUSSCLIENT=&Client:
+DLG_TERM_RUSSFONT=&Font:
 
 DLG_WIN_TITLE=Fenster Einstellungen
 DLG_WIN_TITLELABEL=Titel
@@ -312,6 +306,7 @@
 DLG_WIN_BLOCK=Block
 DLG_WIN_VERT=Vertikale Linie
 DLG_WIN_HORZ=Horizontale Linie
+DLG_WIN_BOLD=fettschreiben
 DLG_WIN_HIDETITLE=verstecke Titelleiste
 DLG_WIN_HIDEMENU=verstecke Menüleiste
 DLG_WIN_COLOREMU=&Color emulation

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/installer/release/lang/Japanese.lng	2009-05-11 13:35:05 UTC (rev 3389)
@@ -231,13 +231,6 @@
 DLG_DIR_NEW=V‹K(&N):
 DLG_SELECT_DIR_TITLE=V‚µ‚¢ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢
 
-DLG_FONT_TITLE=Tera Term: ƒtƒHƒ“ƒg‚̐ݒè
-DLG_FONT_FONT=ƒtƒHƒ“ƒg(&F):
-DLG_FONT_SIZE=ƒTƒCƒY(&S):
-DLG_FONT_BOLD=‘¾Žš‚ð—LŒø(&B)
-DLG_FONT_CHARSET=•¶ŽšƒZƒbƒg(&C):
-DLG_FONT_SAMPLE=ƒTƒ“ƒvƒ‹
-
 DLG_GEN_TITLE=Tera Term: ‘S”ʐݒè
 DLG_GEN_PORT=•W€‚̃|[ƒg(&P):
 DLG_GEN_LANG=Œ¾Œê(&L):
@@ -306,6 +299,7 @@
 DLG_TERM_RUSSCHARSET=•¶ŽšƒZƒbƒg
 DLG_TERM_RUSSHOST=ƒzƒXƒg(&O):
 DLG_TERM_RUSSCLIENT=ƒNƒ‰ƒCƒAƒ“ƒg(&C):
+DLG_TERM_RUSSFONT=ƒtƒHƒ“ƒg(&F):
 
 DLG_WIN_TITLE=Tera Term: ƒEƒBƒ“ƒhƒE‚̐ݒè
 DLG_WIN_TITLELABEL=ƒ^ƒCƒgƒ‹(&T):
@@ -313,6 +307,7 @@
 DLG_WIN_BLOCK=ŽlŠp(&L):
 DLG_WIN_VERT=‚’¼ü(&V):
 DLG_WIN_HORZ=‰ºü(&O):
+DLG_WIN_BOLD=‘¾Žš‚ð—LŒø(&D)
 DLG_WIN_HIDETITLE=ƒ^ƒCƒgƒ‹ƒo[‚ð‰B‚·(&I):
 DLG_WIN_HIDEMENU=ƒƒjƒ…[ƒo[‚ð‰B‚·(&M):
 DLG_WIN_COLOREMU=ƒJƒ‰[ƒGƒ~ƒ…ƒŒ[ƒVƒ‡ƒ“(&C):

Modified: trunk/teraterm/ttpdlg/dlg_res.h
===================================================================
--- trunk/teraterm/ttpdlg/dlg_res.h	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/teraterm/ttpdlg/dlg_res.h	2009-05-11 13:35:05 UTC (rev 3389)
@@ -110,10 +110,7 @@
 #define IDC_DIRNEW                      702
 #define IDC_DIRHELP                     799
 #define IDD_ABOUTDLG                    800
-#define IDD_FONTDLG                     900
 #define IDC_FONTBOLD                    901
-#define IDC_FONTCHARSET1                902
-#define IDC_FONTCHARSET2                903
 #define IDD_GENDLG                      1000
 #define IDC_GENPORT                     1001
 #define IDC_GENLANGLABEL                1002
@@ -139,7 +136,6 @@
 #define IDC_INLUCDE_LABEL               1036
 #define IDC_TT23_LABEL                  1037
 #define IDC_TT23DATE_LABEL              1038
-#define IDC_FONTHELP                    1038
 #define IDC_AUTHOR_LABEL                1039
 #define IDC_TT_ICON                     1040
 #define IDC_DIRCURRENT_LABEL            1041
@@ -174,13 +170,10 @@
 #define IDC_SELECT_DIR                  1070
 #define IDC_BUILDTIME                   1071
 #define IDC_BUILDTOOL                   1072
-#define IDC_SAMPLE                      1073
-#define IDC_FONTLABEL                   1088
-#define IDC_SIZELABEL                   1090
+#define IDC_TERMRUSSFONTLABEL           1075
+#define IDC_TERMRUSSFONT                1076
 #define IDC_GENHELP                     1099
 #define IDD_TERMDLG                     1100
-#define IDC_FONT                        1136
-#define IDC_FONTSIZE                    1138
 #define IDD_WINLISTDLG                  1200
 #define IDC_WINLISTLIST                 1201
 #define IDC_WINLISTCLOSE                1202
@@ -196,7 +189,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        103
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1074
+#define _APS_NEXT_CONTROL_VALUE         1077
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2009-05-11 13:35:05 UTC (rev 3389)
@@ -10,6 +10,7 @@
 #include <io.h>
 #include <direct.h>
 #include <commdlg.h>
+#include <Dlgs.h>
 #include "tttypes.h"
 #include "ttlib.h"
 #include "dlglib.h"
@@ -33,7 +34,6 @@
 
 static HFONT DlgAboutFont;
 static HFONT DlgDirFont;
-static HFONT DlgFontFont;
 static HFONT DlgGenFont;
 static HFONT DlgHostFont;
 static HFONT DlgKeybFont;
@@ -127,6 +127,8 @@
 				SendDlgItemMessage(Dialog, IDC_TERMRUSSHOST, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_TERMRUSSCLIENTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_TERMRUSSCLIENT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+				SendDlgItemMessage(Dialog, IDC_TERMRUSSFONTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+				SendDlgItemMessage(Dialog, IDC_TERMRUSSFONT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
 			}
 		}
 		else {
@@ -211,6 +213,9 @@
 			GetDlgItemText(Dialog, IDC_TERMRUSSCLIENTLABEL, uimsg2, sizeof(uimsg2));
 			get_lang_msg("DLG_TERM_RUSSCLIENT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
 			SetDlgItemText(Dialog, IDC_TERMRUSSCLIENTLABEL, uimsg);
+			GetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg2, sizeof(uimsg2));
+			get_lang_msg("DLG_TERM_RUSSFONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
+			SetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg);
 		}
 
 		SetDlgItemInt(Dialog,IDC_TERMWIDTH,ts->TerminalWidth,FALSE);
@@ -281,6 +286,7 @@
 		{
 			SetDropDownList(Dialog,IDC_TERMRUSSHOST,RussList,ts->RussHost);
 			SetDropDownList(Dialog,IDC_TERMRUSSCLIENT,RussList,ts->RussClient);
+			SetDropDownList(Dialog,IDC_TERMRUSSFONT,RussList,ts->RussFont);
 		}
 		else if (ts->Language==IdKorean) // HKS
 		{
@@ -355,6 +361,7 @@
 			{
 				ts->RussHost = (WORD)GetCurSel(Dialog, IDC_TERMRUSSHOST);
 				ts->RussClient = (WORD)GetCurSel(Dialog, IDC_TERMRUSSCLIENT);
+				ts->RussFont = (WORD)GetCurSel(Dialog, IDC_TERMRUSSFONT);
 			}
 			else if (ts->Language==IdKorean) // HKS
 			{
@@ -532,6 +539,7 @@
 				SendDlgItemMessage(Dialog, IDC_WINBLOCK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_WINVERT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_WINHORZ, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
+				SendDlgItemMessage(Dialog, IDC_FONTBOLD, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_WINHIDETITLE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_WINHIDEMENU, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
 				SendDlgItemMessage(Dialog, IDC_WINCOLOREMU, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
@@ -579,6 +587,9 @@
 			GetDlgItemText(Dialog, IDC_WINHORZ, uimsg2, sizeof(uimsg2));
 			get_lang_msg("DLG_WIN_HORZ", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
 			SetDlgItemText(Dialog, IDC_WINHORZ, uimsg);
+			GetDlgItemText(Dialog, IDC_FONTBOLD, uimsg2, sizeof(uimsg2));
+			get_lang_msg("DLG_WIN_BOLD", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
+			SetDlgItemText(Dialog, IDC_FONTBOLD, uimsg);
 			GetDlgItemText(Dialog, IDC_WINHIDETITLE, uimsg2, sizeof(uimsg2));
 			get_lang_msg("DLG_WIN_HIDETITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
 			SetDlgItemText(Dialog, IDC_WINHIDETITLE, uimsg);
@@ -738,6 +749,7 @@
 				ShowDlgItem(Dialog,IDC_WINUSENORMALBG,IDC_WINUSENORMALBG);
 				SetRB(Dialog,ts->UseNormalBGColor,IDC_WINUSENORMALBG,IDC_WINUSENORMALBG);
 #endif
+				SetRB(Dialog, ts->EnableBold, IDC_FONTBOLD,IDC_FONTBOLD);
 			}
 			else {
 				for (i = 0 ; i <=1 ; i++) {
@@ -916,6 +928,7 @@
 								}
 							}
 #endif
+							GetRB(Dialog,&ts->EnableBold,IDC_FONTBOLD,IDC_FONTBOLD);
 						}
 						else {
 							for (i = 0 ; i <= 1 ; i++) {
@@ -2959,95 +2972,11 @@
 
 BOOL CALLBACK TFontHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
-	LPCHOOSEFONT cf;
-	PTTSet ts;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
-
 	switch (Message) {
 		case WM_INITDIALOG:
-			cf = (LPCHOOSEFONT)lParam;
-			ts = (PTTSet)(cf->lCustData);
-			SetWindowLong(Dialog, DWL_USER, (LPARAM)ts);
-
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgFontFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_FONTLABEL, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONT, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SIZELABEL, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTSIZE, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTBOLD, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTCHARSET1, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTCHARSET2, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SAMPLE, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTHELP, WM_SETFONT, (WPARAM)DlgFontFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgFontFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_FONT_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_FONTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_FONT_FONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_FONTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SIZELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_FONT_SIZE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SIZELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_FONTBOLD, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_FONT_BOLD", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_FONTBOLD, uimsg);
-			GetDlgItemText(Dialog, IDC_FONTCHARSET1, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_FONT_CHARSET", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_FONTCHARSET1, uimsg);
-			GetDlgItemText(Dialog, IDC_SAMPLE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_FONT_SAMPLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SAMPLE, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_FONTHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_FONTHELP, uimsg);
-
-			if (ts != NULL && ts->VTFlag) {
-				ShowDlgItem(Dialog,IDC_FONTBOLD,IDC_FONTBOLD);
-				SetRB(Dialog,ts->EnableBold,IDC_FONTBOLD,IDC_FONTBOLD);
-				if (ts->Language==IdRussian) {
-					ShowDlgItem(Dialog,IDC_FONTCHARSET1,IDC_FONTCHARSET2);
-					SetDropDownList(Dialog,IDC_FONTCHARSET2,RussList,ts->RussFont);
-				}
-			}
-			SetFocus(GetDlgItem(Dialog,1136));
+			EnableWindow(GetDlgItem(Dialog, cmb2), FALSE);
+			SetFocus(GetDlgItem(Dialog,cmb1));
 			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDOK:
-					ts = (PTTSet)GetWindowLong(Dialog,DWL_USER);
-					if (ts!=NULL && ts->VTFlag>0) {
-						GetRB(Dialog,&ts->EnableBold,IDC_FONTBOLD,IDC_FONTBOLD);
-						if (ts->Language==IdRussian)
-							ts->RussFont = (WORD)GetCurSel(Dialog, IDC_FONTCHARSET2);
-					}
-					if (DlgFontFont != NULL) {
-						DeleteObject(DlgFontFont);
-					}
-					break;
-				case IDCANCEL:
-					if (DlgFontFont != NULL) {
-						DeleteObject(DlgFontFont);
-					}
-					break;
-			}
 	}
 	return FALSE;
 }
@@ -3062,14 +2991,9 @@
 	cf.hwndOwner = WndParent;
 	cf.lpLogFont = LogFont;
 	cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT |
-	           CF_FIXEDPITCHONLY | CF_SHOWHELP | CF_ENABLETEMPLATE |
-	           CF_NOSCRIPTSEL | CF_NOVERTFONTS;
-	if (ts!=NULL) {
-		cf.Flags = cf.Flags | CF_ENABLEHOOK;
-		cf.lpfnHook = (LPCFHOOKPROC)(&TFontHook);
-		cf.lCustData = (DWORD)ts;
-	}
-	cf.lpTemplateName = MAKEINTRESOURCE(IDD_FONTDLG);
+	           CF_FIXEDPITCHONLY | CF_SHOWHELP | CF_NOVERTFONTS |
+	           CF_ENABLEHOOK;
+	cf.lpfnHook = (LPCFHOOKPROC)(&TFontHook);
 	cf.nFontType = REGULAR_FONTTYPE;
 	cf.hInstance = hInst;
 	Ok = ChooseFont(&cf);

Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2009-05-11 04:18:15 UTC (rev 3388)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2009-05-11 13:35:05 UTC (rev 3389)
@@ -281,34 +281,6 @@
     LTEXT           "Build time: ",IDC_BUILDTIME,7,97,165,8
 END
 
-IDD_FONTDLG DIALOGEX 20, 20, 207, 144
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Tera Term: Font setup"
-FONT 10, "System", 0, 0, 0x0
-BEGIN
-    LTEXT           "&Font:",IDC_FONTLABEL,10,6,40,9
-    COMBOBOX        IDC_FONT,9,16,98,54,CBS_SIMPLE | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "&Size:",IDC_SIZELABEL,116,6,38,9
-    COMBOBOX        IDC_FONTSIZE,114,17,36,54,CBS_SIMPLE | CBS_OWNERDRAWFIXED | CBS_SORT | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Enable &bold style",IDC_FONTBOLD,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,11,73,69,12
-    CONTROL         "Font &char set:",IDC_FONTCHARSET1,"Static",SS_LEFTNOWORDWRAP | NOT WS_VISIBLE | WS_GROUP,83,75,48,11
-    COMBOBOX        IDC_FONTCHARSET2,135,74,55,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Sample",IDC_SAMPLE,9,86,188,52,WS_GROUP
-    LTEXT           "AaBbYyZz",1092,13,96,180,40,SS_NOPREFIX | NOT WS_VISIBLE | NOT WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,160,8,40,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,160,28,40,14,WS_GROUP
-    PUSHBUTTON      "&Help",IDC_FONTHELP,160,52,40,14,WS_GROUP
-    GROUPBOX        "",1072,20,160,14,34
-    CONTROL         "",1040,"Button",BS_AUTOCHECKBOX,23,166,10,10
-    CONTROL         "",1041,"Button",BS_AUTOCHECKBOX,23,178,10,10
-    COMBOBOX        1139,38,180,26,14,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL
-    PUSHBUTTON      "",1026,18,198,48,14,NOT WS_TABSTOP
-    LTEXT           "",1093,72,200,12,10,SS_NOPREFIX | NOT WS_GROUP
-    LTEXT           "",1089,72,220,24,9,NOT WS_GROUP
-    COMBOBOX        1137,28,220,32,12,CBS_SIMPLE | CBS_DISABLENOSCROLL | WS_VSCROLL
-    LTEXT           "",1091,12,220,12,9,NOT WS_GROUP
-END
-
 IDD_GENDLG DIALOGEX 20, 20, 142, 65
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tera Term: General setup"
@@ -380,6 +352,7 @@
     CONTROL         "B&lock",IDC_WINBLOCK,"Button",BS_AUTORADIOBUTTON | WS_GROUP,16,40,42,9
     CONTROL         "&Vertical line",IDC_WINVERT,"Button",BS_AUTORADIOBUTTON,16,52,62,9
     CONTROL         "H&orizontal line",IDC_WINHORZ,"Button",BS_AUTORADIOBUTTON,16,64,68,10
+    CONTROL         "Enable bol&d font",IDC_FONTBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,93,82,10
     CONTROL         "H&ide title bar",IDC_WINHIDETITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,98,30,90,10
     CONTROL         "Hide &menu bar",IDC_WINHIDEMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,98,42,90,10
     CONTROL         "&Color emulation",IDC_WINCOLOREMU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,98,54,90,10
@@ -422,7 +395,7 @@
     PUSHBUTTON      "&Help",IDC_WINLISTHELP,143,68,50,14
 END
 
-IDD_TERMDLGR DIALOGEX 20, 20, 245, 131
+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 10, "System", 0, 0, 0x0
@@ -444,11 +417,13 @@
     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,30
+    GROUPBOX        "Character set",IDC_TERMRUSSCHARSET,8,94,221,43
     RTEXT           "H&ost:",IDC_TERMRUSSHOSTLABEL,14,106,36,11
     COMBOBOX        IDC_TERMRUSSHOST,52,105,55,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     RTEXT           "&Client:",IDC_TERMRUSSCLIENTLABEL,113,106,52,11
     COMBOBOX        IDC_TERMRUSSCLIENT,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



Ttssh2-commit メーリングリストの案内