シリアルポートダイアログをプロパティーページに変更 #84

- デフォルトポートの仕様を変更した
  - 全般タブでは"TCP/IP"/"シリアル"の選択を行う
  - シリアルポート番号の選択はシリアルポートタブで行う
  - ts.ComPort を全般タブとシリアルタブの2か所で変更しないようにするため
- ドキュメント修正
  - 未着手
    - doc/en/html/menu/setup-additional-serialport.html

.editorconfig

@@ -17,6 +17,7 @@ end_of_line = crlf
 charset = cp932
 indent_style = space
 indent_size = 2
+trim_trailing_whitespace = true
 
 [*.md]
 end_of_line = crlf

doc/en/html/about/history.html

@@ -59,6 +59,12 @@ <h3 id="teraterm_5.4">YYYY.MM.DD (Ver 5.4 not released yet)</h3>
       <li>SendFile options are saved in TERATERM.INI.</li>
       <li>Added <a href="../setup/teraterm-trans.html#SendfileSkipOptionDialog">skip Send file dialog</a> setting.</li>
       <li>Macro commands for sending and receiving files are also from File transfer folder.</li>
+      <li>Additional settings - <a href="../menu/setup-additional-serialport.html">Serial Port tab</a></li>
+      <ul>
+        <li>Setup - Serial dialog was integrated into Serial Port tab of Additional settings.</li>
+        <li>Only settings in this tab.(New connections are made from <a href="../menu/file-new.html">New connection dialog</a>.)</li>
+        <li>Select TCP/IP or Serial as <a href="../menu/setup-additional-general.html#Port">new connection default</a> for New connection dialog on General tab. Select default Serial port on Serial tab.</li>
+      </ul>
     </ul>
   </li>
 
@@ -404,15 +410,15 @@ <h3 id="teraterm_4.105">2019.12.7 (Ver 4.105)</h3>
         <ul>
           <li>Added support for hardware flow control DSR/DTR with serial connection.
             <ul>
-              <li>The hardware is renamed to RTS/CTS, and DSR/DTR is newly added on the Flow control of <a href="../menu/setup-serialport.html">Serial port ([Setup] menu)</a>.</li>
+              <li>The hardware is renamed to RTS/CTS, and DSR/DTR is newly added on the Flow control of <a href="../menu/setup-additional-serialport.html">Serial port ([Setup] menu)</a>.</li>
               <li>MACRO: The DSR/DTR can be specified in <a href="../macro/command/setflowctrl.html">setflowctrl</a> command.</li>
             </ul></li>
-          <li>The <a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> dialog can be called even while TCP/IP connection.</li>
-          <li>The title of <a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> dialog is changed from "Serial port setup" to "Serial port setup and connection".</li>
-          <li>The detail information of COM port is added on the <a href="../menu/setup-serialport.html#Information">[Setup]-[Serial port]</a> dialog.</li>
-          <li>The tooltip of the speed setting is added on the <a href="../menu/setup-serialport.html#Information">[Setup]-[Serial port]</a> dialog.</li>
-          <li>The OK button notation in the <a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> dialog is changed referring to the connection state. </li>
-          <li>The OK button can not be pressed in the <a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> dialog when no COM ports are available.</li>
+          <li>The <a href="../menu/setup-additional-serialport.html">[Setup]-[Serial port]</a> dialog can be called even while TCP/IP connection.</li>
+          <li>The title of <a href="../menu/setup-additional-serialport.html">[Setup]-[Serial port]</a> dialog is changed from "Serial port setup" to "Serial port setup and connection".</li>
+          <li>The detail information of COM port is added on the <a href="../menu/setup-additional-serialport.html#Information">[Setup]-[Serial port]</a> dialog.</li>
+          <li>The tooltip of the speed setting is added on the <a href="../menu/setup-additional-serialport.html#Information">[Setup]-[Serial port]</a> dialog.</li>
+          <li>The OK button notation in the <a href="../menu/setup-additional-serialport.html">[Setup]-[Serial port]</a> dialog is changed referring to the connection state. </li>
+          <li>The OK button can not be pressed in the <a href="../menu/setup-additional-serialport.html">[Setup]-[Serial port]</a> dialog when no COM ports are available.</li>
           <li>Added <a href="../commandline/teraterm.html#cdatabit">/CDATABIT=</a>,  <a href="../commandline/teraterm.html#cparity">/CPARITY=</a>, <a href="../commandline/teraterm.html#cstopbit">/CSTOPBIT=</a>, <a href="../commandline/teraterm.html#cflowctrl">/CFLOWCTRL=</a>, <a href="../commandline/teraterm.html#cdelayperchar">/CDELAYPERCHAR=</a>, <a href="../commandline/teraterm.html#cdelayperline">/CDELAYPERLINE=</a> command line options.</li>
         </ul>
       </li>
