Tera TermRevision: 8179
https://osdn.net/projects/ttssh2/scm/svn/commits/8179
Author: yutakapon
Date: 2019-09-17 23:24:59 +0900 (Tue, 17 Sep 2019)
Log Message:
-----------
設定 - シリアルポートのメニューはTCP/IP接続中のみとして、それ以外は選択不可とするようにした。
branches/serial_port_improvedからリビジョン8158をマージ:
設定 - シリアルポートのメニューはTCP/IP接続中のみとして、それ以外は選択不可とするようにした。
........
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
Property Changed:
----------------
trunk/
trunk/teraterm/
-------------- next part --------------
Index: trunk
===================================================================
--- trunk 2019-09-17 14:21:38 UTC (rev 8178)
+++ trunk 2019-09-17 14:24:59 UTC (rev 8179)
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
+/branches/serial_port_improved:8119,8140-8141,8144,8150,8158
/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
Index: trunk/teraterm
===================================================================
--- trunk/teraterm 2019-09-17 14:21:38 UTC (rev 8178)
+++ trunk/teraterm 2019-09-17 14:24:59 UTC (rev 8179)
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
+/branches/serial_port_improved/teraterm:8119,8140-8141,8144,8150,8158
/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2019-09-17 14:21:38 UTC (rev 8178)
+++ trunk/teraterm/teraterm/vtwin.cpp 2019-09-17 14:24:59 UTC (rev 8179)
@@ -1413,17 +1413,16 @@
}
}
else if (SubMenu == SetupMenu)
- if (cv.Ready &&
- ((cv.PortType==IdTCPIP) || (cv.PortType==IdFile)) ||
- (SendVar!=NULL) || (FileVar!=NULL) || Connecting) {
- /*
- * \x83l\x83b\x83g\x83\x8F\x81[\x83N\x90ڑ\xB1\x92\x86\x82̓V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g(ID_SETUP_SERIALPORT)\x82̃\x81\x83j\x83\x85\x81[\x82\xAA
- * \x91I\x91\xF0\x82ł\xAB\x82Ȃ\xA2\x82悤\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD\x82\xAA\x81A\x82\xB1\x82̃K\x81[\x83h\x82\xF0\x8AO\x82\xB7\x81B
- */
- // do nothing
+ /*
+ * \x83l\x83b\x83g\x83\x8F\x81[\x83N\x90ڑ\xB1\x92\x86(TCP/IP\x82\xF0\x91I\x91\xF0\x82\xB5\x82Đڑ\xB1\x82\xB5\x82\xBD\x8F\xF3\x91\xD4)\x82̓V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g
+ * (ID_SETUP_SERIALPORT)\x82̃\x81\x83j\x83\x85\x81[\x82\xAA\x91I\x91\xF0\x82ł\xAB\x82Ȃ\xA2\x82悤\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD\x82\xAA\x81A
+ * \x82\xB1\x82̃K\x81[\x83h\x82\xF0\x8AO\x82\xB5\x81A\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x90ݒ\xE8\x83_\x83C\x83A\x83\x8D\x83O\x82\xA9\x82\xE7\x90V\x82\xB5\x82\xA2\x90ڑ\xB1\x82\xAA\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
+ */
+ if ((SendVar!=NULL) || (FileVar!=NULL) || Connecting) {
+ EnableMenuItem(SetupMenu,ID_SETUP_SERIALPORT,MF_BYCOMMAND | MF_GRAYED);
}
else {
- // do nothing
+ EnableMenuItem(SetupMenu,ID_SETUP_SERIALPORT,MF_BYCOMMAND | MF_ENABLED);
}
else if (SubMenu == ControlMenu)
@@ -4688,8 +4687,7 @@
* TCP/IP\x82ɂ\xE6\x82\xE9\x90ڑ\xB1\x92\x86\x82̏ꍇ\x82͐V\x8BK\x83v\x83\x8D\x83Z\x83X\x82Ƃ\xB5\x82ċN\x93\xAE\x82\xB7\x82\xE9\x81B
* New connection\x82\xA9\x82\xE7\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xB7\x82铮\x8D\xEC\x82Ɗ\xEE\x96{\x93I\x82ɓ\xAF\x82\xB6\x93\xAE\x8D\xEC\x82ƂȂ\xE9\x81B
*/
- if ( (cv.Ready && (cv.PortType != IdSerial)) ||
- Connecting) {
+ if ( cv.Ready && (cv.PortType != IdSerial) ) {
_snprintf_s(Command, sizeof(Command), "ttermpro /C=%u /SPEED=%lu",
ts.ComPort, ts.Baud);