[Ttssh2-commit] [3279] メニューの " Send break" を無効にする DisableAcceleratorMenu を追加した。

svnno****@sourc***** svnno****@sourc*****
2009年 4月 6日 (月) 21:24:31 JST


Revision: 3279
          http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3279
Author:   maya
Date:     2009-04-06 21:24:31 +0900 (Mon, 06 Apr 2009)

Log Message:
-----------
メニューの "Send break" を無効にする DisableAcceleratorMenu を追加した。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/en/html/setup/teraterm.html
    trunk/doc/jp/html/about/history.html
    trunk/doc/jp/html/setup/teraterm-misc.html
    trunk/doc/jp/html/setup/teraterm.html
    trunk/installer/release/TERATERM.INI
    trunk/installer/teraterm.iss
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/doc/en/html/about/history.html	2009-04-06 12:24:31 UTC (rev 3279)
@@ -38,6 +38,10 @@
          NOTE: Input ^[ by using Control-V Control-[.
         </pre>
       </li>
+      <li>The DisableAcceleratorMenu can be disabled "Send break" menu.
+        <ul>
+          <li>added <a href="../setup/teraterm-misc.html#DisableAcceleratorMenu">DisableAcceleratorMenu</a> in teraterm.ini file. The default is off.</li>
+        </ul></li>
     </ul></li>
 
   <li>Misc

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2009-04-06 12:24:31 UTC (rev 3279)
@@ -136,5 +136,21 @@
 </pre>
 
 
+<h1><a name="DisableAcceleratorMenu">Disable "Send break" menu</a></h1>
+
+<p>
+In order to disable "Send break" menu, change the DisableAcceleratorMenu line at [Tera Term] section of the setup file like the following:
+</p>
+
+<pre>
+DisableAcceleratorMenu=on
+</pre>
+
+<pre>
+Default:
+DisableAcceleratorMenu=off
+</pre>
+
+
 </BODY>
 </HTML>

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/doc/en/html/setup/teraterm.html	2009-04-06 12:24:31 UTC (rev 3279)
@@ -114,6 +114,7 @@
  <li><a href="teraterm-misc.html#mousewheel">Mouse wheel action in application cursor mode</a></li>
  <li><a href="teraterm-misc.html#hostdlg">Showing "New Connection" dialog on startup</a></li>
  <li><a href="teraterm-misc.html#DisablePasteMouseMButton">Enable paste by clicking the middle button of mouse</a></li>
+ <li><a href="teraterm-misc.html#DisableAcceleratorMenu">Disable "Send break" menu</a></li>
 </ul>
 
 </body>

Modified: trunk/doc/jp/html/about/history.html
===================================================================
--- trunk/doc/jp/html/about/history.html	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/doc/jp/html/about/history.html	2009-04-06 12:24:31 UTC (rev 3279)
@@ -38,12 +38,17 @@
          ’: ^[ ‚ÍControl-V Control-[‚Å“ü—Í‚·‚é
         </pre>
       </li>
+      <li>ƒƒjƒ…[‚Ì Send break ‚𖳌ø‚É‚Å‚«‚é‚悤‚É‚µ‚½B
+        <ul>
+          <li>teraterm.ini ‚É <a href="../setup/teraterm-misc.html#DisableAcceleratorMenu">DisableAcceleratorMenu</a> ƒGƒ“ƒgƒŠ‚ð’ljÁ‚µ‚½BƒfƒtƒHƒ‹ƒg‚Í offB</li>
+        </ul></li>
     </ul></li>
-    
+
   <li>‚»‚Ì‘¼
     <ul>
       <li><a href="#ttssh_2.51">SSH2‘ΉžTTSSH(2.51)</a>‚֍·‚µ‘Ö‚¦‚½</li>
     </ul></li>
+
 </ul>
 
 

Modified: trunk/doc/jp/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/jp/html/setup/teraterm-misc.html	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/doc/jp/html/setup/teraterm-misc.html	2009-04-06 12:24:31 UTC (rev 3279)
@@ -163,5 +163,21 @@
 </pre>
 
 
+<h1><a name="DisableAcceleratorMenu">ƒƒjƒ…[‚Ì Send break ‚𖳌ø‚É‚·‚é</a></h1>
+
+<p>
+ƒƒjƒ…[‚Ì "Send break" ‚𖳌ø‚É‚·‚é‚ɂ́AÝ’èƒtƒ@ƒCƒ‹‚Ì [Tera Term] ƒZƒNƒVƒ‡ƒ“‚Ì DisableAcceleratorMenu s‚ðˆÈ‰º‚̂悤‚ɕύX‚µ‚Ä‚­‚¾‚³‚¢B
+</p>
+
+<pre>
+DisableAcceleratorMenu=on
+</pre>
+
+<pre>
+È—ªŽž:
+DisableAcceleratorMenu=off
+</pre>
+
+
 </BODY>
 </HTML>

Modified: trunk/doc/jp/html/setup/teraterm.html
===================================================================
--- trunk/doc/jp/html/setup/teraterm.html	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/doc/jp/html/setup/teraterm.html	2009-04-06 12:24:31 UTC (rev 3279)
@@ -118,6 +118,7 @@
  <li><a href="teraterm-misc.html#mousewheel">ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒJ[ƒ\ƒ‹ƒ‚[ƒhŽž‚̃}ƒEƒXƒzƒC[ƒ‹‚Ì“®ì</a></li>
  <li><a href="teraterm-misc.html#hostdlg">‹N“®Žž‚Ì "New Connection" ƒ_ƒCƒAƒƒO‚Ì•\Ž¦</a></li>
  <li><a href="teraterm-misc.html#DisablePasteMouseMButton">ƒ}ƒEƒX‚Ì’†ƒ{ƒ^ƒ“‚É‚æ‚é“\‚è•t‚¯‚ð—LŒø‚É‚·‚é</a></li>
+ <li><a href="teraterm-misc.html#DisableAcceleratorMenu">ƒƒjƒ…[‚Ì Send break ‚𖳌ø‚É‚·‚é</a></li>
 </ul>
 
 </body>

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/installer/release/TERATERM.INI	2009-04-06 12:24:31 UTC (rev 3279)
@@ -63,6 +63,9 @@
 ; Send break by Alt-B Accelerator key disabled
 DisableAcceleratorSendBreak=off
 
+; Send break Menu disabled
+DisableAcceleratorMenu=off
+
 ;	ANSI color definition (in the case FullColor=on)
 ;	* UseTextColor should be off, or the background and foreground color of
 ;	  VTColor are assigned to color-number 0 and 7 respectively, even if

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/installer/teraterm.iss	2009-04-06 12:24:31 UTC (rev 3279)
@@ -141,6 +141,8 @@
 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\cyglaunch; Filename: {app}\cyglaunch.exe; WorkingDir: {app}; IconFilename: {app}\cyglaunch.exe; Components: cygterm; Tasks: quickcyglaunch; IconIndex: 0; Flags: createonlyiffileexists
 
 [INI]
+Filename: {app}\teraterm.ini; Section: Tera Term; Key: DisableAcceleratorMenu; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
+Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: DisableAcceleratorMenu; String: off; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
 Filename: {app}\teraterm.ini; Section: Tera Term; Key: PasteDialogSize; String: 330,220; Flags: createkeyifdoesntexist; Components: TeraTerm
 Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: PasteDialogSize; String: 330,220; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
 Filename: {app}\teraterm.ini; Section: TTXKanjiMenu; Key: UseOneSetting; String: off; Flags: createkeyifdoesntexist; Components: Additional_Plugins/TTXKanjiMenu

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/teraterm/common/tttypes.h	2009-04-06 12:24:31 UTC (rev 3279)
@@ -450,6 +450,7 @@
 	WORD DisableWheelToCursorByCtrl;
 	WORD StrictKeyMapping;
 	WORD Wait4allMacroCommand;
+	WORD DisableAcceleratorMenu;
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -885,6 +886,7 @@
  *
  * - At version 4.63, ttset_memfilemap was replaced with ttset_memfilemap_11.
  *   added tttset.Wait4allMacroCommand.
+ *   added tttset.DisableAcceleratorMenu.
  *
  * - At version 4.62, ttset_memfilemap was replaced with ttset_memfilemap_10.
  *   added tttset.DisableMouseTrackingByCtrl.

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/teraterm/teraterm/vtwin.cpp	2009-04-06 12:24:31 UTC (rev 3279)
@@ -1302,7 +1302,12 @@
 	{
 		if (cv.Ready &&
 		    (SendVar==NULL) && (FileVar==NULL)) {
-			EnableMenuItem(ControlMenu,ID_CONTROL_SENDBREAK,MF_BYCOMMAND | MF_ENABLED);
+			if (ts.DisableAcceleratorMenu) {
+				EnableMenuItem(ControlMenu,ID_CONTROL_SENDBREAK,MF_BYCOMMAND | MF_GRAYED);
+			}
+			else {
+				EnableMenuItem(ControlMenu,ID_CONTROL_SENDBREAK,MF_BYCOMMAND | MF_ENABLED);
+			}
 			if (cv.PortType==IdSerial)
 				EnableMenuItem(ControlMenu,ID_CONTROL_RESETPORT,MF_BYCOMMAND | MF_ENABLED);
 			else

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2009-04-03 15:04:41 UTC (rev 3278)
+++ trunk/teraterm/ttpset/ttset.c	2009-04-06 12:24:31 UTC (rev 3279)
@@ -1250,6 +1250,10 @@
 	// added Wait4allMacroCommand (2009.3.23 yutaka)
 	ts->Wait4allMacroCommand =
 		GetOnOff(Section, "Wait4allMacroCommand", FName, FALSE);
+
+	// added DisableAcceleratorMenu (2009.4.6 maya)
+	ts->DisableAcceleratorMenu =
+		GetOnOff(Section, "DisableAcceleratorMenu", FName, FALSE);
 }
 
 void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2152,6 +2156,10 @@
 	// Wait4allMacroCommand
 	WriteOnOff(Section, "Wait4allMacroCommand", FName,
 	           ts->Wait4allMacroCommand);
+
+	// DisableAcceleratorMenu
+	WriteOnOff(Section, "DisableAcceleratorMenu", FName,
+	           ts->DisableAcceleratorMenu);
 }
 
 #define VTEditor "VT editor keypad"



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