@@ -1864,7 +1870,7 @@ <h3 id="teraterm_4.68">2010.12.7 (Ver 4.68)</h3>
   <li>Bug fixes
     <ul>
       <li>Security fix: A class of vulnerabilities affecting applications that load DLL's in an insecure manner.</li>
-      <li>The baud rate can not be properly selected on the <a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> dialog.</li>
+      <li>The baud rate can not be properly selected on the <a href="../menu/setup-additional-serialport.html">[Setup]-[Serial port]</a> dialog.</li>
       <li><a href="../setup/teraterm-term.html#beep">Beep setting</a> does not work.</li>
       <li>The scroll region can not be cleared by using the DECALN (DEC Screen Alignment Test) control sequence.</li>
       <li>An empty string can not reply by using the window title and icon label reporting request.</li>
@@ -1946,7 +1952,7 @@ <h3 id="teraterm_4.66">2010.5.31 (Ver 4.66)</h3>
         </ul></li>
       <li>added support for specifying any baud rate of the serial port connection.
         <ul>
-          <li>A user can specify any baud rate at the <a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> menu.</li>
+          <li>A user can specify any baud rate at the <a href="../menu/setup-additional-serialport.html">[Setup]-[Serial port]</a> menu.</li>
           <li>A user can specify any baud rate at the <a href="../commandline/teraterm.html#baud">/BAUD</a> option.</li>
           <li>A user can specify any baud rate at the "<a href="../macro/command/setbaud.html">setbaud</a>" macro command.</li>
         </ul></li>

doc/en/html/menu/setup-additional-serialport.html

@@ -0,0 +1,68 @@
+<!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>Additional settings / "Serial port" tab ([Setup] menu)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Additional settings / "Serial port" tab ([Setup] menu)</h1>
+
+    <dl>
+
+      <dt id="OK">OK button</dt>
+      <dd>
+	The label of OK button is changed according to the connection state. <br>
+	    Connect with New window   ...  Serial connection is launched with new window since TCP/IP connection is using. <br>
+	    New open ...  Serial connection starts.<br>
+	    Close and New open  ... Current COM port is closed and serial connection starts with new COM port.<br>
+	    New setting  ... The setting of current COM port is changed.<br>
+      </dd>
+
+      <dt id="ComPort">Port</dt>
+      <dd>
+	Serial port to be used. By default, maximum serial port number in the list is 256. It is configurable in <a href="../setup/teraterm-com.html#maxport">MaxComPort</a> setting.
+      </dd>
+
+      <dt id="Speed">Speed, Data, Parity, Stop bits, Flow control</dt>
+      <dd>
+	Serial port parameters. Choose the appropriate parameters for
+	the modem or the host.
+	<p>
+	  The Speed can be specified with any number. Actually, the serial port driver may not reflect your speed.
+	</p>
+	<p>
+	  Flow control can be configured in the following:<br>
+	     Xon/Xoff  ...  Software flow<br>
+	     RTS/CTS  ... Hardware flow(RTS/CTS)<br>
+	     DSR/DTR  ... Hardware flow(DSR/DTR)<br>
+	     none  ...  No flow control<br>
+	</p>
+	<p>
+	  Note: If Data is 7 bit, the XMODEM, ZMODEM, B PLUS and Quick-VAN
+	  protocols are disabled. If Flow control is Xon/Xoff, the XMODEM
+	  and Quick-VAN protocols are disabled.
+	</p>
+	<p>
+	  Note: The "hardware" prior to version 4.104 applies to RTS/CTS.
+	</p>
+      </dd>
+
+      <dt id="Delay">Transmit delay</dt>
+      <dd>
+	Time intervals between characters (lines) being sent, in milliseconds.
+      </dd>
+
+      <dt id="Information">Detail information of COM port</dt>
+      <dd>
+	The detail information of selected port is shown in the text box. <br>
+	You can select all data by using CTRL+A.
+	You can scroll horizontally by using CTRL/SHIFT + wheel. 
+      </dd>
+
+    </dl>
+  </body>
+</html>

