svnno****@sourc*****
svnno****@sourc*****
2010年 2月 14日 (日) 14:09:56 JST
Revision: 3777 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3777 Author: maya Date: 2010-02-14 14:09:56 +0900 (Sun, 14 Feb 2010) Log Message: ----------- Additional settings ã« Control Sequence ã¿ãã追å å¶å¾¡ã·ã¼ã±ã³ã¹ã®è¨å®é ç®ã移å ããã¤ãã®è¨å®é ç®ãUIä¸ã«ç§»å è¨å®é ç®åãINIã®ãã¼åã®ã¾ã¾ãªã®ãä¿®æ£ Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/en/html/menu/setup-additional.html trunk/doc/en/html/setup/teraterm-win.html trunk/doc/en/html/setup/teraterm.html trunk/doc/ja/html/about/history.html trunk/doc/ja/html/menu/setup-additional.html trunk/doc/ja/html/setup/teraterm-win.html trunk/doc/ja/html/setup/teraterm.html trunk/installer/release/lang/English.lng trunk/installer/release/lang/German.lng trunk/installer/release/lang/Japanese.lng trunk/teraterm/common/tt_res.h trunk/teraterm/teraterm/addsetting.cpp trunk/teraterm/teraterm/addsetting.h trunk/teraterm/teraterm/ttermpro.rc -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/en/html/about/history.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -44,12 +44,16 @@ <li>A user can change the setup value on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li> </ul></li> <li>added support for overwritten confirmation at the "<a href="../macro/command/filenamebox.html">filenamebox</a>" macro command.</li> - <li>added the <a href="../setup/teraterm-win.html#CursorCtrlSequence">CursorCtrlSequence</a> entry on the Additional Settings dialog.</li> <!--li>EBhE^Cg/ACRxñ§äV[PXÉεÄAó¶ñðoéæ¤Éµ½B <ul> - <li>teraterm.ini Ì <a href="../setup/teraterm-win.html#TitleReportSequence">TitleReportSequence</a> GgÅó¯t¯élð accept, ignore, empty ÉÏXµ½B</li> + <li>teraterm.ini Ì TitleReportSequence GgÅó¯t¯élð accept, ignore, empty ÉÏXµ½B</li> <li>changed the default value of "TitleReportSequence" to "empty".</li> </ul></li--> + <li>added Contorl Sequence tab on the <a href="../menu/setup-additional.html">Additional settings dialog</a> + <ul> + <li>moved "Accept mouse event tracking request", "Disable mouse event tracking when Control is pressed" and "Accept window title change request" from General tab.</li> + <li>added "Title report sequence", "Window control sequence", "Window report sequence" and "Cursor control sequence".</li> + </ul></li> <li>added support for alternate screen buffer. <ul> <li>added the <a href="../setup/teraterm-term.html#AltScr">AlternateScreenBuffer</a> entry in the teraterm.ini file. The default value is on.</li> Modified: trunk/doc/en/html/menu/setup-additional.html =================================================================== --- trunk/doc/en/html/menu/setup-additional.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/en/html/menu/setup-additional.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -11,45 +11,56 @@ <body> <h1>Additional settings([Setup] Menu)</h1> + <h2>"General" Tab</h2> <dl> - <dt>EnableClickableURL</dt> + <dt>Enable clickable URL</dt> <dd> Launches the web browser by clicking URL string. </dd> - <dt>DisableAcceleratorSendBreak</dt> + <dt>Disable accelerator send break</dt> <dd> Disables accelerator key of send break. </dd> - <dt>AcceptBroadcast</dt> + <dt>Accept broadcast</dt> <dd> Accept the broadcast command. </dd> - <dt>MouseWheelScrollLine</dt> + <dt>Mouse wheel scroll line</dt> <dd> Configures the mouse wheel scroll line. </dd> - <dt>AutoScrollOnlyInBottomLine</dt> + <dt>Auto scroll only in bottom line</dt> <dd> Stop auto scrolling except when the bottom line is displayed. </dd> - <dt>Accept Mouse Event Tracking</dt> + <dt>Clear display when window resized</dt> <dd> + <!--VTEBhEÌTCYðÏXµ½ÉA\¦àeðNA·é©Ç¤©ðÝèµÜ·B--> + </dd> + + </dl> + + + <h2>"Control Sequence" Tab</h2> + <dl> + <dt>Accept mouse event tracking</dt> + <dd> Tera Term would send the escape sequence of the mouse operation when VT window is changed to the mouse tracking mode by the host application.<br> However, TERM environment variable should be "xterm" type. </dd> - <dt>Disable Mouse Event Tracking when Control is pressed</dt> + <dt>Disable mouse event tracking when Control is pressed</dt> <dd> The mouse tracking mode is enabled, TeraTerm does not send the mouse operation while the control key is pressed. </dd> - <dt>Accept Window Title Change Request</dt> + <dt>Accept window title change request</dt> <dd> Configures whether a user accepts the window title changing. <dl> @@ -64,38 +75,89 @@ </dl> </dd> - <dt>Clear display when window resized</dt> + <dt>Window title report</dt> <dd> - <!--VTEBhEÌTCYðÏXµ½ÉA\¦àeðNA·é©Ç¤©ðÝèµÜ·B--> + <!--dtterm ÌEBhE^Cg¨æÑACRxñvÉεÄAÇÌæ¤É·é©ðÏXÅ«Ü·B--> + <dl> + <dt>ignore</dt> + <dd>Ignore a window title reporting request.</dd> + <dt>accept</dt> + <!--dd>»ÝÌEBhE^Cgðñ·éB½¾µA»ÝÌ»ÝÌEBhE^Cgðñ·éÌÍZL eBãë¯Å·ÌÅA{ÉKvÈÌݱÌÝèðs¤æ¤ÉµÄ¾³¢B</dd--> + <dt>empty</dt> + <dd>Report empty string.</dd> + </dl> </dd> - <dt>CursorCtrlSequence</dt> + <dt>Window control sequence</dt> <dd> - Enables the control sequence for the cursor shape. + added support for the position moving, the minimization, the maximization, the most front, the most back, the refresh and the window size changing(per pixel and character) control sequences regarding the dtterm window operation. </dd> + <dt>Window report sequence</dt> + <dd> + This function enables the ddterm control sequence such as the window status reporting, the window position reporting, the window size(in pixcel and character) reporting and the root window size reporting, among the window information reporting features.<br> + If you do not want window informations to be sent to remote host by some reason such as security, please disable this setting. + </dd> + + <dt>Cursor control sequence</dt> + <dd> + Enables the control sequence for the cursor shape.<br> + This function enables cursor shape change by cursor change seqnence of DECSCUSR(cursor shape change), WYSTCURM(Wyse no-blinking cursor), WYULCURM(Wyse underlined cursor) and AT&T 610 blinking cursor.<br><br> + + If a user uses the vim editor, write below entries in the ~/.vimrc to enable this feature. + +<pre> +set t_SI=^[[3\ q +set t_EI=^[[1\ q +NOTE: Input ^[ by using Control-V Control-[. +</pre> + + If the cursor periodically blinks after an application exits, a user should configure as follows.<br> + In the ncurses 5.7 terminfo, the invisible(civis)/normal display(cnorm)/highlighting(cvvis) of the xterm cursor are as follows: + +<pre> +civis=\E[?25l +cnorm=\E[?12l\E[?25h +cvvis=\E[?12;25h +</pre> + + When the upper configuration is enabled, the normal cursor displays with the non-blinking mode and the emphasis cursor displays with the blinking mode. + So, the cursor does not blink when the terminfo application displays the own cursor.<br> + If a user want to blink the cursor, turn off the CursorCtrlSequence entry or do in the following commands: + +<pre> +% infocmp xterm > xterm.ti +Open the xterm.ti file, change from a value of cnorm and cvvis to \E?25h. +% tic -o ~/.terminfo xterm.ti +Execute the tic command. +# tic xterm.ti +If the configuration is enabled as whole system, execute the upper command with a root user. +</pre> + </dd> + </dl> + <h2>"Copy and Paste" Tab</h2> <dl> - <dt><a name="continuedline">EnableContinuedLineCopy</a></dt> + <dt><a name="continuedline">Enable continued line copy</a></dt> <dd> Concatenates current line with the next line including word characters when the whole line is stepped over. </dd> - <dt>DisableMouseRButtonPaste</dt> + <dt>Disable mouse R button paste</dt> <dd> Disables pasting clipboard data when mouse right button is clicked. </dd> - <dt>ConfirmMouseRButtonPaste</dt> + <dt>Confirm mouse R button paste</dt> <dd> Displays popup menu and confirm pasting clipboard data when mouse right button is clicked. </dd> - <dt>SelectOnlyByLButton</dt> + <dt>Select only by L button</dt> <dd> Enable selection by mouse drag only with left button. </dd> @@ -107,7 +169,7 @@ This is a foolproof way. </dd> - <dt>StringFile</dt> + <dt>String file</dt> <dd> When the Clipboard includes any strings in the specified file, the confirmation dialog can be shown to paste by right-click or Alt+V. @@ -115,23 +177,24 @@ This function works when the ConfirmChangePaste is enabled. </dd> - <dt>ConfirmChangePasteStringFile</dt> + <dt>Confirm change paste string file</dt> <dd> When a user pastes, the user can specify a keyword file for ConfirmChangePaste except the CR/LF. </dd> - <dt>Delimiter Characters</dt> + <dt>Delimiter characters</dt> <dd> Inludes delimiter characters for the word selection. </dd> - <dt>PasteDelayPerLine</dt> + <dt>Paste delay per line</dt> <dd> A user can delay to send a line data to the remote host when the user pastes multiple lines. The delay time can be specified by this option on the millisecond time scale. </dd> </dl> + <h2>"Visual" tab</h2> <dl> <dt>AlphaBlend</dt> @@ -183,14 +246,15 @@ </dl> + <h2>"Log" tab</h2> <dl> - <dt>View Log Editor</dt> + <dt>View log editor</dt> <dd> Specify the editor that is used for display log file </dd> - <dt>Default Log File Name(strftime format)</dt> + <dt>Default log file name(strftime format)</dt> <dd> Specify default log file name. It can include a format of strftime. <pre> @@ -223,7 +287,7 @@ </pre> </dd> - <dt>Default Log Save Folder</dt> + <dt>Default log save folder</dt> <dd> Specify default path to save log file. It is used when the log file name is not a full path. </dd> @@ -234,9 +298,10 @@ </dd> </dl> + <h2>"Cygwin" tab</h2> <dl> - <dt>Cygwin Install Path</dt> + <dt>Cygwin install path</dt> <dd> Specify the install directory of Cygwin. </dd> Modified: trunk/doc/en/html/setup/teraterm-win.html =================================================================== --- trunk/doc/en/html/setup/teraterm-win.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/en/html/setup/teraterm-win.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -546,129 +546,5 @@ </pre> -<h1><a name="WindowCtrlSequence">Enable control sequence for window operation</a></h1> -<p> -added support for the position moving, the minimization, the maximization, the most front, the most back, the refresh and the window size changing(per pixel and character) control sequences regarding the dtterm window operation. -</p> - -<p> -If TeraTerm does not accept the window operation from the remote host, please change the WindowCtrlSequence entry in the teraterm.ini file as follows: -</p> - -<pre> -WindowCtrlSequence=off -</pre> - -<pre> -Default: -WindowCtrlSequence=on -</pre> - - -<h1><a name="WindowReportSequence">Enable control sequence for window information reporting</a></h1> -<p> -This function enables the ddterm control sequence such as the window status reporting, the window position reporting, the window size(in pixcel and character) reporting and the root window size reporting, among the window information reporting features. -</p> - -<p> -If you do not want window informations to be sent to remote host by some reason such as security, please change the WindowReportSequence entry in the teraterm.ini file as follows: -</p> - -<pre> -WindowReportSequence=off -</pre> - -<pre> -Default: -WindowReportSequence=on -</pre> - - -<h1><a name="TitleReportSequence">Change the response to window title reporting request</a></h1> -<!--p> -dtterm ÌEBhE^Cg¨æÑACRxñvÉεÄAÇÌæ¤É·é©ðÏXÅ«Ü·B -</p--> - -<p> -To ignore a window title reporting request, edit the TitleReportSequence line in the [Tera Term] section of the setup file like the following: -<!--ñvÉεĽàµÈ¢æ¤É·éÉÍAÝèt@CÌ [Tera Term] ZNVÌ TitleReportSequence sðȺÌæ¤ÉÏXµÄ¾³¢B--> -</p> - -<pre> -TitleReportSequence=ignore -</pre> - -<p> -Also, Tera Term reports empty string in the following configuration. -<!-- ܽȺÌæ¤É·éÆAEBhE^CgÍó¾Æñ·éæ¤ÉÈèÜ·B --> -</p> - -<pre> -TitleReportSequence=empty -</pre> - -<!--p> -ȺÌæ¤É·éÆA»ÝÌEBhE^Cgðñ·éæ¤ÉÈèÜ·B<br> -½¾µA»ÝÌ»ÝÌEBhE^Cgðñ·éÌÍZL eBãë¯Å·ÌÅA{ÉKvÈÌݱÌÝèðs¤æ¤Éµ -ľ³¢B -</p> - -<pre> -TitleReportSequence=accept -</pre--> - -<pre> -Default: -TitleReportSequence=empty -</pre> - - -<h1><a name="CursorCtrlSequence">Enable control sequence for cursor shape</a></h1> -<p> -This function enables cursor shape change by cursor change seqnence of DECSCUSR(cursor shape change), WYSTCURM(Wyse no-blinking cursor), WYULCURM(Wyse underlined cursor) and AT&T 610 blinking cursor. -</p> - -<pre> -CursorCtrlSequence=on -</pre> - -<pre> -Default: -CursorCtrlSequence=off -</pre> - -<p> -If a user uses the vim editor, write below entries in the ~/.vimrc to enable this feature. -</p> - -<pre> -set t_SI=^[[3\ q -set t_EI=^[[1\ q -NOTE: Input ^[ by using Control-V Control-[. -</pre> - -If the cursor periodically blinks after an application exits, a user should configure as follows. -<br> -In the ncurses 5.7 terminfo, the invisible(civis)/normal display(cnorm)/highlighting(cvvis) of the xterm cursor are as follows: - -<pre> -civis=\E[?25l -cnorm=\E[?12l\E[?25h -cvvis=\E[?12;25h -</pre> - -When the upper configuration is enabled, the normal cursor displays with the non-blinking mode and the emphasis cursor displays with the blinking mode. -So, the cursor does not blink when the terminfo application displays the own cursor.<br> -If a user want to blink the cursor, turn off the CursorCtrlSequence entry or do in the following commands: - -<pre> -% infocmp xterm > xterm.ti -Open the xterm.ti file, change from a value of cnorm and cvvis to \E?25h. -% tic -o ~/.terminfo xterm.ti -Execute the tic command. -# tic xterm.ti -If the configuration is enabled as whole system, execute the upper command with a root user. -</pre> - </body> </html> Modified: trunk/doc/en/html/setup/teraterm.html =================================================================== --- trunk/doc/en/html/setup/teraterm.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/en/html/setup/teraterm.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -65,10 +65,6 @@ <li><a href="teraterm-win.html#killfocus">Display the cursor even if the window comes out of focus</a></li> <li><a href="teraterm-win.html#savevtwinpos">Save the window position</a></li> <li><a href="teraterm-win.html#WindowIcon">Change the window icon</a></li> - <li><a href="teraterm-win.html#WindowCtrlSequence">Enable the control sequence for the window operation</a></li> - <li><a href="teraterm-win.html#WindowReportSequence">Enable the control sequence for the window information reporting</a></li> - <li><a href="teraterm-win.html#TitleReportSequence">Change the response to window title reporting request</a></li> - <li><a href="teraterm-win.html#CursorCtrlSequence">Enable the control sequence for the cursor shape</a></li> </ul> <h3>Communication</h3> Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/ja/html/about/history.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -44,12 +44,17 @@ <li><a href="../menu/setup-additional.html">Additional settings _CAO</a>ÅÝèðÏXÅ«éæ¤Éµ½B</li> </ul></li> <li>}NR}h "<a href="../macro/command/filenamebox.html">filenamebox</a>" Åã«mFðo·æ¤Éµ½B</li> - <li>Additional Settings _CAOÉ <a href="../setup/teraterm-win.html#CursorCtrlSequence">CursorCtrlSequence</a> ðÇÁµ½B</li> + <li>EBhE^Cg/ACRxñ§äV[PXÉεÄAó¶ñðoéæ¤Éµ½B <ul> - <li>teraterm.ini Ì <a href="../setup/teraterm-win.html#TitleReportSequence">TitleReportSequence</a> GgÅó¯t¯élð accept, ignore, empty ÉÏXµ½B</li> + <li>teraterm.ini Ì TitleReportSequence GgÅó¯t¯élð accept, ignore, empty ÉÏXµ½B</li> <li>teraterm.ini Ì TitleReportSequence ÌftHgð empty ÉÏXµ½B</li> </ul></li> + <li><a href="../menu/setup-additional.html">Additional settings _CAO</a>É Contorl Sequence ^uðÇÁµ½B + <ul> + <li>"Accept mouse event tracking request", "Disable mouse event tracking when Control is pressed", "Accept window title change request" ð General ^u©çÚ®µ½B</li> + <li>"Title report sequence", "Window control sequence", "Window report sequence", "Cursor control sequence" ðÇÁµ½B</li> + </ul></li> <li>ãÖæÊobt@Éε½B <ul> <li>teraterm.ini É <a href="../setup/teraterm-term.html#AltScr">AlternateScreenBuffer</a> GgðÇÁµ½BftHgÍ onB</li> Modified: trunk/doc/ja/html/menu/setup-additional.html =================================================================== --- trunk/doc/ja/html/menu/setup-additional.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/ja/html/menu/setup-additional.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -11,45 +11,56 @@ <body> <h1>Additional settingsi[Setup] j [j</h1> + <h2>"General" ^u</h2> <dl> - <dt>EnableClickableURL</dt> + <dt>Enable clickable URL</dt> <dd> URL ð_uNbNµ½Æ«ÉuEUðN®·é@\ðLøɵܷB </dd> - <dt>DisableAcceleratorSendBreak</dt> + <dt>Disable accelerator send break</dt> <dd> Alt-B Å break ðM·é@\ð³øɵܷB </dd> - <dt>AcceptBroadcast</dt> + <dt>Accept broadcast</dt> <dd> u[hLXgR}hðó¯üêÜ·B </dd> - <dt>MouseWheelScrollLine</dt> + <dt>Mouse wheel scroll line</dt> <dd> }EXzC[ÉæéXN[sðÝèµÜ·B </dd> - <dt>AutoScrollOnlyInBottomLine</dt> + <dt>Auto scroll only in bottom line</dt> <dd> źsð\¦µÄ¢È¢óÔÅÍ©®IÉXN[µÈ¢æ¤ÉµÜ·B </dd> - <dt>Accept Mouse Event Tracking</dt> + <dt>Clear display when window resized</dt> <dd> + VTEBhEÌTCYðÏXµ½ÉA\¦àeðNA·é©Ç¤©ðÝèµÜ·B + </dd> + + </dl> + + + <h2>"Control Sequence" ^u</h2> + <dl> + <dt>Accept mouse event tracking</dt> + <dd> zXg¤ÌAvP[VÉæÁÄAVT window ª}EXgbLO[hÉÏX³ê½êATera Term Í}EXìðzXgÖñ·éæ¤ÉÈèÜ·B<br> }EXgbLO[hÍxtermÌg£@\Å·ÌÅATERM«Ϫ"xterm"ÈO¾ÆzXg¤ÌAvP[VͱÌ@\ðgíÈ¢©àµêܹñB </dd> - <dt>Disable Mouse Event Tracking when Control is pressed</dt> + <dt>Disable mouse event tracking when Control is pressed</dt> <dd> }EXgbLO[hAControlL[ª³êÄ¢éÔÍ}EXìðÊmµÈ¢æ¤ÉµÜ·B </dd> - <dt>Accept Window Title Change Request</dt> + <dt>Accept window title change request</dt> <dd> [g©çÌEBhE^CgÏXvðó¯üêé©ðÝèµÜ·B <dl> @@ -64,50 +75,99 @@ </dl> </dd> - <dt>Clear display when window resized</dt> + <dt>Window title report</dt> <dd> - VTEBhEÌTCYðÏXµ½ÉA\¦àeðNA·é©Ç¤©ðÝèµÜ·B + dtterm ÌEBhE^Cg¨æÑACRxñvÉεÄAÇÌæ¤É·é©ðÏXÅ«Ü·B + <dl> + <dt>ignore</dt> + <dd>ñvÉεĽàµÈ¢æ¤É·é</dd> + <dt>accept</dt> + <dd>»ÝÌEBhE^Cgðñ·éB½¾µA»ÝÌ»ÝÌEBhE^Cgðñ·éÌÍZL eBãë¯Å·ÌÅA{ÉKvÈÌݱÌÝèðs¤æ¤ÉµÄ¾³¢B</dd> + <dt>empty</dt> + <dd>EBhE^CgÍó¾Æñ·é</dd> + </dl> </dd> - <dt>CursorCtrlSequence</dt> + <dt>Window control sequence</dt> <dd> - J[\`óð§ä·éV[PXðgp·é©Ç¤©ðÝèµÜ·B + ±ÌÝèª on ÉÈÁÄ¢éÆAdttermÌEBhEì§äV[PXÌàAÊuÚ®, Ŭ», Åå», ÅOÊÚ®, ÅwÊÚ®, tbV , EBhETCYÏX(sNZPÊ, ¶PÊ) ªLøÉÈèÜ·B </dd> + <dt>Window report sequence</dt> + <dd> + ±ÌÝèª on ÉÈÁÄ¢éÆAdttermÌEBhEîñņ̃äV[PXÌàAEBhEóÔñ, EBhEÊuñ, EBhETCYñ(sNZPÊ, ¶PÊ), [gEBhETCYñ ªLøÉÈèÜ·B<br> + ZL eBãÌRÅEBhEÌîñðñµ½È¢êͳøɵľ³¢B + </dd> + <dt>Cursor control sequence</dt> + <dd> + J[\`óð§ä·éV[PXðgp·é©Ç¤©ðÝèµÜ·B<br> + ±ÌÝèª on ÉÈÁÄ¢éÆADECSCUSR(J[\`óÏX), WYSTCURM(Wyseñ_ÅJ[\), WYULCURM(WyseºüJ[\), AT&T 610ÌJ[\_ŧäV[PXɶÄAJ[\`óªÏX³êÜ·B<br><br> + + vimðgpµÄ¢éêA±Ì@\ð on ÉµÄ ~/.vimrc ÉȺÌæ¤ÉÇÁ·éÆüÍ[hɶÄJ[\`óªÏíéæ¤ÉÈèÜ·B + +<pre> +set t_SI=^[[3\ q +set t_EI=^[[1\ q +: ^[ ÍControl-V Control-[ÅüÍ·é +</pre> + + AvP[VI¹ãÉAJ[\ð_ÅóÔÉß·ÉÍAȺÌæ¤ÉÝèðµÜ·B<br> + ncurses 5.7 Ì terminfo ÅÍ xterm ÌJ[\Ìñ\¦(civis)/Êí\¦(cnorm)/²\¦(cvvis)Í»ê¼êȺÌæ¤ÉÈÁĢܷB + +<pre> +civis=\E[?25l +cnorm=\E[?12l\E[?25h +cvvis=\E[?12;25h +</pre> + + ±ÌÝè¾ÆAJ[\ÌÊí\¦Íñ_ÅÉA²\¦Í_Å·éæ¤ÉÈèÜ·B + ±Ì½ß terminfo ÎÌAvP[VªJ[\ðÊí\¦µæ¤Æµ½É_ŵÈÈèÜ·B<br> + ÎƵÄÍAJ[\Ì_ŧäð³·é×É CursorCtrlSequence ð off ÉÝè·é©AJ[\\¦óÔÏXÉ_ÅóÔðÏXµÈ¢æ¤ÉȺÌèðzXg¤ÅÀ{µÄ¾³¢B + +<pre> +% infocmp xterm > xterm.ti +¶¬³ê½xterm.tiðÒWµAcnorm, cvvisÌlð \E?25h ÉÏX·é +% tic -o ~/.terminfo xterm.ti +VXeSÌɽf³¹é½ßÉÍ root ÅȺðÀs +# tic xterm.ti +</pre> + </dd> + </dl> + <h2>"Copy and Paste" ^u</h2> <dl> - <dt><a name="continuedline">EnableContinuedLineCopy</a></dt> + <dt><a name="continuedline">Enable continued line copy</a></dt> <dd> p±µÄ¢ésðüs¹¸ÉRs[·é@\ðLøɵܷB </dd> - <dt>DisableMouseRButtonPaste</dt> + <dt>Disable mouse R button paste</dt> <dd> ENbNÅNbv{[hÌàeð\èt¯é@\ð³øɵܷB </dd> - <dt>ConfirmMouseRButtonPaste</dt> + <dt>Confirm mouse R button paste</dt> <dd> ENbNÅNbv{[hÌàeð\èt¯éÆ«A |bvAbvj [ÅmF·é@\ðLøɵܷB </dd> - <dt>SelectOnlyByLButton</dt> + <dt>Select only by L button</dt> <dd> }EXhbOÉæéIððA¶{^ÅÌÝLøÉ·éB </dd> - <dt>ConfirmChangePaste</dt> + <dt>Confirm change paste</dt> <dd> Nbv{[hÉüsR[h(CR/LF)ðÜÞêA}EXÌENbN¨æÑAlt+VÅ Tera TermEBhEÖ\èt¯æ¤Æ·é^C~OÅAmF_CAOð\¦³¹é±ÆªÅ«Ü·B ëìÉæèA[Ö\ú¹ÊR}hüðh®±ÆªÅ«Ü·B </dd> - <dt>StringFile</dt> + <dt>String file</dt> <dd> Nbv{[hÉA±ÌÝèÅwèµ½t@CàɶݷéeLXgªÜÜêéêA}EXÌENbN¨æÑAlt+VÅ Tera TermEBhEÖ\èt¯æ¤Æ·é^C~OÅAmF_CAOð\¦³¹é±ÆªÅ«Ü·B @@ -115,23 +175,24 @@ ±ÌÝèÍAConfirmChangePasteÌÝèªLøÈêÉìpµÜ·B </dd> - <dt>ConfirmChangePasteStringFile</dt> + <dt>Confirm change paste string file</dt> <dd> y[XgÉAüsR[hÈOÉxµ½¢L[[hðñµ½t@Cðwè·é±ÆªÅ«Ü·B </dd> - <dt>Delimiter Characters</dt> + <dt>Delimiter characters</dt> <dd> PêIðÌæØè¶ðÝèµÜ·B </dd> - <dt>PasteDelayPerLine</dt> + <dt>Paste delay per line</dt> <dd> ¡sÌf[^ð\èt¯éÆ«Aüsª»êé²ÆÉf[^ÌMðx³¹é±ÆªÅ«Ü·Bx·éÔð~bÅÝèµÜ·B </dd> </dl> + <h2>"Visual" ^u</h2> <dl> <dt>AlphaBlend</dt> @@ -183,14 +244,15 @@ </dl> + <h2>"Log" ^u</h2> <dl> - <dt>View Log Editor</dt> + <dt>View log editor</dt> <dd> Oð\¦·éGfB^ðwèµÜ·B </dd> - <dt>Default Log File Name(strftime format)</dt> + <dt>Default log file name(strftime format)</dt> <dd> WÌOt@C¼ðwèµÜ·Bstrftime Ì®ªgpÅ«Ü·B <pre> @@ -223,7 +285,7 @@ </pre> </dd> - <dt>Default Log Save Folder</dt> + <dt>Default log save folder</dt> <dd> WÌOÛ¶æðwèµÜ·BOt@CªtpXÅwè³êÈ©Á½Æ«Égp³êÜ·B </dd> @@ -234,9 +296,10 @@ </dd> </dl> + <h2>"Cygwin" ^u</h2> <dl> - <dt>Cygwin Install Path</dt> + <dt>Cygwin install path</dt> <dd> Cygwin ÌCXg[æðwèµÜ·B </dd> Modified: trunk/doc/ja/html/setup/teraterm-win.html =================================================================== --- trunk/doc/ja/html/setup/teraterm-win.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/ja/html/setup/teraterm-win.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -563,125 +563,5 @@ </pre> -<h1><a name="WindowCtrlSequence">EBhEì̧äV[PXðgp·é</a></h1> -<p> -±ÌÝèª on ÉÈÁÄ¢éÆAdttermÌEBhEì§äV[PXÌàAÊuÚ®, Ŭ», Åå», ÅOÊÚ®, ÅwÊÚ®, tbV , EBhETCYÏX(sNZPÊ, ¶PÊ) ªLøÉÈèÜ·B -</p> - -<p> -[g©çÌEBhEìðó¯üê½È¢êÍAÝèt@CÌ [Tera Term] ZNVÌ WindowCtrlSequence sðȺÌæ¤ÉÏXµÄ¾³¢B -</p> - -<pre> -WindowCtrlSequence=off -</pre> - -<pre> -Ȫ: -WindowCtrlSequence=on -</pre> - - -<h1><a name="WindowReportSequence">EBhEîñņ̃äV[PXðgp·é</a></h1> -<p> -±ÌÝèª on ÉÈÁÄ¢éÆAdttermÌEBhEîñņ̃äV[PXÌàAEBhEóÔñ, EBhEÊuñ, EBhETCYñ(sNZPÊ, ¶PÊ), [gEBhETCYñ ªLøÉÈèÜ·B -</p> - -<p> -ZL eBãÌRÅEBhEÌîñðñµ½È¢êÍAÝèt@CÌ [Tera Term] ZNVÌ WindowReportSequence sðȺÌæ¤ÉÏXµÄ¾³¢B -</p> - -<pre> -WindowReportSequence=off -</pre> - -<pre> -Ȫ: -WindowReportSequence=on -</pre> - - -<h1><a name="TitleReportSequence">EBhE^CgñvÖÌû@ðÏX·é</a></h1> -<p> -dtterm ÌEBhE^Cg¨æÑACRxñvÉεÄAÇÌæ¤É·é©ðÏXÅ«Ü·B -</p> - -<p> -ñvÉεĽàµÈ¢æ¤É·éÉÍAÝèt@CÌ [Tera Term] ZNVÌ TitleReportSequence sðȺÌæ¤ÉÏXµÄ¾³¢B -</p> - -<pre> -TitleReportSequence=ignore -</pre> - -<p> -ܽȺÌæ¤É·éÆAEBhE^CgÍó¾Æñ·éæ¤ÉÈèÜ·B -</p> - -<pre> -TitleReportSequence=empty -</pre> - -<p> -ȺÌæ¤É·éÆA»ÝÌEBhE^Cgðñ·éæ¤ÉÈèÜ·B<br> -½¾µA»ÝÌ»ÝÌEBhE^Cgðñ·éÌÍZL eBãë¯Å·ÌÅA{ÉKvÈÌݱÌÝèðs¤æ¤ÉµÄ¾³¢B -</p> - -<pre> -TitleReportSequence=accept -</pre> - -<pre> -Ȫ: -TitleReportSequence=empty -</pre> - - -<h1><a name="CursorCtrlSequence">J[\`óð§ä·éV[PXðgp·é</a></h1> -<p> -±ÌÝèª on ÉÈÁÄ¢éÆADECSCUSR(J[\`óÏX), WYSTCURM(Wyseñ_ÅJ[\), WYULCURM(WyseºüJ[\), AT&T 610ÌJ[\_ŧäV[PXɶÄAJ[\`óªÏX³êÜ·B -</p> - -<pre> -CursorCtrlSequence=on -</pre> - -<pre> -Ȫ: -CursorCtrlSequence=off -</pre> - -<p> -vimðgpµÄ¢éêA±Ì@\ð on ÉµÄ ~/.vimrc ÉȺÌæ¤ÉÇÁ·éÆüÍ[hɶÄJ[\`óªÏíéæ¤ÉÈèÜ·B -</p> - -<pre> -set t_SI=^[[3\ q -set t_EI=^[[1\ q -: ^[ ÍControl-V Control-[ÅüÍ·é -</pre> - -AvP[VI¹ãÉAJ[\ð_ÅóÔÉß·ÉÍAȺÌæ¤ÉÝèðµÜ·B -<br> -ncurses 5.7 Ì terminfo ÅÍ xterm ÌJ[\Ìñ\¦(civis)/Êí\¦(cnorm)/²\¦(cvvis)Í»ê¼êȺÌæ¤ÉÈÁĢܷB - -<pre> -civis=\E[?25l -cnorm=\E[?12l\E[?25h -cvvis=\E[?12;25h -</pre> - -±ÌÝè¾ÆAJ[\ÌÊí\¦Íñ_ÅÉA²\¦Í_Å·éæ¤ÉÈèÜ·B±Ì½ß terminfo ÎÌAvP[VªJ[\ðÊí\¦µæ¤Æµ½É_ŵÈÈèÜ·B<br> -ÎƵÄÍAJ[\Ì_ŧäð³·é×É CursorCtrlSequence ð off ÉÝè·é©AJ[\\¦óÔÏXÉ_ÅóÔðÏXµÈ¢æ¤ÉȺÌèðzXg¤ÅÀ{µÄ¾³¢B - -<pre> -% infocmp xterm > xterm.ti -¶¬³ê½xterm.tiðÒWµAcnorm, cvvisÌlð \E?25h ÉÏX·é -% tic -o ~/.terminfo xterm.ti -VXeSÌɽf³¹é½ßÉÍ root ÅȺðÀs -# tic xterm.ti -</pre> - - </body> </html> Modified: trunk/doc/ja/html/setup/teraterm.html =================================================================== --- trunk/doc/ja/html/setup/teraterm.html 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/doc/ja/html/setup/teraterm.html 2010-02-14 05:09:56 UTC (rev 3777) @@ -67,10 +67,6 @@ <li><a href="teraterm-win.html#killfocus">tH[JXªOê½ÉàJ[\ð\¦·é</a></li> <li><a href="teraterm-win.html#savevtwinpos">EBhEÊuðÛ¶·é</a></li> <li><a href="teraterm-win.html#WindowIcon">EBhEACRðÏX·é</a></li> - <li><a href="teraterm-win.html#WindowCtrlSequence">EBhEì̧äV[PXðgp·é</a></li> - <li><a href="teraterm-win.html#WindowReportSequence">EBhEîñņ̃äV[PXðgp·é</a></li> - <li><a href="teraterm-win.html#TitleReportSequence">EBhE^CgñvÖÌû@ðÏX·é</a></li> - <li><a href="teraterm-win.html#CursorCtrlSequence">J[\`óð§ä·éV[PXðgp·é</a></li> </ul> <h3>ÊM</h3> Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/installer/release/lang/English.lng 2010-02-14 05:09:56 UTC (rev 3777) @@ -145,40 +145,48 @@ DLG_TABSHEET_TITLE=Tera Term: Additional settings DLG_TABSHEET_TITLE_GENERAL=General +DLG_TABSHEET_TITLE_SEQUENCE=Control Sequence DLG_TABSHEET_TITLE_COPYPASTE=Copy and Paste DLG_TABSHEET_TITLE_VISUAL=Visual DLG_TABSHEET_TITLE_LOG=Log DLG_TABSHEET_TITLE_CYGWIN=Cygwin -DLG_TAB_GENERAL_CLICKURL=&EnableClickableURL -DLG_TAB_GENERAL_DISABLESENDBREAK=DisableAccelerator&SendBreak -DLG_TAB_GENERAL_ACCEPTBROADCAST=Accept&Broadcast -DLG_TAB_GENERAL_MOUSEWHEEL_SCROLL_LINE=Mouse&WheelScrollLine -DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=&AutoScrollOnlyInBottomLine -DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING=Accept &Mouse Event Tracking Request -DLG_TAB_GENERAL_DISABLE_MOUSE_TRACKING_CTRL=&Disable Mouse Event Tracking when Control is pressed -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING=Accept Window &Title Change Request -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OFF=off -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE=overwrite -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AHEAD=ahead -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_LAST=last +DLG_TAB_GENERAL_CLICKURL=&Enable clickable URL +DLG_TAB_GENERAL_DISABLESENDBREAK=Disable accelerator &send break +DLG_TAB_GENERAL_ACCEPTBROADCAST=Accept &broadcast +DLG_TAB_GENERAL_MOUSEWHEEL_SCROLL_LINE=Mouse &wheel scroll line +DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=A&uto scroll only in bottom line DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized -DLG_TAB_GENERAL_CURSOR_CTRL_SEQ=CursorCtrlSe&quence -DLG_TAB_COPYPASTE_CONTINUE=EnableContinued&LineCopy -DLG_TAB_COPYPASTE_MOUSEPASTE=&DisableMouseRButtonPaste -DLG_TAB_COPYPASTE_CONFIRMPASTE=&ConfirmMouseRButtonPaste -DLG_TAB_COPYPASTE_MOUSEPASTEM=DisableMouse&MButtonPaste -DLG_TAB_COPYPASTE_SELECTLBUTTON=Select&OnlyByLButton -DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=ConfirmChange&Paste -DLG_TAB_CONFIRM_STRING_FILE=&StringFile -DLG_TAB_COPYPASTE_DELIMITER=Del&imiter Characters -DLG_TAB_COPYPASTE_PASTEDELAY=P&asteDelayPerLine +DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request +DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING=Accept window &title change request +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OFF=off +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OVERWRITE=overwrite +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_AHEAD=ahead +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_LAST=last +DLG_TAB_SEQENCE_CURSOR_CTRL=&Cursor control sequence +DLG_TAB_SEQENCE_WINDOW_CTRL=&Window control sequence +DLG_TAB_SEQENCE_WINDOW_REPORT=Window &report sequence +DLG_TAB_SEQENCE_TITLE_REPORT=Window t&itle report +DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=ignore +DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT=accept +DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=empty + +DLG_TAB_COPYPASTE_CONTINUE=Enable continued &line copy +DLG_TAB_COPYPASTE_MOUSEPASTE=&Disable mouse R button paste +DLG_TAB_COPYPASTE_CONFIRMPASTE=&Confirm mouse R button paste +DLG_TAB_COPYPASTE_MOUSEPASTEM=Disable mouse &M button paste +DLG_TAB_COPYPASTE_SELECTLBUTTON=Select &only by L button +DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirm change &paste +DLG_TAB_CONFIRM_STRING_FILE=&String file +DLG_TAB_COPYPASTE_DELIMITER=Del&imiter characters +DLG_TAB_COPYPASTE_PASTEDELAY=P&aste delay per line DLG_TAB_COPYPASTE_PASTEDELAY2=ms -DLG_TAB_VISUAL_ALHPA=&AlphaBlend +DLG_TAB_VISUAL_ALHPA=&Alpha blend DLG_TAB_VISUAL_ETERM=&Eterm lookfeel -DLG_TAB_VISUAL_MOUSE=&MouseCursor +DLG_TAB_VISUAL_MOUSE=&Mouse cursor DLG_TAB_VISUAL_RED=&Red DLG_TAB_VISUAL_GREEN=&Green DLG_TAB_VISUAL_BLUE=&Blue @@ -187,14 +195,14 @@ DLG_TAB_VISUAL_REVERSE=Enable Re&verse attribute color DLG_TAB_VISUAL_URL=Enable &URL attribute color DLG_TAB_VISUAL_ANSI=Enable A&NSI color -DLG_TAB_VISUAL_URLUL=Underline URL string +DLG_TAB_VISUAL_URLUL=Un&derline URL string -DLG_TAB_LOG_EDITOR=View Log &Editor -DLG_TAB_LOG_FILENAME=Default Log &File Name(strftime format) -DLG_TAB_LOG_FILEPATH=Default Log &Save Folder -DLG_TAB_LOG_AUTOSTART=&Auto start logging +DLG_TAB_LOG_EDITOR=View log &editor +DLG_TAB_LOG_FILENAME=Default log &file name(strftime format) +DLG_TAB_LOG_FILEPATH=Default log &save folder +DLG_TAB_LOG_AUTOSTART=A&uto start logging -DLG_TAB_CYGWIN_PATH=Cygwin Install &Path +DLG_TAB_CYGWIN_PATH=Cygwin install &path DLG_COMMENT_TITLE=Comment to Log Modified: trunk/installer/release/lang/German.lng =================================================================== --- trunk/installer/release/lang/German.lng 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/installer/release/lang/German.lng 2010-02-14 05:09:56 UTC (rev 3777) @@ -145,34 +145,43 @@ DLG_TABSHEET_TITLE=Erweiterte Einstellungen DLG_TABSHEET_TITLE_GENERAL=Grundeinstellungen +DLG_TABSHEET_TITLE_SEQUENCE=Control Sequence DLG_TABSHEET_TITLE_COPYPASTE=Copy and Paste DLG_TABSHEET_TITLE_VISUAL=Visuelle Einstellungen DLG_TABSHEET_TITLE_LOG=Log DLG_TABSHEET_TITLE_CYGWIN=Cygwin DLG_TAB_GENERAL_CLICKURL=&klickbare URL -DLG_TAB_GENERAL_DISABLESENDBREAK=DisableAccelerator&SendBreak +DLG_TAB_GENERAL_DISABLESENDBREAK=Disable accelerator &send break DLG_TAB_GENERAL_ACCEPTBROADCAST=&Akzeptiere Broadcast +DLG_TAB_GENERAL_MOUSEWHEEL_SCROLL_LINE=Mouse &wheel scroll line DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=&Autoschriftrolle nur in unterst Linie -DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING=Accept &Mouse Event Tracking Request -DLG_TAB_GENERAL_DISABLE_MOUSE_TRACKING_CTRL=&Disable Mouse Event Tracking when Control is pressed -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING=Accept Window &Title Change Request -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OFF=off -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE=overwrite -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AHEAD=ahead -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_LAST=last DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized -DLG_TAB_GENERAL_CURSOR_CTRL_SEQ=CursorCtrlSe&quence +DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request +DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING=Accept Window &Title Change Request +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OFF=off +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OVERWRITE=overwrite +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_AHEAD=ahead +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_LAST=last +DLG_TAB_SEQENCE_CURSOR_CTRL=&Cursor control sequence +DLG_TAB_SEQENCE_WINDOW_CTRL=&Window control sequence +DLG_TAB_SEQENCE_WINDOW_REPORT=Window &report sequence +DLG_TAB_SEQENCE_TITLE_REPORT=Window t&itle report +DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=ignore +DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT=accept +DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=empty + DLG_TAB_COPYPASTE_CONTINUE=mehrere Zeilen kopieren DLG_TAB_COPYPASTE_MOUSEPASTE=&Einfügen mit rechter Maustaste aus DLG_TAB_COPYPASTE_CONFIRMPASTE=&Einfügen mit rechter Maustaste ein -DLG_TAB_COPYPASTE_MOUSEPASTEM=DisableMouse&MButtonPaste +DLG_TAB_COPYPASTE_MOUSEPASTEM=Disable mouse &M button paste DLG_TAB_COPYPASTE_SELECTLBUTTON=&Auswahl nur über Button -DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=ConfirmChange&Paste -DLG_TAB_CONFIRM_STRING_FILE=&StringFile +DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE=Confirm change &paste +DLG_TAB_CONFIRM_STRING_FILE=&String file DLG_TAB_COPYPASTE_DELIMITER=&Bergrenzungszeichen -DLG_TAB_COPYPASTE_PASTEDELAY=P&asteDelayPerLine +DLG_TAB_COPYPASTE_PASTEDELAY=P&aste delay per line DLG_TAB_COPYPASTE_PASTEDELAY2=ms DLG_TAB_VISUAL_ALHPA=&Transparenz Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/installer/release/lang/Japanese.lng 2010-02-14 05:09:56 UTC (rev 3777) @@ -145,6 +145,7 @@ DLG_TABSHEET_TITLE=Tera Term: »Ì¼ÌÝè DLG_TABSHEET_TITLE_GENERAL=SÊ +DLG_TABSHEET_TITLE_SEQUENCE=§äV[PX DLG_TABSHEET_TITLE_COPYPASTE=Rs[Æ\èt¯ DLG_TABSHEET_TITLE_VISUAL=\¦ DLG_TABSHEET_TITLE_LOG=O @@ -154,17 +155,24 @@ DLG_TAB_GENERAL_DISABLESENDBREAK=u[NMÌANZ[^L[ð³øÉ·é(&S) DLG_TAB_GENERAL_ACCEPTBROADCAST=u[hLXgðó¯üêé(&B) DLG_TAB_GENERAL_MOUSEWHEEL_SCROLL_LINE=zC[ÌXN[s(&W) -DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=źsž¯©®XN[·é(&A) -DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING=}EXCxgÊmvðó¯üêé(&M) -DLG_TAB_GENERAL_DISABLE_MOUSE_TRACKING_CTRL=ControlL[ðµÄ¢éÔÍ}EXCxgðÊmµÈ¢(&D) -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING=EBhE^CgÌÏXvðó¯üêé(&T) -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OFF=³ø -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE=ã« -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AHEAD=OÉÇÁ -DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_LAST=ãÉÇÁ +DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE=źsž¯©®XN[·é(&U) DLG_TAB_GENERAL_CLEAR_ON_RESIZE=EBhETCYÏXÉ\¦àeðNA·é(&C) -DLG_TAB_GENERAL_CURSOR_CTRL_SEQ=J[\`ó/_ÅÏX§äV[PX(&q) +DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING=}EXCxgÊmvðó¯üêé(&M) +DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL=ControlL[ðµÄ¢éÔÍ}EXCxgðÊmµÈ¢(&D) +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING=EBhE^CgÌÏXvðó¯üêé(&T) +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OFF=³ø +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OVERWRITE=ã« +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_AHEAD=OÉÇÁ +DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_LAST=ãÉÇÁ +DLG_TAB_SEQENCE_CURSOR_CTRL=J[\`ó/_ÅÏX§äV[PX(&Q) +DLG_TAB_SEQENCE_WINDOW_CTRL=EBhEì§äV[PX(&W) +DLG_TAB_SEQENCE_WINDOW_REPORT=EBhEîññV[PX(&R) +DLG_TAB_SEQENCE_TITLE_REPORT=EBhE^CgÌñv(&I) +DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE=³ +DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT= +DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY=ó + DLG_TAB_COPYPASTE_CONTINUE=p±sRs[ðLøÉ·é(&L) DLG_TAB_COPYPASTE_MOUSEPASTE=ENbNÅÌ\èt¯ð³øÉ·é(&D) DLG_TAB_COPYPASTE_CONFIRMPASTE=ENbNÅÌ\èt¯ðmF·é(&C) @@ -192,7 +200,7 @@ DLG_TAB_LOG_EDITOR=O\¦pGfB^(&E) DLG_TAB_LOG_FILENAME=WOt@C¼(strftimetH[}bgÂ) (&F) DLG_TAB_LOG_FILEPATH=WÌOÛ¶ætH_(&S) -DLG_TAB_LOG_AUTOSTART=©®IÉOÌæðJn·é(&A) +DLG_TAB_LOG_AUTOSTART=©®IÉOÌæðJn·é(&U) DLG_TAB_CYGWIN_PATH=CygwinCXg[æÌpX(&P) Modified: trunk/teraterm/common/tt_res.h =================================================================== --- trunk/teraterm/common/tt_res.h 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/teraterm/common/tt_res.h 2010-02-14 05:09:56 UTC (rev 3777) @@ -20,6 +20,7 @@ #define IDR_MENU1 119 #define IDR_PASTEMENU 119 #define IDD_CLIPBOARD_DIALOG 120 +#define IDD_TABSHEET_SEQUENCE 121 #define IDR_TEKMENU 1000 #define IDC_EDIT_COMMENT 1000 #define IDC_EDIT_FULLPATH 1001 @@ -88,6 +89,7 @@ #define IDC_ACCEPT_MOUSE_EVENT_TRACKING 1065 #define IDC_ACCEPT_TITLE_CHANGING 1066 #define IDC_AGENT_PROXY 1067 +#define IDC_TITLE_REPORT 1067 #define IDC_DISABLE_MOUSE_TRACKING_CTRL 1068 #define IDC_ENABLE_ATTR_COLOR_BOLD 1069 #define IDC_ENABLE_ATTR_COLOR_BLINK 1070 @@ -130,10 +132,13 @@ #define IDC_CONFIRM_CHANGE_PASTE 2512 #define IDC_CURSOR_CTRL_SEQ 2512 #define IDC_MOUSEWHEEL_SCROLL_LINE 2513 +#define IDC_WINDOW_CTRL 2513 #define IDC_TRANSPROGRESS 2514 +#define IDC_WINDOW_REPORT 2514 #define IDC_PROTOPROGRESS 2515 #define IDC_ACCEPT_TITLE_CHANGING_LABEL 2517 #define IDC_PASTEDELAY_LABEL 2518 +#define IDC_TITLE_REPORT_LABEL 2518 #define IDC_PASTEDELAY_LABEL2 2519 #define IDC_CONFIRM_STRING_FILE 2520 #define IDC_CONFIRM_STRING_FILE_PATH 2521 @@ -229,7 +234,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 121 +#define _APS_NEXT_RESOURCE_VALUE 122 #define _APS_NEXT_COMMAND_VALUE 52030 #define _APS_NEXT_CONTROL_VALUE 2524 #define _APS_NEXT_SYMED_VALUE 101 Modified: trunk/teraterm/teraterm/addsetting.cpp =================================================================== --- trunk/teraterm/teraterm/addsetting.cpp 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/teraterm/teraterm/addsetting.cpp 2010-02-14 05:09:56 UTC (rev 3777) @@ -101,8 +101,7 @@ { char uimsg[MAX_UIMSG]; char buf[64]; - CButton *btn, *btn2; - CComboBox *cmb; + CButton *btn; CPropertyPage::OnInitDialog(); @@ -115,12 +114,7 @@ SendDlgItemMessage(IDC_MOUSEWHEEL_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); - SendDlgItemMessage(IDC_ACCEPT_MOUSE_EVENT_TRACKING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); - SendDlgItemMessage(IDC_DISABLE_MOUSE_TRACKING_CTRL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); - SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING_LABEL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); - SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(IDC_CLEAR_ON_RESIZE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); - SendDlgItemMessage(IDC_CURSOR_CTRL_SEQ, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); } else { DlgGeneralFont = NULL; @@ -141,33 +135,10 @@ GetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, uimsg, sizeof(uimsg)); get_lang_msg("DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); SetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, ts.UIMsg); - GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg)); - get_lang_msg("DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); - SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg); - GetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, uimsg, sizeof(uimsg)); - get_lang_msg("DLG_TAB_GENERAL_DISABLE_MOUSE_TRACKING_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); - SetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, ts.UIMsg); - GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg)); - get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); - SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg); - - get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile); - SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); - get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile); - SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); - get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AHEAD", ts.UIMsg, sizeof(ts.UIMsg), "ahead", ts.UILanguageFile); - SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); - get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_LAST", ts.UIMsg, sizeof(ts.UIMsg), "last", ts.UILanguageFile); - SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); - GetDlgItemText(IDC_CLEAR_ON_RESIZE, uimsg, sizeof(uimsg)); get_lang_msg("DLG_TAB_GENERAL_CLEAR_ON_RESIZE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); SetDlgItemText(IDC_CLEAR_ON_RESIZE, ts.UIMsg); - GetDlgItemText(IDC_CURSOR_CTRL_SEQ, uimsg, sizeof(uimsg)); - get_lang_msg("DLG_TAB_GENERAL_CURSOR_CTRL_SEQ", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); - SetDlgItemText(IDC_CURSOR_CTRL_SEQ, ts.UIMsg); - // (1)DisableAcceleratorSendBreak btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK); btn->SetCheck(ts.DisableAcceleratorSendBreak); @@ -188,7 +159,135 @@ btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE); btn->SetCheck(ts.AutoScrollOnlyInBottomLine); - // (6)IDC_ACCEPT_MOUSE_EVENT_TRACKING + // (6)IDC_CLEAR_ON_RESIZE + btn = (CButton *)GetDlgItem(IDC_CLEAR_ON_RESIZE); + btn->SetCheck((ts.TermFlag & TF_CLEARONRESIZE) != 0); + + // _CAOÉtH[JXðÄé (2004.12.7 yutaka) + ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CLICKABLE_URL)); + + return FALSE; +} + +void CGeneralPropPageDlg::OnOK() +{ + CButton *btn; + char buf[64]; + int val; + + // (1) + btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK); + ts.DisableAcceleratorSendBreak = btn->GetCheck(); + + // (2) + btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL); + ts.EnableClickableUrl = btn->GetCheck(); + + // (3) 337: 2007/03/20 + btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST); + ts.AcceptBroadcast = btn->GetCheck(); + + // (4)IDC_MOUSEWHEEL_SCROLL_LINE + GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf)); + val = atoi(buf); + if (val > 0) + ts.MouseWheelScrollLine = val; + + // (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE + btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE); + ts.AutoScrollOnlyInBottomLine = btn->GetCheck(); + + // (6)IDC_CLEAR_ON_RESIZE + btn = (CButton *)GetDlgItem(IDC_CLEAR_ON_RESIZE); + if (((ts.TermFlag & TF_CLEARONRESIZE) != 0) != btn->GetCheck()) { + ts.TermFlag ^= TF_CLEARONRESIZE; + } +} + + + +// CSequencePropPageDlg _CAO + +IMPLEMENT_DYNAMIC(CSequencePropPageDlg, CPropertyPage) + +CSequencePropPageDlg::CSequencePropPageDlg() + : CPropertyPage(CSequencePropPageDlg::IDD) +{ +} + +CSequencePropPageDlg::~CSequencePropPageDlg() +{ + if (DlgSequenceFont != NULL) { + DeleteObject(DlgSequenceFont); + } +} + +BEGIN_MESSAGE_MAP(CSequencePropPageDlg, CPropertyPage) +END_MESSAGE_MAP() + +// CSequencePropPageDlg bZ[W nh + +BOOL CSequencePropPageDlg::OnInitDialog() +{ + char uimsg[MAX_UIMSG]; + CButton *btn, *btn2; + CComboBox *cmb; + + CPropertyPage::OnInitDialog(); + + font = (HFONT)SendMessage(WM_GETFONT, 0, 0); + GetObject(font, sizeof(LOGFONT), &logfont); + if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgSequenceFont, ts.UILanguageFile)) { + SendDlgItemMessage(IDC_ACCEPT_MOUSE_EVENT_TRACKING, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_DISABLE_MOUSE_TRACKING_CTRL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING_LABEL, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(IDC_CURSOR_CTRL_SEQ, WM_SETFONT, (WPARAM)DlgSequenceFont, MAKELPARAM(TRUE,0)); + } + else { + DlgSequenceFont = NULL; + } + + GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg); + GetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_DISABLE_MOUSE_TRACKING_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, ts.UIMsg); + GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg); + + get_lang_msg("DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile); + SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + get_lang_msg("DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile); + SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + get_lang_msg("DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_AHEAD", ts.UIMsg, sizeof(ts.UIMsg), "ahead", ts.UILanguageFile); + SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + get_lang_msg("DLG_TAB_SEQENCE_ACCEPT_TITLE_CHANGING_LAST", ts.UIMsg, sizeof(ts.UIMsg), "last", ts.UILanguageFile); + SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + + GetDlgItemText(IDC_CURSOR_CTRL_SEQ, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_CURSOR_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_CURSOR_CTRL_SEQ, ts.UIMsg); + GetDlgItemText(IDC_WINDOW_CTRL, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_WINDOW_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_WINDOW_CTRL, ts.UIMsg); + GetDlgItemText(IDC_WINDOW_REPORT, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_WINDOW_REPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_WINDOW_REPORT, ts.UIMsg); + GetDlgItemText(IDC_TITLE_REPORT_LABEL, uimsg, sizeof(uimsg)); + get_lang_msg("DLG_TAB_SEQENCE_TITLE_REPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile); + SetDlgItemText(IDC_TITLE_REPORT_LABEL, ts.UIMsg); + + get_lang_msg("DLG_TAB_SEQENCE_TITLE_REPORT_IGNORE", ts.UIMsg, sizeof(ts.UIMsg), "ignore", ts.UILanguageFile); + SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + get_lang_msg("DLG_TAB_SEQENCE_TITLE_REPORT_ACCEPT", ts.UIMsg, sizeof(ts.UIMsg), "accept", ts.UILanguageFile); + SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + get_lang_msg("DLG_TAB_SEQENCE_TITLE_REPORT_EMPTY", ts.UIMsg, sizeof(ts.UIMsg), "empty", ts.UILanguageFile); + SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg); + + // (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING); btn2 = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL); btn->SetCheck(ts.MouseEventTracking); @@ -198,18 +297,36 @@ btn2->EnableWindow(FALSE); } - // (7)IDC_DISABLE_MOUSE_TRACKING_CTRL + // (2)IDC_DISABLE_MOUSE_TRACKING_CTRL btn2->SetCheck(ts.DisableMouseTrackingByCtrl); - // (8)IDC_ACCEPT_TITLE_CHANGING + // (3)IDC_ACCEPT_TITLE_CHANGING cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING); cmb->SetCurSel(ts.AcceptTitleChangeRequest); - // (9)IDC_CLEAR_ON_RESIZE - btn = (CButton *)GetDlgItem(IDC_CLEAR_ON_RESIZE); - btn->SetCheck((ts.TermFlag & TF_CLEARONRESIZE) != 0); + // (4)IDC_TITLE_REPORT + cmb = (CComboBox *)GetDlgItem(IDC_TITLE_REPORT); + switch (ts.WindowFlag & WF_TITLEREPORT) { + case IdTitleReportIgnore: + cmb->SetCurSel(0); + break; + case IdTitleReportAccept: + cmb->SetCurSel(1); + break; + default: // IdTitleReportEmpty + cmb->SetCurSel(2); + break; + } - // (10)IDC_CURSOR_CTRL_SEQ + // (5)IDC_WINDOW_CTRL + btn = (CButton *)GetDlgItem(IDC_WINDOW_CTRL); + btn->SetCheck((ts.WindowFlag & WF_WINDOWCHANGE) != 0); + + // (6)IDC_WINDOW_REPORT + btn = (CButton *)GetDlgItem(IDC_WINDOW_REPORT); + btn->SetCheck((ts.WindowFlag & WF_WINDOWREPORT) != 0); + + // (7)IDC_CURSOR_CTRL_SEQ btn = (CButton *)GetDlgItem(IDC_CURSOR_CTRL_SEQ); btn->SetCheck((ts.WindowFlag & WF_CURSORCHANGE) != 0); @@ -219,7 +336,7 @@ return FALSE; } -BOOL CGeneralPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam) +BOOL CSequencePropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam) { CButton *btn, *btn2; @@ -237,58 +354,56 @@ return CPropertyPage::OnCommand(wParam, lParam); } -void CGeneralPropPageDlg::OnOK() +void CSequencePropPageDlg::OnOK() { CButton *btn; CComboBox *cmb; - char buf[64]; - int val; - // (1) - btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK); - ts.DisableAcceleratorSendBreak = btn->GetCheck(); - - // (2) - btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL); - ts.EnableClickableUrl = btn->GetCheck(); - - // (3) 337: 2007/03/20 - btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST); - ts.AcceptBroadcast = btn->GetCheck(); - - // (4)IDC_MOUSEWHEEL_SCROLL_LINE - GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf)); - val = atoi(buf); - if (val > 0) - ts.MouseWheelScrollLine = val; - - // (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE - btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE); - ts.AutoScrollOnlyInBottomLine = btn->GetCheck(); - - // (6)IDC_ACCEPT_MOUSE_EVENT_TRACKING + // (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING); ts.MouseEventTracking = btn->GetCheck(); - // (7)IDC_DISABLE_MOUSE_TRACKING_CTRL + // (2)IDC_DISABLE_MOUSE_TRACKING_CTRL btn = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL); ts.DisableMouseTrackingByCtrl = btn->GetCheck(); - // (8)IDC_ACCEPT_TITLE_CHANGING + // (3)IDC_ACCEPT_TITLE_CHANGING cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING); ts.AcceptTitleChangeRequest = cmb->GetCurSel(); - // (9)IDC_CLEAR_ON_RESIZE - btn = (CButton *)GetDlgItem(IDC_CLEAR_ON_RESIZE); - if (((ts.TermFlag & TF_CLEARONRESIZE) != 0) != btn->GetCheck()) { - ts.TermFlag ^= TF_CLEARONRESIZE; + // (4)IDC_TITLE_REPORT + cmb = (CComboBox *)GetDlgItem(IDC_TITLE_REPORT); + switch (cmb->GetCurSel()) { + case 0: + ts.WindowFlag &= ~WF_TITLEREPORT; + break; + case 1: + ts.WindowFlag &= ~WF_TITLEREPORT; + ts.WindowFlag |= IdTitleReportAccept; + break; + default: // 2 + ts.WindowFlag |= IdTitleReportEmpty; + break; } - // (10)IDC_CURSOR_CTRL_SEQ + // (5)IDC_WINDOW_CTRL + btn = (CButton *)GetDlgItem(IDC_WINDOW_CTRL); + if (((ts.WindowFlag & WF_WINDOWCHANGE) != 0) != btn->GetCheck()) { + ts.WindowFlag ^= WF_WINDOWCHANGE; + } + + // (6)IDC_WINDOW_REPORT + btn = (CButton *)GetDlgItem(IDC_WINDOW_REPORT); + if (((ts.WindowFlag & WF_WINDOWREPORT) != 0) != btn->GetCheck()) { + ts.WindowFlag ^= WF_WINDOWREPORT; + } + + // (7)IDC_CURSOR_CTRL_SEQ btn = (CButton *)GetDlgItem(IDC_CURSOR_CTRL_SEQ); if (((ts.WindowFlag & WF_CURSORCHANGE) != 0) != btn->GetCheck()) { ts.WindowFlag ^= WF_CURSORCHANGE; } + } @@ -1390,6 +1505,8 @@ :CPropertySheet(nIDCaption, pParentWnd, iSelectPage) { AddPage(&m_GeneralPage); + AddPage(&m_SequencePage); + AddPage(&m_CopypastePage); AddPage(&m_VisualPage); AddPage(&m_LogPage); AddPage(&m_CygwinPage); @@ -1401,6 +1518,7 @@ :CPropertySheet(pszCaption, pParentWnd, iSelectPage) { AddPage(&m_GeneralPage); + AddPage(&m_SequencePage); AddPage(&m_CopypastePage); AddPage(&m_VisualPage); AddPage(&m_LogPage); @@ -1437,25 +1555,30 @@ tc.pszText = ts.UIMsg; tab->SetItem(0, &tc); + get_lang_msg("DLG_TABSHEET_TITLE_SEQUENCE", ts.UIMsg, sizeof(ts.UIMsg), + "Control Sequence", ts.UILanguageFile); + tc.pszText = ts.UIMsg; + tab->SetItem(1, &tc); + get_lang_msg("DLG_TABSHEET_TITLE_COPYPASTE", ts.UIMsg, sizeof(ts.UIMsg), "Copy and Paste", ts.UILanguageFile); tc.pszText = ts.UIMsg; - tab->SetItem(1, &tc); + tab->SetItem(2, &tc); get_lang_msg("DLG_TABSHEET_TITLE_VISUAL", ts.UIMsg, sizeof(ts.UIMsg), "Visual", ts.UILanguageFile); tc.pszText = ts.UIMsg; - tab->SetItem(2, &tc); + tab->SetItem(3, &tc); get_lang_msg("DLG_TABSHEET_TITLE_Log", ts.UIMsg, sizeof(ts.UIMsg), "Log", ts.UILanguageFile); tc.pszText = ts.UIMsg; - tab->SetItem(3, &tc); + tab->SetItem(4, &tc); get_lang_msg("DLG_TABSHEET_TITLE_CYGWIN", ts.UIMsg, sizeof(ts.UIMsg), "Cygwin", ts.UILanguageFile); tc.pszText = ts.UIMsg; - tab->SetItem(4, &tc); + tab->SetItem(5, &tc); return FALSE; } Modified: trunk/teraterm/teraterm/addsetting.h =================================================================== --- trunk/teraterm/teraterm/addsetting.h 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/teraterm/teraterm/addsetting.h 2010-02-14 05:09:56 UTC (rev 3777) @@ -43,6 +43,30 @@ protected: DECLARE_MESSAGE_MAP() +}; + + + +// Control Sequence Page +class CSequencePropPageDlg : public CPropertyPage +{ + DECLARE_DYNAMIC(CSequencePropPageDlg) + +public: + CSequencePropPageDlg(); + virtual ~CSequencePropPageDlg(); + BOOL OnInitDialog(); + void OnOK(); + + enum { IDD = IDD_TABSHEET_SEQUENCE }; + +private: + HFONT DlgSequenceFont; + LOGFONT logfont; + HFONT font; + +protected: + DECLARE_MESSAGE_MAP() virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); }; @@ -170,6 +194,7 @@ public: CGeneralPropPageDlg m_GeneralPage; + CSequencePropPageDlg m_SequencePage; CCopypastePropPageDlg m_CopypastePage; CVisualPropPageDlg m_VisualPage; CLogPropPageDlg m_LogPage; Modified: trunk/teraterm/teraterm/ttermpro.rc =================================================================== --- trunk/teraterm/teraterm/ttermpro.rc 2010-02-10 11:55:13 UTC (rev 3776) +++ trunk/teraterm/teraterm/ttermpro.rc 2010-02-14 05:09:56 UTC (rev 3777) @@ -73,56 +73,70 @@ EDITTEXT IDC_EDIT_COMMENT,6,3,189,12,ES_AUTOHSCROLL END -IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 242, 158 +IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 242, 148 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU FONT 8, "Tahoma", 400, 0, 0x0 BEGIN - CONTROL "&EnableClickableURL",IDC_CLICKABLE_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,124,10 - CONTROL "DisableAccelerator&SendBreak",IDC_DISABLE_SENDBREAK, + CONTROL "&Enable clickable URL",IDC_CLICKABLE_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,124,10 + CONTROL "Disable accelerator &send break",IDC_DISABLE_SENDBREAK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,183,10 - CONTROL "Accept&Broadcast",IDC_ACCEPT_BROADCAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,40,124,10 - LTEXT "Mouse&WheelScrollLine",IDC_MOUSEWHEEL_SCROLL_LINE,11,55,103,8 + CONTROL "Accept &broadcast",IDC_ACCEPT_BROADCAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,40,124,10 + LTEXT "Mouse &wheel scroll line",IDC_MOUSEWHEEL_SCROLL_LINE,11,55,103,8 EDITTEXT IDC_SCROLL_LINE,123,53,29,14,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "&AutoScrollOnlyInBottomLine",IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, + CONTROL "A&uto scroll only in bottom line",IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,173,10 - CONTROL "Accept &Mouse Event Tracking Request",IDC_ACCEPT_MOUSE_EVENT_TRACKING, + CONTROL "&Clear display when window resized",IDC_CLEAR_ON_RESIZE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,220,10 - CONTROL "&Disable Mouse Event Tracking when Control is pressed",IDC_DISABLE_MOUSE_TRACKING_CTRL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,100,220,10 - LTEXT "Accept Window &Title Change Request",IDC_ACCEPT_TITLE_CHANGING_LABEL,11,116,141,8 - COMBOBOX IDC_ACCEPT_TITLE_CHANGING,162,114,45,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "&Clear display when window resized",IDC_CLEAR_ON_RESIZE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,130,220,10 - CONTROL "CursorCtrlSe&quence",IDC_CURSOR_CTRL_SEQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,145,227,10 END -IDD_BROADCAST_DIALOG DIALOGEX 0, 0, 252, 104 -STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Tera Term: Broadcast command" -FONT 10, "System", 400, 0, 0x80 +IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 242, 148 +STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU +FONT 8, "Tahoma", 400, 0, 0x0 BEGIN - DEFPUSHBUTTON "Submit",IDOK,205,3,40,14 - CONTROL "Enter key",IDC_ENTERKEY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,21,44,10 - DEFPUSHBUTTON "Close",IDCANCEL,205,30,40,14 - CONTROL "CRLF",IDC_RADIO_CRLF,"Button",BS_AUTORADIOBUTTON,67,21,29,10 - GROUPBOX "",IDC_ENTERGROUP,63,15,85,18 - CONTROL "CR",IDC_RADIO_CR,"Button",BS_AUTORADIOBUTTON,100,21,21,10 - CONTROL "LF",IDC_RADIO_LF,"Button",BS_AUTORADIOBUTTON,125,21,19,10 - CONTROL "History",IDC_HISTORY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,21,47,10 - COMBOBOX IDC_COMMAND_EDIT,8,3,189,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Send to this process only",IDC_PARENT_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,36,111,10 - CONTROL "Realtime mode",IDC_REALTIME_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,36,62,10 - LISTBOX IDC_LIST,8,49,237,46,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_VSCROLL | WS_TABSTOP + CONTROL "Accept &mouse event tracking request",IDC_ACCEPT_MOUSE_EVENT_TRACKING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,220,10 + CONTROL "&Disable mouse event tracking when Control is pressed",IDC_DISABLE_MOUSE_TRACKING_CTRL, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,25,210,10 + LTEXT "Accept window &title change request",IDC_ACCEPT_TITLE_CHANGING_LABEL,11,41,141,8 + COMBOBOX IDC_ACCEPT_TITLE_CHANGING,162,39,45,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Window t&itle report",IDC_TITLE_REPORT_LABEL,11,56,141,8 + COMBOBOX IDC_TITLE_REPORT,162,54,45,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "&Window control sequence",IDC_WINDOW_CTRL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,220,10 + CONTROL "Window &report sequence",IDC_WINDOW_REPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,220,10 + CONTROL "&Cursor control sequence",IDC_CURSOR_CTRL_SEQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10 END +IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 148 +STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU +FONT 8, "Tahoma", 400, 0, 0x0 +BEGIN + CONTROL "Enable continued &line copy",IDC_LINECOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,200,10 + CONTROL "&Disable mouse R button paste",IDC_DISABLE_PASTE_RBUTTON, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,200,10 + CONTROL "&Confirm mouse R button paste",IDC_CONFIRM_PASTE_RBUTTON, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,40,190,10 + CONTROL "Disable mouse &M button paste",IDC_DISABLE_PASTE_MBUTTON, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,55,200,10 + CONTROL "Select &only by L button",IDC_SELECT_LBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,200,10 + CONTROL "Confirm change &paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,200,10 + LTEXT "&String file",IDC_CONFIRM_STRING_FILE_LABEL,22,100,61,8 + EDITTEXT IDC_CONFIRM_STRING_FILE,85,98,106,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_CONFIRM_STRING_FILE_PATH,196,98,13,12 + LTEXT "Del&imiter characters",IDC_DELIMITER,11,115,65,10 + EDITTEXT IDC_DELIM_LIST,85,113,130,12,ES_AUTOHSCROLL + LTEXT "P&aste delay per line",IDC_PASTEDELAY_LABEL,11,130,70,10 + EDITTEXT IDC_PASTEDELAY_EDIT,85,128,24,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "ms",IDC_PASTEDELAY_LABEL2,113,130,23,10 +END + IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 242, 148 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU FONT 8, "Tahoma", 400, 0, 0x0 BEGIN - LTEXT "&AlphaBlend",IDC_ALPHABLEND,10,10,43,8 + LTEXT "&Alpha blend",IDC_ALPHABLEND,10,10,43,8 EDITTEXT IDC_ALPHA_BLEND,58,8,28,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "&Eterm lookfeel",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,8,72,12 - RTEXT "&MouseCursor",IDC_MOUSE,8,37,70,8 + RTEXT "&Mouse cursor",IDC_MOUSE,8,37,70,8 LISTBOX IDC_MOUSE_CURSOR,82,25,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "ANSI color",IDC_ANSICOLOR,10,66,43,8 LISTBOX IDC_ANSI_COLOR,10,78,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP @@ -149,17 +163,63 @@ STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU FONT 8, "Tahoma", 400, 0, 0x0 BEGIN - LTEXT "View Log &Editor",IDC_VIEWLOG_LABEL,10,10,66,8 + LTEXT "View log &editor",IDC_VIEWLOG_LABEL,10,10,66,8 EDITTEXT IDC_VIEWLOG_EDITOR,11,21,120,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_VIEWLOG_PATH,135,22,13,10 - LTEXT "Default Log &File Name(strftime format)",IDC_DEFAULTNAME_LABEL,10,41,175,8 + LTEXT "Default log &file name(strftime format)",IDC_DEFAULTNAME_LABEL,10,41,175,8 EDITTEXT IDC_DEFAULTNAME_EDITOR,11,52,120,12,ES_AUTOHSCROLL - LTEXT "Default Log &Save Folder",IDC_DEFAULTPATH_LABEL,10,72,175,8 + LTEXT "Default log &save folder",IDC_DEFAULTPATH_LABEL,10,72,175,8 EDITTEXT IDC_DEFAULTPATH_EDITOR,11,83,120,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_DEFAULTPATH_PUSH,135,84,13,10 - CONTROL "&Auto start logging",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,124,10 + CONTROL "A&uto start logging",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,124,10 END +IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 242, 148 +STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU +FONT 8, "Tahoma", 400, 0, 0x0 +BEGIN + LTEXT "Cygwin install &path",IDC_CYGWIN_PATH_LABEL,10,10,134,8 + EDITTEXT IDC_CYGWIN_PATH,10,22,64,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_SELECT_FILE,78,23,13,10 + LTEXT "TERM",IDC_TERM_LABEL,15,55,24,8 + EDITTEXT IDC_TERM_EDIT,40,53,185,14,ES_AUTOHSCROLL + LTEXT "TERM_TYPE",IDC_TERMTYPE_LABEL,15,74,50,8 + EDITTEXT IDC_TERM_TYPE,65,72,40,14,ES_AUTOHSCROLL + LTEXT "PORT START",IDC_PORTSTART_LABEL,15,93,50,8 + EDITTEXT IDC_PORT_START,65,91,40,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "PORT RANGE",IDC_PORTRANGE_LABEL,15,112,50,8 + EDITTEXT IDC_PORT_RANGE,65,110,40,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SHELL",IDC_SHELL_LABEL,120,74,26,8 + EDITTEXT IDC_SHELL,147,72,78,14,ES_AUTOHSCROLL + GROUPBOX "CygTerm",IDC_CYGWIN,8,42,225,100 + LTEXT "ENV_1",IDC_ENV1_LABEL,120,93,26,8 + EDITTEXT IDC_ENV1,147,91,78,14,ES_AUTOHSCROLL + LTEXT "ENV_2",IDC_ENV2_LABEL,120,112,26,8 + EDITTEXT IDC_ENV2,147,110,78,14,ES_AUTOHSCROLL + CONTROL "LOGIN_SHELL",IDC_LOGIN_SHELL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,128,60,10 + CONTROL "HOME_CHDIR",IDC_HOME_CHDIR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,128,60,10 + CONTROL "SSH_AGENT_PROXY",IDC_AGENT_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,128,80,10 +END + +IDD_BROADCAST_DIALOG DIALOGEX 0, 0, 252, 104 +STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Tera Term: Broadcast command" +FONT 10, "System", 400, 0, 0x80 +BEGIN + DEFPUSHBUTTON "Submit",IDOK,205,3,40,14 + CONTROL "Enter key",IDC_ENTERKEY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,21,44,10 + DEFPUSHBUTTON "Close",IDCANCEL,205,30,40,14 + CONTROL "CRLF",IDC_RADIO_CRLF,"Button",BS_AUTORADIOBUTTON,67,21,29,10 + GROUPBOX "",IDC_ENTERGROUP,63,15,85,18 + CONTROL "CR",IDC_RADIO_CR,"Button",BS_AUTORADIOBUTTON,100,21,21,10 + CONTROL "LF",IDC_RADIO_LF,"Button",BS_AUTORADIOBUTTON,125,21,19,10 + CONTROL "History",IDC_HISTORY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,21,47,10 + COMBOBOX IDC_COMMAND_EDIT,8,3,189,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "Send to this process only",IDC_PARENT_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,36,111,10 + CONTROL "Realtime mode",IDC_REALTIME_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,36,62,10 + LISTBOX IDC_LIST,8,49,237,46,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_VSCROLL | WS_TABSTOP +END + IDD_PRNABORTDLG DIALOGEX 20, 20, 71, 43 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tera Term" @@ -203,33 +263,6 @@ DEFPUSHBUTTON "Cancel",IDCANCEL,51,67,40,14 END -IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 242, 148 -STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU -FONT 8, "Tahoma", 400, 0, 0x0 -BEGIN - LTEXT "Cygwin Install &Path",IDC_CYGWIN_PATH_LABEL,10,10,134,8 - EDITTEXT IDC_CYGWIN_PATH,10,22,64,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_SELECT_FILE,78,23,13,10 - LTEXT "TERM",IDC_TERM_LABEL,15,55,24,8 - EDITTEXT IDC_TERM_EDIT,40,53,185,14,ES_AUTOHSCROLL - LTEXT "TERM_TYPE",IDC_TERMTYPE_LABEL,15,74,50,8 - EDITTEXT IDC_TERM_TYPE,65,72,40,14,ES_AUTOHSCROLL - LTEXT "PORT START",IDC_PORTSTART_LABEL,15,93,50,8 - EDITTEXT IDC_PORT_START,65,91,40,14,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "PORT RANGE",IDC_PORTRANGE_LABEL,15,112,50,8 - EDITTEXT IDC_PORT_RANGE,65,110,40,14,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "SHELL",IDC_SHELL_LABEL,120,74,26,8 - EDITTEXT IDC_SHELL,147,72,78,14,ES_AUTOHSCROLL - GROUPBOX "CygTerm",IDC_CYGWIN,8,42,225,100 - LTEXT "ENV_1",IDC_ENV1_LABEL,120,93,26,8 - EDITTEXT IDC_ENV1,147,91,78,14,ES_AUTOHSCROLL - LTEXT "ENV_2",IDC_ENV2_LABEL,120,112,26,8 - EDITTEXT IDC_ENV2,147,110,78,14,ES_AUTOHSCROLL - CONTROL "LOGIN_SHELL",IDC_LOGIN_SHELL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,128,60,10 - CONTROL "HOME_CHDIR",IDC_HOME_CHDIR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,128,60,10 - CONTROL "SSH_AGENT_PROXY",IDC_AGENT_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,128,80,10 -END - IDD_CLIPBOARD_DIALOG DIALOGEX 0, 0, 216, 132 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Tera Term: Clipboard confirmation" @@ -241,30 +274,7 @@ LTEXT "Currently, Clipboard has been locked.",IDC_CLIPBOARD_INFO,5,110,206,10 END -IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 148 -STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU -FONT 8, "Tahoma", 400, 0, 0x0 -BEGIN - CONTROL "EnableContinued&LineCopy",IDC_LINECOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,200,10 - CONTROL "&DisableMouseRButtonPaste",IDC_DISABLE_PASTE_RBUTTON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,200,10 - CONTROL "&ConfirmMouseRButtonPaste",IDC_CONFIRM_PASTE_RBUTTON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,40,190,10 - CONTROL "DisableMouse&MButtonPaste",IDC_DISABLE_PASTE_MBUTTON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,55,200,10 - CONTROL "Select&OnlyByLButton",IDC_SELECT_LBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,200,10 - CONTROL "ConfirmChange&Paste",IDC_CONFIRM_CHANGE_PASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,200,10 - LTEXT "&StringFile",IDC_CONFIRM_STRING_FILE_LABEL,22,100,61,8 - EDITTEXT IDC_CONFIRM_STRING_FILE,85,98,106,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_CONFIRM_STRING_FILE_PATH,196,98,13,12 - LTEXT "Del&imiter Characters",IDC_DELIMITER,11,115,65,10 - EDITTEXT IDC_DELIM_LIST,85,113,130,12,ES_AUTOHSCROLL - LTEXT "P&asteDelayPerLine",IDC_PASTEDELAY_LABEL,11,130,70,10 - EDITTEXT IDC_PASTEDELAY_EDIT,85,128,24,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "ms",IDC_PASTEDELAY_LABEL2,113,130,23,10 -END - ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -282,19 +292,28 @@ IDD_TABSHEET_GENERAL, DIALOG BEGIN - LEFTMARGIN, 5 + LEFTMARGIN, 7 RIGHTMARGIN, 236 - TOPMARGIN, 5 - BOTTOMMARGIN, 148 + TOPMARGIN, 7 + BOTTOMMARGIN, 145 END - IDD_BROADCAST_DIALOG, DIALOG + IDD_TABSHEET_SEQUENCE, DIALOG BEGIN - LEFTMARGIN, 8 - RIGHTMARGIN, 245 - BOTTOMMARGIN, 102 + LEFTMARGIN, 7 + RIGHTMARGIN, 236 + TOPMARGIN, 7 + BOTTOMMARGIN, 145 END + IDD_TABSHEET_COPYPASTE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 236 + TOPMARGIN, 7 + BOTTOMMARGIN, 145 + END + IDD_TABSHEET_VISUAL, DIALOG BEGIN LEFTMARGIN, 5 @@ -311,11 +330,6 @@ BOTTOMMARGIN, 145 END - IDD_FILETRANSDLG, DIALOG - BEGIN - BOTTOMMARGIN, 80 - END - IDD_TABSHEET_CYGWIN, DIALOG BEGIN LEFTMARGIN, 5 @@ -324,6 +338,18 @@ BOTTOMMARGIN, 145 END + IDD_BROADCAST_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 8 + RIGHTMARGIN, 245 + BOTTOMMARGIN, 102 + END + + IDD_FILETRANSDLG, DIALOG + BEGIN + BOTTOMMARGIN, 80 + END + IDD_CLIPBOARD_DIALOG, DIALOG BEGIN LEFTMARGIN, 5 @@ -331,14 +357,6 @@ TOPMARGIN, 5 BOTTOMMARGIN, 124 END - - IDD_TABSHEET_COPYPASTE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 236 - TOPMARGIN, 7 - BOTTOMMARGIN, 145 - END END #endif // APSTUDIO_INVOKED