Tera TermRevision: 8186
https://osdn.net/projects/ttssh2/scm/svn/commits/8186
Author: yutakapon
Date: 2019-09-18 23:29:04 +0900 (Wed, 18 Sep 2019)
Log Message:
-----------
[Setup]-[Serial port] ダイアログのOKボタンの表記を、ネットワークおよびシリアルの接続状態で
切り替えるようにした。
branches/serial_port_improvedからリビジョン8160をマージ:
[Setup]-[Serial port] ダイアログのOKボタンの表記を接続状態で切り替えるようにした。
........
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/menu/setup-serialport.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/menu/setup-serialport.html
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
trunk/installer/release/lang/Simplified Chinese.lng
trunk/installer/release/lang/Traditional Chinese.lng
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpdlg/ttpdlg.rc
Property Changed:
----------------
trunk/
trunk/teraterm/
-------------- next part --------------
Index: trunk
===================================================================
--- trunk 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk 2019-09-18 14:29:04 UTC (rev 8186)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/flowctrl_dsrdtr:7825-7827
/branches/openssl_1_1_1_v2:7888
/branches/portfwd_memleak:7732,7736-7737,7764
-/branches/serial_port_improved:8119,8140-8141,8144,8150,8158-8159
+/branches/serial_port_improved:8119,8140-8141,8144,8150,8158-8160
/branches/ssh_ed25519:5495-5544
/branches/ttproxy_improved:8041,8055-8056
/branches/ttssh_improved:8027,8036,8040,8044,8053-8054,8058,8060,8063,8081,8085
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/doc/en/html/about/history.html 2019-09-18 14:29:04 UTC (rev 8186)
@@ -50,6 +50,7 @@
<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 refering to the connection state. </li>
</ul>
</li>
<li>Bug fixes
Modified: trunk/doc/en/html/menu/setup-serialport.html
===================================================================
--- trunk/doc/en/html/menu/setup-serialport.html 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/doc/en/html/menu/setup-serialport.html 2019-09-18 14:29:04 UTC (rev 8186)
@@ -12,7 +12,28 @@
<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 refering to the connection state. <br>
+ New connection ... 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 close 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.
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/doc/ja/html/about/history.html 2019-09-18 14:29:04 UTC (rev 8186)
@@ -50,6 +50,7 @@
<li><a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82̃^\x83C\x83g\x83\x8B\x82\xF0\x81u\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x81v\x82\xA9\x82\xE7\x81u\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x82Ɛڑ\xB1\x81v\x82ɕύX\x82\xB5\x82\xBD\x81B</li>
<li><a href="../menu/setup-serialport.html#Information">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82\xC9COM\x83|\x81[\x83g\x82̏ڍ\xEE\x95\xF1\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
<li><a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82̃X\x83s\x81[\x83h\x90ݒ\xE8\x82Ńc\x81[\x83\x8B\x83`\x83b\x83v\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ <li><a href="../menu/setup-serialport.html#OK">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82\xCCOK\x83{\x83^\x83\x93\x82̕\\x8BL\x82\xF0\x90ڑ\xB1\x8F\xF3\x91ԂŐ\xE8\x91ւ\xA6\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
</ul>
</li>
<li>\x83o\x83O\x8FC\x90\xB3
Modified: trunk/doc/ja/html/menu/setup-serialport.html
===================================================================
--- trunk/doc/ja/html/menu/setup-serialport.html 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/doc/ja/html/menu/setup-serialport.html 2019-09-18 14:29:04 UTC (rev 8186)
@@ -12,7 +12,27 @@
<h1>Serial port ([Setup] \x83\x81\x83j\x83\x85\x81[)</h1>
<h2>"Serial port setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
+
<dl>
+ <dt id="OK">OK button</dt>
+ <dd>
+ \x8C\xBB\x8D݂̐ڑ\xB1\x8F\xF3\x91Ԃ\xF0\x8C\xA9\x82āA\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82̓\xAE\x8D\xEC\x82\xF0\x95\\x82\xB5\x82܂\xB7\x81B<br>
+ \x90V\x82\xB5\x82\xA2\x90ڑ\xB1 ... TCP/IP\x90ڑ\xB1\x92\x86\x82̂\xBD\x82߁A\x90V\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x82ŃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
+ \x90V\x8BK\x83I\x81[\x83v\x83\x93 ... \x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
+ \x83N\x83\x8D\x81[\x83Y\x81\x95\x90V\x8BK\x83I\x81[\x83v\x83\x93 ... \x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82\xE9COM\x83|\x81[\x83g\x82\xF0\x95\xB6\x82āA\x90V\x82\xB5\x82\xA2COM\x83|\x81[\x83g\x82ŃV\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B<br>
+ \x8C\xBB\x8D݂̐ڑ\xB1\x82\xF0\x90ݒ胊\x83Z\x83b\x83g ... \x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82\xE9COM\x83|\x81[\x83g\x82̐ݒ\xE8\x82\xF0\x95ύX\x82\xB5\x82܂\xB7\x81B<br>
+ </dd>
+
+ <dt id="Cancel">Cancel button</dt>
+ <dd>
+ \x90ݒ\xE8\x95ύX\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82āA\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7\x81B
+ </dd>
+
+ <dt id="Help">Help button</dt>
+ <dd>
+ \x83w\x83\x8B\x83v\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x81B
+ </dd>
+
<dt id="ComPort">Port</dt>
<dd>
\x8Eg\x97p\x82\xB7\x82\xE9\x83|\x81[\x83g\x82ł\xB7\x81B\x83\x8A\x83X\x83g\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x94ԍ\x86\x82̍ő\xE5\x92l\x82̓f\x83t\x83H\x83\x8B\x83g\x82\xC5256\x82ƂȂ\xC1\x82Ă\xA2\x82܂\xB7\x81B<a href="../setup/teraterm-com.html#maxport">MaxComPort</a>\x82ōő\xE5\x92l\x82\xF0\x95ύX\x82ł\xAB\x82܂\xB7\x81B
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/English.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -370,6 +370,10 @@
DLG_SERIAL_DELAYCHAR=msec/&char
DLG_SERIAL_DELAYLINE=msec/&line
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Tera Term: TCP/IP setup
DLG_TCPIP_HOSTLIST=Host &list
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/French.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -371,6 +371,10 @@
DLG_SERIAL_DELAYCHAR=msec/&car
DLG_SERIAL_DELAYLINE=msec/&ligne
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Tera Term: Configuration TCP/IP
DLG_TCPIP_HOSTLIST=Liste d'h\xF4tes
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/German.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -371,6 +371,10 @@
DLG_SERIAL_DELAYCHAR=msec/char
DLG_SERIAL_DELAYLINE=msec/line
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Hostliste editieren
DLG_TCPIP_HOSTLIST=Hostliste
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/Japanese.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -370,6 +370,10 @@
DLG_SERIAL_DELAYCHAR=\x83~\x83\x8A\x95b/\x8E\x9A(&C)
DLG_SERIAL_DELAYLINE=\x83~\x83\x8A\x95b/\x8Ds(&L)
DLG_SERIAL_SPEED_TOOLTIP=\x90\x94\x92l\x82ړ\xFC\x97͂ł\xAB\x82܂\xB7
+DLG_SERIAL_OK_CONNECTION=\x90V\x82\xB5\x82\xA2\x90ڑ\xB1(&N)
+DLG_SERIAL_OK_OPEN=\x90V\x8BK\x83I\x81[\x83v\x83\x93(&N)
+DLG_SERIAL_OK_CLOSEOPEN=\x83N\x83\x8D\x81[\x83Y\x81\x95\x90V\x8BK\x83I\x81[\x83v\x83\x93(&N)
+DLG_SERIAL_OK_RESET=\x8C\xBB\x8D݂̐ڑ\xB1\x82\xF0\x90ݒ胊\x83Z\x83b\x83g(&N)
DLG_TCPIP_TITLE=Tera Term: TCP/IP \x90ݒ\xE8
DLG_TCPIP_HOSTLIST=\x83z\x83X\x83g\x83\x8A\x83X\x83g(&L)
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/Korean.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -371,6 +371,10 @@
DLG_SERIAL_DELAYCHAR=msec/&char
DLG_SERIAL_DELAYLINE=msec/&line
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Tera Term: TCP/IP \xBC\xB3\xC1\xA4
DLG_TCPIP_HOSTLIST=ȣ\xBD\xBAƮ \xB8\xF1\xB7\xCF(&L)
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/Russian.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -371,6 +371,10 @@
DLG_SERIAL_DELAYCHAR=\xEC\xF1/&\xF1\xE8\xEC\xE2\xEE\xEB
DLG_SERIAL_DELAYLINE=\xEC\xF1/&\xF1\xF2\xF0\xEE\xEA\xE0
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Tera Term: \xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0 TCP/IP
DLG_TCPIP_HOSTLIST=&\xCF\xE5\xF0\xE5\xF7\xE5\xED\xFC \xF5\xEE\xF1\xF2\xEE\xE2
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -371,6 +371,10 @@
DLG_SERIAL_DELAYCHAR=\xBA\xC1\xC3\xEB/\xD7ַ\xFB
DLG_SERIAL_DELAYLINE=\xBA\xC1\xC3\xEB/\xD0\xD0
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Tera Term\xA3\xBATCP/IP \xC9\xE8\xD6\xC3
DLG_TCPIP_HOSTLIST=\xD6\xF7\xBB\xFA\xC1б\xED(&L)
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2019-09-18 14:29:04 UTC (rev 8186)
@@ -371,6 +371,10 @@
DLG_SERIAL_DELAYCHAR=\xB2@\xAC\xED/\xA6r\xB2\xC5
DLG_SERIAL_DELAYLINE=\xB2@\xAC\xED/\xA6\xE6
DLG_SERIAL_SPEED_TOOLTIP=You can directly specify a number
+DLG_SERIAL_OK_CONNECTION=&New connection
+DLG_SERIAL_OK_OPEN=&New open
+DLG_SERIAL_OK_CLOSEOPEN=Close and &New open
+DLG_SERIAL_OK_RESET=&New setting
DLG_TCPIP_TITLE=Tera Term\xA1GTCP/IP \xB3]\xA9w
DLG_TCPIP_HOSTLIST=\xA5D\xBE\xF7\xA6C\xAA\xED(&L)
Index: trunk/teraterm
===================================================================
--- trunk/teraterm 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/teraterm 2019-09-18 14:29:04 UTC (rev 8186)
Property changes on: trunk/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
/branches/flowctrl_dsrdtr/teraterm:7825-7827
-/branches/serial_port_improved/teraterm:8119,8140-8141,8144,8150,8158-8159
+/branches/serial_port_improved/teraterm:8119,8140-8141,8144,8150,8158-8160
/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2019-09-18 14:29:04 UTC (rev 8186)
@@ -78,6 +78,11 @@
TTEndDialog(p1, p2)
extern HANDLE hInst;
+/*
+ * ttwinman.h\x82\xF0include\x82\xB7\x82\xE9\x82ƁAhInst\x82ƃV\x83\x93\x83{\x83\x8B\x8FՓ˂\xB7\x82邽\x82߁A
+ * cv\x82\xCCextern\x90錾\x82\xF0\x8Cʂɒlj\xC1\x82\xB7\x82\xE9\x81B
+ */
+extern TComVar cv;
static char UILanguageFile[MAX_PATH];
@@ -1109,6 +1114,55 @@
static TipWin *g_SerialDlgSpeedTip;
/*
+ * \x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x83_\x83C\x83A\x83\x8D\x83O\x82\xCCOK\x83{\x83^\x83\x93\x82\xF0\x90ڑ\xB1\x90\xE6\x82ɉ\x9E\x82\xB6\x82Ė\xBC\x8F̂\xF0\x90\xE8\x91ւ\xA6\x82\xE9\x81B
+ * \x8F\xF0\x8C\x8F\x94\xBB\x92\xE8\x82\xCD OnSetupSerialPort() \x82ƍ\x87\x82킹\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
+ */
+static void serial_dlg_change_OK_button(HWND dlg, int portno)
+{
+ static const DlgTextInfo TextInfoNewConnection[] = {
+ { IDOK, "DLG_SERIAL_OK_CONNECTION" },
+ };
+ static const DlgTextInfo TextInfoNewOpen[] = {
+ { IDOK, "DLG_SERIAL_OK_OPEN" },
+ };
+ static const DlgTextInfo TextInfoCloseNewOpen[] = {
+ { IDOK, "DLG_SERIAL_OK_CLOSEOPEN" },
+ };
+ static const DlgTextInfo TextInfoResetSetting[] = {
+ { IDOK, "DLG_SERIAL_OK_RESET" },
+ };
+ int ret = 0;
+ TCHAR uimsg[MAX_UIMSG];
+
+ if ( cv.Ready && (cv.PortType != IdSerial) ) {
+ ret = SetDlgTexts(dlg, TextInfoNewConnection, _countof(TextInfoNewConnection), UILanguageFile);
+ strncpy_s(uimsg, sizeof(uimsg), "&New connection", _TRUNCATE);
+
+ } else {
+ if (cv.Open) {
+ if (portno != cv.ComPort) {
+ ret = SetDlgTexts(dlg, TextInfoCloseNewOpen, _countof(TextInfoCloseNewOpen), UILanguageFile);
+ strncpy_s(uimsg, sizeof(uimsg), "Close and &New open", _TRUNCATE);
+ } else {
+ ret = SetDlgTexts(dlg, TextInfoResetSetting, _countof(TextInfoResetSetting), UILanguageFile);
+ strncpy_s(uimsg, sizeof(uimsg), "&New setting", _TRUNCATE);
+ }
+
+ } else {
+ ret = SetDlgTexts(dlg, TextInfoNewOpen, _countof(TextInfoNewOpen), UILanguageFile);
+ strncpy_s(uimsg, sizeof(uimsg), "&New open", _TRUNCATE);
+ }
+ }
+
+ /* Default.lng \x82̏ꍇ\x81A\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x93ǂݏo\x82\xB9\x82Ȃ\xA2\x82̂ŁA
+ * \x83f\x83t\x83H\x83\x8B\x83g\x83e\x83L\x83X\x83g\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x81B
+ */
+ if (ret <= 0) {
+ SetDlgItemText(dlg, IDOK, uimsg);
+ }
+}
+
+/*
* \x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x83_\x83C\x83A\x83\x8D\x83O\x82̃e\x83L\x83X\x83g\x83{\x83b\x83N\x83X\x82\xC9COM\x83|\x81[\x83g\x82̏ڍ\xEE\x95\xF1\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x81B
*
*/
@@ -1234,7 +1288,7 @@
{ IDCANCEL, "BTN_CANCEL" },
{ IDC_SERIALHELP, "BTN_HELP" },
};
- PTTSet ts;
+ PTTSet ts = NULL;
int i, w, sel;
char Temp[128];
static WORD ComPortTable[MAXCOMPORT]; // \x8Eg\x97p\x89\\x82\xC8COM\x83|\x81[\x83g\x94ԍ\x86
@@ -1346,6 +1400,10 @@
GWLP_WNDPROC,
(LONG_PTR)SerialDlgSpeedComboboxWindowProc);
+ // \x8C\xBB\x8D݂̐ڑ\xB1\x8F\xF3\x91ԂƐV\x82\xB5\x82\xA2\x83|\x81[\x83g\x94ԍ\x86\x82̑g\x82ݍ\x87\x82킹\x82ŁA\x90ڑ\xB1\x8F\x88\x97\x9D\x82\xAA\x95ς\xED\x82邽\x82߁A
+ // \x82\xBB\x82\xEA\x82ɉ\x9E\x82\xB6\x82\xC4OK\x83{\x83^\x83\x93\x82̃\x89\x83x\x83\x8B\x96\xBC\x82\xF0\x90\xE8\x91ւ\xA6\x82\xE9\x81B
+ serial_dlg_change_OK_button(Dialog, ComPortTable[w]);
+
return TRUE;
case WM_COMMAND:
@@ -1426,15 +1484,19 @@
case IDC_SERIALPORT:
switch (HIWORD(wParam)) {
- case CBN_SELCHANGE: // \x83\x8A\x83X\x83g\x82\xA9\x82\xE7COM\x83|\x81[\x83g\x82\xAA\x91I\x91\xF0\x82\xB3\x82ꂽ
- sel = SendDlgItemMessage(Dialog, IDC_SERIALPORT, CB_GETCURSEL, 0, 0);
- portno = ComPortTable[sel];
+ case CBN_SELCHANGE: // \x83\x8A\x83X\x83g\x82\xA9\x82\xE7COM\x83|\x81[\x83g\x82\xAA\x91I\x91\xF0\x82\xB3\x82ꂽ
+ sel = SendDlgItemMessage(Dialog, IDC_SERIALPORT, CB_GETCURSEL, 0, 0);
+ portno = ComPortTable[sel]; // \x90V\x82\xB5\x82\xA2\x83|\x81[\x83g\x94ԍ\x86
- // \x8Fڍ\xEE\x95\xF1\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
- serial_dlg_set_comport_info(Dialog, ComPortTable[sel], ComPortDesc[sel]);
+ // \x8Fڍ\xEE\x95\xF1\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
+ serial_dlg_set_comport_info(Dialog, ComPortTable[sel], ComPortDesc[sel]);
- break;
+ // \x8C\xBB\x8D݂̐ڑ\xB1\x8F\xF3\x91ԂƐV\x82\xB5\x82\xA2\x83|\x81[\x83g\x94ԍ\x86\x82̑g\x82ݍ\x87\x82킹\x82ŁA\x90ڑ\xB1\x8F\x88\x97\x9D\x82\xAA\x95ς\xED\x82邽\x82߁A
+ // \x82\xBB\x82\xEA\x82ɉ\x9E\x82\xB6\x82\xC4OK\x83{\x83^\x83\x93\x82̃\x89\x83x\x83\x8B\x96\xBC\x82\xF0\x90\xE8\x91ւ\xA6\x82\xE9\x81B
+ serial_dlg_change_OK_button(Dialog, portno);
+ break;
+
}
return TRUE;
Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc 2019-09-18 14:25:12 UTC (rev 8185)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc 2019-09-18 14:29:04 UTC (rev 8186)
@@ -147,9 +147,9 @@
EDITTEXT IDC_SERIALDELAYCHAR,29,116,20,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "msec/&line",IDC_SERIALDELAYLINE_LABEL,124,118,42,10
EDITTEXT IDC_SERIALDELAYLINE,100,116,20,12,ES_AUTOHSCROLL | ES_NUMBER
- DEFPUSHBUTTON "OK",IDOK,138,9,40,16,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,138,34,40,16
- PUSHBUTTON "&Help",IDC_SERIALHELP,138,62,40,16
+ DEFPUSHBUTTON "OK",IDOK,138,9,40,45,BS_LEFT | BS_MULTILINE | WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,138,60,40,16,BS_LEFT
+ PUSHBUTTON "&Help",IDC_SERIALHELP,138,84,40,16,BS_LEFT
EDITTEXT IDC_SERIALTEXT,10,141,170,59,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
END