svnno****@sourc*****
svnno****@sourc*****
2009年 10月 8日 (木) 00:46:43 JST
Tera TermRevision: 3635
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3635
Author: yutakapon
Date: 2009-10-08 00:46:43 +0900 (Thu, 08 Oct 2009)
Log Message:
-----------
ConfirmChangePasteダイアãƒã‚°ã«ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã‚’付ã‘ã€ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å³ä¸‹ã«ãƒªã‚µã‚¤ã‚ºã‚¢ã‚¤ã‚³ãƒ³ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ã—ãŸã€‚
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/teraterm/ttermpro.rc
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2009-10-07 15:06:01 UTC (rev 3634)
+++ trunk/doc/en/html/about/history.html 2009-10-07 15:46:43 UTC (rev 3635)
@@ -30,7 +30,7 @@
<h2><a name="teraterm">Tera Term</a></h2>
-<h3><a name="teraterm_4.64">2009.10.3 (Ver 4.64 unreleased)</a></h3>
+<h3><a name="teraterm_4.64">2009.10.8 (Ver 4.64 unreleased)</a></h3>
<ul class="history">
<li>Changes
<ul>
@@ -40,6 +40,7 @@
<li>The list of open sessions in the Broadcast Command window can support the standard Windows feature of selecting the range of items. It is possible to select consecutive number of items by clicking on the first and then pressing Shift key and clicking on the last. And also, it is possible to select all items by CTRL+A pushing.</li>
<li>added support for resizing the list box in the Broadcast Command window.</li>
<li>The list box in the Broadcast Command periodically updates.</li>
+ <li>added the status bar at the bottom of the ConfirmChangePaste dialog.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2009-10-07 15:06:01 UTC (rev 3634)
+++ trunk/doc/ja/html/about/history.html 2009-10-07 15:46:43 UTC (rev 3635)
@@ -30,7 +30,7 @@
<h2><a name="teraterm">Tera Term</a></h2>
-<h3><a name="teraterm_4.64">2009.10.3 (Ver 4.64 unreleased)</a></h3>
+<h3><a name="teraterm_4.64">2009.10.8 (Ver 4.64 unreleased)</a></h3>
<ul class="history">
<li>•ÏX
<ul>
@@ -40,6 +40,7 @@
<li>Broadcast Command‚̃ŠƒXƒgƒ{ƒbƒNƒX‚É‚¨‚¢‚ÄAƒ_ƒuƒ‹ƒNƒŠƒbƒN‚É‚æ‚é‘S‘I‘ð‚ð”pŽ~‚µAuSHIFT+ƒNƒŠƒbƒNv‚É‚æ‚é˜A‘±“I‘I‘ðAuCTRL+Av‚É‚æ‚é‘S‘I‘ð‚ðƒTƒ|[ƒg‚µ‚½B</li>
<li>Broadcast Command‚̃_ƒCƒAƒƒOƒ{ƒbƒNƒX‚ðƒTƒCƒY•ÏX‚Å‚«‚é‚悤‚É‚µ‚½B</li>
<li>Broadcast Command‚̃ŠƒXƒgƒ{ƒbƒNƒX‚ð’èŠú“I‚ÉXV‚·‚é‚悤‚É‚µ‚½B</li>
+ <li>ConfirmChangePasteƒ_ƒCƒAƒƒO‚ɃXƒe[ƒ^ƒXƒo[‚ð’ljÁ‚µ‚½B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2009-10-07 15:06:01 UTC (rev 3634)
+++ trunk/teraterm/teraterm/clipboar.c 2009-10-07 15:46:43 UTC (rev 3635)
@@ -9,6 +9,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <commctrl.h>
#include "ttwinman.h"
#include "ttcommon.h"
@@ -277,6 +278,8 @@
OSVERSIONINFO osvi;
static int ok2right, info2bottom, edit2ok, edit2info;
RECT rc_edit, rc_ok, rc_cancel, rc_info;
+ // for status bar
+ static HWND hStatus = NULL;
switch (msg) {
case WM_INITDIALOG:
@@ -379,6 +382,12 @@
ts.PasteDialogSize.cx, ts.PasteDialogSize.cy,
SWP_NOZORDER | SWP_NOMOVE);
+ // ƒŠƒTƒCƒYƒAƒCƒRƒ“‚ð‰E‰º‚É•\Ž¦‚³‚¹‚½‚¢‚Ì‚ÅAƒXƒe[ƒ^ƒXƒo[‚ð•t‚¯‚éB
+ InitCommonControls();
+ hStatus = CreateStatusWindow(
+ WS_CHILD | WS_VISIBLE |
+ CCS_BOTTOM | SBARS_SIZEGRIP, NULL, hDlgWnd, 1);
+
return TRUE;
case WM_COMMAND:
@@ -403,6 +412,7 @@
DeleteObject(DlgClipboardFont);
}
+ DestroyWindow(hStatus);
EndDialog(hDlgWnd, IDOK);
}
break;
@@ -414,6 +424,7 @@
DeleteObject(DlgClipboardFont);
}
+ DestroyWindow(hStatus);
EndDialog(hDlgWnd, IDCANCEL);
break;
@@ -479,6 +490,9 @@
GetWindowRect(hDlgWnd, &rc_dlg);
ts.PasteDialogSize.cx = rc_dlg.right - rc_dlg.left;
ts.PasteDialogSize.cy = rc_dlg.bottom - rc_dlg.top;
+
+ // status bar
+ SendMessage(hStatus , msg , wp , lp);
}
return TRUE;
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2009-10-07 15:06:01 UTC (rev 3634)
+++ trunk/teraterm/teraterm/ttermpro.rc 2009-10-07 15:46:43 UTC (rev 3635)
@@ -226,15 +226,15 @@
CONTROL "SSH_AGENT_PROXY",IDC_AGENT_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,128,80,10
END
-IDD_CLIPBOARD_DIALOG DIALOGEX 0, 0, 215, 125
+IDD_CLIPBOARD_DIALOG DIALOGEX 0, 0, 216, 132
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "Tera Term: Clipboard confirmation"
FONT 8, "Tahoma", 400, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,160,5,50,14
- PUSHBUTTON "Cancel",IDCANCEL,160,25,50,14
+ DEFPUSHBUTTON "OK",IDOK,161,5,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,161,25,50,14
EDITTEXT IDC_EDIT,5,5,150,100,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
- LTEXT "Currently, Clipboard has been locked.",IDC_CLIPBOARD_INFO,5,110,205,10
+ LTEXT "Currently, Clipboard has been locked.",IDC_CLIPBOARD_INFO,5,110,206,10
END
IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 148
@@ -323,9 +323,9 @@
IDD_CLIPBOARD_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 5
- RIGHTMARGIN, 210
+ RIGHTMARGIN, 211
TOPMARGIN, 5
- BOTTOMMARGIN, 120
+ BOTTOMMARGIN, 124
END
IDD_TABSHEET_COPYPASTE, DIALOG