doc/en/html/menu/setup-additional.html

@@ -33,6 +33,7 @@ <h2>tabs</h2>
       </ul>
       <li><a href="setup-additional-terminal.html">"Terminal" Tab</a></li>
       <li><a href="setup-additional-window.html">"Window" Tab</a></li>
+      <li><a href="setup-additional-serialport.html">"Serail Port" Tab</a></li>
     </ul>
 
   </body>

doc/en/html/menu/setup-serialport.html

@@ -10,71 +10,8 @@
 
   <body>
     <h1>Serial port ([Setup] menu)</h1>
-
-    <h2>"Serial port setup" dialog box</h2>
-
-    <dl>
-
-      <dt id="OK">OK button</dt>
-      <dd>
-	The label of OK button is changed according to the connection state. <br>
-	    Connect with New window   ...  Serial connection is launched with new window since TCP/IP connection is using. <br>
-	    New open ...  Serial connection starts.<br>
-	    Close and New open  ... Current COM port is closed and serial connection starts with new COM port.<br>
-	    New setting  ... The setting of current COM port is changed.<br>
-      </dd>
-
-      <dt id="Cancel">Cancel button</dt>
-      <dd>
-	Discards the setting change and closes the dialog. 
-      </dd>
-
-      <dt id="Help">Help button</dt>
-      <dd>
-	Displays the help file.
-      </dd>
-
-      <dt id="ComPort">Port</dt>
-      <dd>
-	Serial port to be used. By default, maximum serial port number in the list is 256. It is configurable in <a href="../setup/teraterm-com.html#maxport">MaxComPort</a> setting.
-      </dd>
-
-      <dt id="Speed">Speed, Data, Parity, Stop bits, Flow control</dt>
-      <dd>
-	Serial port parameters. Choose the appropriate parameters for
-	the modem or the host.
-	<p>
-	  The Speed can be specified with any number. Actually, the serial port driver may not reflect your speed.
-	</p>
-	<p>
-	  Flow control can be configured in the following:<br>
-	     Xon/Xoff  ...  Software flow<br>
-	     RTS/CTS  ... Hardware flow(RTS/CTS)<br>
-	     DSR/DTR  ... Hardware flow(DSR/DTR)<br>
-	     none  ...  No flow control<br>
-	</p>
-	<p>
-	  Note: If Data is 7 bit, the XMODEM, ZMODEM, B PLUS and Quick-VAN
-	  protocols are disabled. If Flow control is Xon/Xoff, the XMODEM
-	  and Quick-VAN protocols are disabled.
-	</p>
-	<p>
-	  Note: The "hardware" prior to version 4.104 applies to RTS/CTS.
-	</p>
-      </dd>
-
-      <dt id="Delay">Transmit delay</dt>
-      <dd>
-	Time intervals between characters (lines) being sent, in milliseconds.
-      </dd>
-
-      <dt id="Information">Detail information of COM port</dt>
-      <dd>
-	The detail information of selected port is shown in the text box. <br>
-	You can select all data by using CTRL+A.
-	You can scroll horizontally by using CTRL/SHIFT + wheel. 
-      </dd>
-
-    </dl>
+    <p>
+      Open <a href="../menu/setup-additional-serialport.html">Serial Port tab</a> of Additional settings dialog.
+    </p>
   </body>
 </html>

