[Ttssh2-commit] [5312] ファイル転送 ( 状況 ) ダイアログを隠せるようにした。

svnno****@sourc***** svnno****@sourc*****
2013年 6月 11日 (火) 14:58:50 JST


Revision: 5312
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5312
Author:   doda
Date:     2013-06-11 14:58:48 +0900 (Tue, 11 Jun 2013)
Log Message:
-----------
ファイル転送(状況)ダイアログを隠せるようにした。
[ttssh2-devel 2332], http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=31547
ToDo: ファイル転送ダイアログで、Hide オプションの on/off を選べるようにする。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-trans.html
    trunk/doc/en/html/setup/teraterm.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/setup/teraterm-trans.html
    trunk/doc/ja/html/setup/teraterm.html
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/doc/en/html/about/history.html	2013-06-11 05:58:48 UTC (rev 5312)
@@ -38,6 +38,10 @@
     <ul>
       <li>added the Undo menu under the <a href="../menu/window.html">Window menu</a> when Tera Term's windows are arranged.</li>
       <li>Top Most window is sorted by the Stacked and Side By Side under the <a href="../menu/window.html">Window menu</a>.</li>
+      <!-- li>\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x81A\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8F󋵃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x82悤\x82ɏo\x97\x88\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini\x82\xC9<a href="../setup/teraterm-trans.html#hidetransdialog">FTHideDialog</a>\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81BSpecial thanks to Teodor Robas.</li>
+        </ul></li -->
       <li>Macro
         <ul>
           <li>added the "Command not supported." new message in the <a href="../macro/appendixes/errormessages.html">Error messages</a>.</li>

Modified: trunk/doc/en/html/setup/teraterm-trans.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-trans.html	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/doc/en/html/setup/teraterm-trans.html	2013-06-11 05:58:48 UTC (rev 5312)
@@ -304,8 +304,7 @@
 <h1><a name="draganddrop">Confirmation of File Transfer by Drag &amp; Drop</a></h1>
 
 <p>
-Tera Term displays a message box to confirm the file transfer operation when a file is dragged and dropped in a window as a default.<br>
-If ConfirmFileDragAndDrop line in "Tera Term" section of setup file is modified as follows, a file transfer will be started without a confirmation.
+Tera Term displays a message box to confirm the file transfer operation when a file is dragged and dropped in a window as a default.  If ConfirmFileDragAndDrop line in "Tera Term" section of setup file is modified as follows, a file transfer will be started without a confirmation.
 </p>
 
 <pre>
@@ -318,5 +317,24 @@
 </pre>
 
 
+<!--
+<h1><a name="hidetransdialog">\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x82̓]\x91\x97\x8F󋵃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2</a></h1>
+
+<p>
+Tera Term \x82́A\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x82ɑ\x97\x90M\x8Dςݗe\x97ʓ\x99\x82̓]\x91\x97\x8F󋵂\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB5\x82܂\xB7\x81B
+\x82\xB1\x82̃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC HideFTDialog \x8Ds\x82\xF0\x89\xBA\x8BL\x82̂悤\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+FTHideDialog=on
+</pre>
+
+<pre>
+default:
+FTHideDialog=off
+</pre>
+-->
+
+
 </BODY>
 </HTML>

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/doc/en/html/setup/teraterm.html	2013-06-11 05:58:48 UTC (rev 5312)
@@ -133,6 +133,7 @@
  <li><a href="teraterm-trans.html#zmodemrecv">Receive command for ZMODEM</a></li>
  <li><a href="teraterm-trans.html#filter">File name filter for send file dialog</a></li>
  <li><a href="teraterm-trans.html#draganddrop">Confirmation of File Transfer by Drag &amp; Drop</a></li>
+ <!-- li><a href="teraterm-trans.html#hidetransdialog">\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x82̓]\x91\x97\x8F󋵃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2</a></li -->
 </ul>
 
 <h3>Printing</h3>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/doc/ja/html/about/history.html	2013-06-11 05:58:48 UTC (rev 5312)
