Merge pull request #970 from TeraTermProject/fix/#969-file_menu_enable_disable

[File]メニューの有効化/無効化の位置がずれている (Transfer - Quick-VAN 他) #969

Author: hkanou

doc/en/html/about/history.html

@@ -44,11 +44,15 @@ <h3 id="teraterm_5.6.0">YYYY.MM.DD (Ver 5.6.0 not released yet)</h3>
     </ul>
   </li>
 
-  <!--li>Bug fixes
+  <li>Bug fixes
     <ul>
-      <li></li>
+      <li>
+        Fixed an issue where the serial port data length and flow control settings were not reflected in the enabled/disabled state of the [File] - [Transfer] - [YMODEM, ZMODEM, B-Plus, Quick-VAN] menu items.<br>
+        Fixed an issue so that [File] - [Change directory...] can be selected even when the session is disconnected.
+        (<a href="https://github.com/TeraTermProject/teraterm/issues/969" target="_blank">issue #969</a>)
+      </li>
     </ul>
-  </li-->
+  </li>
 
   <li>Misc
     <ul>

doc/ja/html/about/history.html

@@ -44,11 +44,15 @@ <h3 id="teraterm_5.6.0">YYYY.MM.DD (Ver 5.6.0 not released yet)</h3>
     </ul>
   </li>
 
-  <!--li>バグ修正
+  <li>バグ修正
     <ul>
-      <li></li>
+      <li>
+        シリアルポートのデータ長とフロー制御の設定が [File] - [Transfer] - [YMODEM, ZMODEM, B-Plus, Quick-VAN] のメニューの有効/無効状態に反映されるよう修正した。<br>
+        セッション断の状態でも [File] - [Change directory...] を選択出来るよう修正した。
+        (<a href="https://github.com/TeraTermProject/teraterm/issues/969" target="_blank">issue #969</a>)
+      </li>
     </ul>
-  </li-->
+  </li>
 
   <li>その他
     <ul>

teraterm/common/tttypes.h

@@ -879,7 +879,7 @@ typedef TComVar *PComVar;
 #define ID_WINDOW_UNDO         50816
 #define ID_TEKWINDOW_WINDOW    51810
 
-#define ID_TRANSFER      9 // the position on [File] menu
+#define ID_TRANSFER      11 // the position on [File] menu
 #define ID_SHOWMENUBAR   995
 
 #define MAXNWIN 256

teraterm/teraterm/vtwin.cpp

@@ -1040,7 +1040,7 @@ void CVTWindow::InitMenu(HMENU *Menu)
 		{ ID_FILE_DISCONNECT, "MENU_FILE_DISCONNECT" },
 		{ ID_FILE_EXIT, "MENU_FILE_EXIT" },
 		{ ID_FILE_EXITALL, "MENU_FILE_EXITALL" },
-		{ 11, "MENU_TRANS" },
+		{ ID_TRANSFER, "MENU_TRANS" },
 		{ ID_FILE_KERMITRCV, "MENU_TRANS_KERMIT_RCV" },
 		{ ID_FILE_KERMITGET, "MENU_TRANS_KERMIT_GET" },
 		{ ID_FILE_KERMITSEND, "MENU_TRANS_KERMIT_SEND" },
@@ -1154,14 +1154,12 @@ void CVTWindow::InitMenuPopup(HMENU SubMenu)
 		     (!IsFileVarNULL()) || (cv.PortType==IdFile) ) {
 			EnableMenuItem(FileMenu,ID_FILE_SENDFILE,MF_BYCOMMAND | MF_GRAYED);
 			EnableMenuItem(FileMenu,ID_TRANSFER,MF_BYPOSITION | MF_GRAYED); /* Transfer */
-			EnableMenuItem(FileMenu,ID_FILE_CHANGEDIR,MF_BYCOMMAND | MF_GRAYED);
 			EnableMenuItem(FileMenu,ID_FILE_DISCONNECT,MF_BYCOMMAND | MF_GRAYED);
 			EnableMenuItem(FileMenu,ID_FILE_DUPLICATESESSION,MF_BYCOMMAND | MF_GRAYED);
 		}
 		else {
 			EnableMenuItem(FileMenu,ID_FILE_SENDFILE,MF_BYCOMMAND | MF_ENABLED);
 			EnableMenuItem(FileMenu,ID_TRANSFER,MF_BYPOSITION | MF_ENABLED); /* Transfer */
-			EnableMenuItem(FileMenu,ID_FILE_CHANGEDIR,MF_BYCOMMAND | MF_ENABLED);
 			EnableMenuItem(FileMenu,ID_FILE_DISCONNECT,MF_BYCOMMAND | MF_ENABLED);
 			if (ts.DisableMenuDuplicateSession) {
 				EnableMenuItem(FileMenu,ID_FILE_DUPLICATESESSION,MF_BYCOMMAND | MF_GRAYED);
@@ -1206,20 +1204,22 @@ void CVTWindow::InitMenuPopup(HMENU SubMenu)
 		if ((cv.PortType==IdSerial) &&
 		    ((ts.DataBit==IdDataBit7) || (ts.Flow==IdFlowX))) {
 			EnableMenuItem(TransMenu,1,MF_BYPOSITION | MF_GRAYED);  /* XMODEM */
-			EnableMenuItem(TransMenu,4,MF_BYPOSITION | MF_GRAYED);  /* Quick-VAN */
+			EnableMenuItem(TransMenu,2,MF_BYPOSITION | MF_GRAYED);  /* YMODEM */
+			EnableMenuItem(TransMenu,5,MF_BYPOSITION | MF_GRAYED);  /* Quick-VAN */
 		}
 		else {
 			EnableMenuItem(TransMenu,1,MF_BYPOSITION | MF_ENABLED); /* XMODEM */
-			EnableMenuItem(TransMenu,4,MF_BYPOSITION | MF_ENABLED); /* Quick-VAN */
+			EnableMenuItem(TransMenu,2,MF_BYPOSITION | MF_ENABLED); /* YMODEM */
+			EnableMenuItem(TransMenu,5,MF_BYPOSITION | MF_ENABLED); /* Quick-VAN */
 		}
 		if ((cv.PortType==IdSerial) &&
 		    (ts.DataBit==IdDataBit7)) {
-			EnableMenuItem(TransMenu,2,MF_BYPOSITION | MF_GRAYED); /* ZMODEM */
-			EnableMenuItem(TransMenu,3,MF_BYPOSITION | MF_GRAYED); /* B-Plus */
+			EnableMenuItem(TransMenu,3,MF_BYPOSITION | MF_GRAYED); /* ZMODEM */
+			EnableMenuItem(TransMenu,4,MF_BYPOSITION | MF_GRAYED); /* B-Plus */
 		}
 		else {
-			EnableMenuItem(TransMenu,2,MF_BYPOSITION | MF_ENABLED); /* ZMODEM */
-			EnableMenuItem(TransMenu,3,MF_BYPOSITION | MF_ENABLED); /* B-Plus */
+			EnableMenuItem(TransMenu,3,MF_BYPOSITION | MF_ENABLED); /* ZMODEM */
+			EnableMenuItem(TransMenu,4,MF_BYPOSITION | MF_ENABLED); /* B-Plus */
 		}
 	}
 	else if (SubMenu == EditMenu)