doc/en/html/setup/teraterm-ini.html

@@ -194,7 +194,7 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="BaudRate"><a href="../menu/setup-serialport.html#Speed">BaudRate</a></td>
+		<td id="BaudRate"><a href="../menu/setup-additional-serialport.html#Speed">BaudRate</a></td>
 		<td style="width:250px;">9600</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
@@ -302,7 +302,7 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="ComPort"><a href="../menu/setup-serialport.html#ComPort">ComPort</a></td>
+		<td id="ComPort"><a href="../menu/setup-additional-serialport.html#ComPort">ComPort</a></td>
 		<td style="width:250px;">1</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
@@ -386,7 +386,7 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="DataBit"><a href="../menu/setup-serialport.html#Speed">DataBit</a></td>
+		<td id="DataBit"><a href="../menu/setup-additional-serialport.html#Speed">DataBit</a></td>
 		<td style="width:250px;">8</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
@@ -410,13 +410,13 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="DelayPerChar"><a href="../menu/setup-serialport.html#Delay">DelayPerChar</a></td>
+		<td id="DelayPerChar"><a href="../menu/setup-additional-serialport.html#Delay">DelayPerChar</a></td>
 		<td style="width:250px;">0</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="DelayPerLine"><a href="../menu/setup-serialport.html#Delay">DelayPerLine</a></td>
+		<td id="DelayPerLine"><a href="../menu/setup-additional-serialport.html#Delay">DelayPerLine</a></td>
 		<td style="width:250px;">0</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
@@ -632,7 +632,7 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="FlowCtrl"><a href="../menu/setup-serialport.html#Speed">FlowCtrl</a></td>
+		<td id="FlowCtrl"><a href="../menu/setup-additional-serialport.html#Speed">FlowCtrl</a></td>
 		<td style="width:250px;">none</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
@@ -974,7 +974,7 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="Parity"><a href="../menu/setup-serialport.html#Speed">Parity</a></td>
+		<td id="Parity"><a href="../menu/setup-additional-serialport.html#Speed">Parity</a></td>
 		<td style="width:250px;">none</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
@@ -1154,7 +1154,7 @@ <h2>Tera Term</h2>
 		<td></td>
 	</tr>
 	<tr>
-		<td id="StopBit"><a href="../menu/setup-serialport.html#Speed">StopBit</a></td>
+		<td id="StopBit"><a href="../menu/setup-additional-serialport.html#Speed">StopBit</a></td>
 		<td style="width:250px;">1</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>

doc/en/teraterm.hhc

@@ -533,6 +533,11 @@
 					<param name="Local" value="html\menu\setup-additional-window.html">
 					<param name="ImageNumber" value="11">
 					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Serial Port tab">
+					<param name="Local" value="html\menu\setup-additional-serialport.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
 			</UL>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="Save setup">

doc/en/teraterm.hhp

@@ -133,6 +133,7 @@ HlpMenuSetupAdditionalCtrlSeq=html\menu\setup-additional-ctrlseq.html
 HlpMenuSetupAdditionalCygwin=html\menu\setup-additional-cygwin.html
 HlpMenuSetupAdditionalWindow=html\menu\setup-additional-window.html
 HlpMenuSetupAdditionalTerminal=html\menu\setup-additional-terminal.html
+HlpMenuSetupAdditionalSerialPort=html\menu\setup-additional-serialport.html
 HlpMenuSetupThemeEditor=html\menu\setup-additional-visual-theme.html
 HlpMenuSetupSave=html\menu\setup-save.html
 HlpMenuSetupRestore=html\menu\setup-restore.html