@@ -38,6 +38,10 @@
     <ul>
       <li>\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x95\xC0\x82ׂĕ\\x8E\xA6\x82\xB5\x82\xBD\x8C\xE3\x81A<a href="../menu/window.html">Window\x83\x81\x83j\x83\x85\x81[</a>\x82Ɍ\xB3\x82ɖ߂\xB7\x83\x81\x83j\x83\x85\x81[\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
       <li><a href="../menu/window.html">Window\x83\x81\x83j\x83\x85\x81[</a>\x82́u\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6(Stacked)\x81v\x81u\x8D\xB6\x89E\x82ɕ\xC0\x82ׂĕ\\x8E\xA6(Side By Side)\x81v\x82ɂ\xA8\x82\xA2\x82āA\x8F\xED\x82ɍőO\x96ʂɕ\\x8E\xA6(Top Most)\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x83E\x83B\x83\x93\x83h\x83E\x82\xE0\x95\xC0\x82ёւ\xA6\x91ΏۂƂ\xB5\x82\xBD\x81B</li>
+      <li>\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x81A\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8F󋵃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x82悤\x82ɏo\x97\x88\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini\x82\xC9<a href="../setup/teraterm-trans.html#hidetransdialog">FTHideDialog</a>\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81BTeodor Robas\x8E\x81\x82Ɋ\xB4\x8Eӂ\xB5\x82܂\xB7\x81B</li>
+        </ul></li>
       <li>\x83}\x83N\x83\x8D
         <ul>
           <li><a href="../macro/appendixes/errormessages.html">\x83G\x83\x89\x81[\x83\x81\x83b\x83Z\x81[\x83W</a>\x82\xC9"Command not supported."\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>

Modified: trunk/doc/ja/html/setup/teraterm-trans.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-trans.html	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/doc/ja/html/setup/teraterm-trans.html	2013-06-11 05:58:48 UTC (rev 5312)
@@ -380,8 +380,7 @@
 <h1><a name="draganddrop">\x83h\x83\x89\x83b\x83O&amp;\x83h\x83\x8D\x83b\x83v\x82ɂ\xE6\x82\xE9\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x82̊m\x94F</a></h1>
 
 <p>
-Tera Term \x82́A\x83f\x83t\x83H\x83\x8B\x83g\x82ł̓t\x83@\x83C\x83\x8B\x82\xF0\x83E\x83C\x83\x93\x83h\x83E\x82Ƀh\x83\x89\x83b\x83O&amp;\x83h\x83\x8D\x83b\x83v\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɁA\x83t\x83@\x83C\x83\x8B\x82\xF0\x93]\x91\x97\x82\xB7\x82邩\x82ǂ\xA4\x82\xA9\x8Am\x94F\x82̃\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x81B<br>
-\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC ConfirmFileDragAndDrop \x8Ds\x82\xF0\x89\xBA\x8BL\x82̂悤\x82ɕύX\x82\xB7\x82\xE9\x82ƁA\x8Am\x94F\x82\xF0\x82\xB9\x82\xB8\x82Ƀt\x83@\x83C\x83\x8B\x82̓]\x91\x97\x82\xF0\x8AJ\x8En\x82\xB5\x82܂\xB7\x81B
+Tera Term \x82́A\x83f\x83t\x83H\x83\x8B\x83g\x82ł̓t\x83@\x83C\x83\x8B\x82\xF0\x83E\x83C\x83\x93\x83h\x83E\x82Ƀh\x83\x89\x83b\x83O&amp;\x83h\x83\x8D\x83b\x83v\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɁA\x83t\x83@\x83C\x83\x8B\x82\xF0\x93]\x91\x97\x82\xB7\x82邩\x82ǂ\xA4\x82\xA9\x8Am\x94F\x82̃\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x81B\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC ConfirmFileDragAndDrop \x8Ds\x82\xF0\x89\xBA\x8BL\x82̂悤\x82ɕύX\x82\xB7\x82\xE9\x82ƁA\x8Am\x94F\x82\xF0\x82\xB9\x82\xB8\x82Ƀt\x83@\x83C\x83\x8B\x82̓]\x91\x97\x82\xF0\x8AJ\x8En\x82\xB5\x82܂\xB7\x81B
 </p>
 
 <pre>
@@ -394,5 +393,22 @@
 </pre>
 
 
+<h1><a name="hidetransdialog">\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x82̓]\x91\x97\x8F󋵃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2</a></h1>
+
+<p>
+Tera Term \x82́A\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x82ɑ\x97\x90M\x8Dςݗe\x97ʓ\x99\x82̓]\x91\x97\x8F󋵂\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB5\x82܂\xB7\x81B
+\x82\xB1\x82̃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x82ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC HideFTDialog \x8Ds\x82\xF0\x89\xBA\x8BL\x82̂悤\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+FTHideDialog=on
+</pre>
+
+<pre>
+\x8Fȗ\xAA\x8E\x9E:
+FTHideDialog=off
+</pre>
+
+
 </BODY>
 </HTML>

Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/doc/ja/html/setup/teraterm.html	2013-06-11 05:58:48 UTC (rev 5312)
@@ -137,6 +137,7 @@
  <li><a href="teraterm-trans.html#zmodemrecv">ZMODEM \x82̎\xF3\x90M\x83R\x83}\x83\x93\x83h</a></li>
  <li><a href="teraterm-trans.html#filter">\x91\x97\x90M\x83_\x83C\x83A\x83\x8D\x83O\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x83t\x83B\x83\x8B\x83^</a></li>
  <li><a href="teraterm-trans.html#draganddrop">\x83h\x83\x89\x83b\x83O&amp;\x83h\x83\x8D\x83b\x83v\x82ɂ\xE6\x82\xE9\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x82̊m\x94F</a></li>
+ <li><a href="teraterm-trans.html#hidetransdialog">\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x8E\x9E\x82̓]\x91\x97\x8F󋵃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2</a></li>
 </ul>
 
 <h3>\x88\xF3\x8D\xFC</h3>

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/installer/release/TERATERM.INI	2013-06-11 05:58:48 UTC (rev 5312)
@@ -327,6 +327,9 @@
 ; Binary flag for Send File (on/off)
 TransBin=off
 
+; without transfer dialog flag for Send File (on/off)
+FTHideDialog=off
+
 ; Binary flag for Log (on/off)
 LogBinary=off
 ; Log append (on/off)

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/teraterm/common/tttypes.h	2013-06-11 05:58:48 UTC (rev 5312)
@@ -513,6 +513,7 @@
 	WORD MouseEventTracking;
 	WORD KillFocusCursor;
 	WORD LogHideDialog;
+	WORD FTHideDialog;
 	int TerminalOldWidth;
 	int TerminalOldHeight;
 	WORD MaximizedBugTweak;
@@ -1031,6 +1032,9 @@
  * - At version 4.79, ttset_memfilemap was replaced with ttset_memfilemap_21.
  *   added TMap.WinUndoFlag
  *
+ * - At version 4.78,
+ *   added tttset.FTHideDialog
+ *
  * - At version 4.78, ttset_memfilemap was replaced with ttset_memfilemap_20.
  *   added tttset.LogRotate
  *   added tttset.LogRotateSize

Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/teraterm/teraterm/filesys.cpp	2013-06-11 05:58:48 UTC (rev 5312)
@@ -207,6 +207,7 @@
 
 	fv->StartTime = 0;
 	fv->ProgStat = 0;
+	fv->HideDialog = ts.FTHideDialog;
 
 	if (FTDlg!=NULL)
 	{

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2013-06-11 05:23:50 UTC (rev 5311)
+++ trunk/teraterm/ttpset/ttset.c	2013-06-11 05:58:48 UTC (rev 5312)
@@ -762,6 +762,9 @@
 	/* Log without transfer dialog */
 	ts->LogHideDialog = GetOnOff(Section, "LogHideDialog", FName, FALSE);
 
+	/* File Transfer dialog visibility */
+	ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);
+
 	/* Default Log file name (2006.8.28 maya) */
 	GetPrivateProfileString(Section, "LogDefaultName", "teraterm.log",
 	                        ts->LogDefaultName, sizeof(ts->LogDefaultName),



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