[Ttssh2-commit] [3839] Show Macro Windowにおいて、マクロウィンドウはforegroundへ持ってこられるようにした。

svnno****@sourc***** svnno****@sourc*****
2010年 4月 4日 (日) 18:28:01 JST


Revision: 3839
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3839
Author:   yutakapon
Date:     2010-04-04 18:28:00 +0900 (Sun, 04 Apr 2010)

Log Message:
-----------
Show Macro Windowにおいて、マクロウィンドウはforegroundへ持ってこられるようにした。
Show Macro Windowメニューのローカライズ化を行った。

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/teraterm/teraterm/ttdde.c
    trunk/teraterm/teraterm/vtwin.cpp


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2010-04-03 15:43:50 UTC (rev 3838)
+++ trunk/installer/release/lang/English.lng	2010-04-04 09:28:00 UTC (rev 3839)
@@ -66,6 +66,7 @@
 MENU_CONTROL_OPENTEK=&Open TEK
 MENU_CONTROL_CLOSETEK=&Close TEK
 MENU_CONTROL_MACRO=&Macro
+MENU_SHOW_MACRO_WINDOW=Show Macro &Window
 
 MENU_WINDOW=&Window
 MENU_WINDOW_WINDOW=&Window

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2010-04-03 15:43:50 UTC (rev 3838)
+++ trunk/installer/release/lang/German.lng	2010-04-04 09:28:00 UTC (rev 3839)
@@ -66,6 +66,7 @@
 MENU_CONTROL_OPENTEK=&Öffne TEK
 MENU_CONTROL_CLOSETEK=&Schliesse TEK
 MENU_CONTROL_MACRO=&Macro
+MENU_SHOW_MACRO_WINDOW=Show Macro &Window
 
 MENU_WINDOW=&Fenster
 MENU_WINDOW_WINDOW=&Fenster

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2010-04-03 15:43:50 UTC (rev 3838)
+++ trunk/installer/release/lang/Japanese.lng	2010-04-04 09:28:00 UTC (rev 3839)
@@ -66,6 +66,7 @@
 MENU_CONTROL_OPENTEK=TEKƒEƒBƒ“ƒhƒE‚ðŠJ‚­(&O)
 MENU_CONTROL_CLOSETEK=TEKƒEƒBƒ“ƒhƒE‚ð•Â‚¶‚é(&C)
 MENU_CONTROL_MACRO=ƒ}ƒNƒ(&M)
+MENU_SHOW_MACRO_WINDOW=ƒ}ƒNƒƒEƒBƒ“ƒhƒE‚Ì•\Ž¦(&W)
 
 MENU_WINDOW=ƒEƒBƒ“ƒhƒE(&W)
 MENU_WINDOW_WINDOW=ƒEƒBƒ“ƒhƒE(&W)

Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c	2010-04-03 15:43:50 UTC (rev 3838)
+++ trunk/teraterm/teraterm/ttdde.c	2010-04-04 09:28:00 UTC (rev 3839)
@@ -1098,7 +1098,6 @@
 	// ŠY“–‚·‚é"ttpmacro"‚ðƒtƒ‰ƒbƒVƒ…‚·‚éB
 	// (2010.4.2 yutaka, maya)
 	if ((FName == NULL && Startup == FALSE) && ConvH != 0) {
-#if 1
 		HWND hwnd;
 		DWORD pid_macro, pid;
 
@@ -1111,12 +1110,10 @@
 			}
 			hwnd = GetNextWindow(hwnd, GW_HWNDNEXT);
 		}
-#else
+
 		ShowWindow(HWndDdeCli, SW_NORMAL);
 		SetForegroundWindow(HWndDdeCli);
 		BringWindowToTop(HWndDdeCli);
-		FlashWindow(HWndDdeCli, TRUE);
-#endif
 
 		return;
 	}

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2010-04-03 15:43:50 UTC (rev 3838)
+++ trunk/teraterm/teraterm/vtwin.cpp	2010-04-04 09:28:00 UTC (rev 3839)
@@ -1206,9 +1206,13 @@
 	GetMenuString(ControlMenu, ID_CONTROL_CLOSETEK, uimsg, sizeof(uimsg), MF_BYCOMMAND);
 	get_lang_msg("MENU_CONTROL_CLOSETEK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	ModifyMenu(ControlMenu, ID_CONTROL_CLOSETEK, MF_BYCOMMAND, ID_CONTROL_CLOSETEK, ts.UIMsg);
+
 	GetMenuString(ControlMenu, ID_CONTROL_MACRO, uimsg, sizeof(uimsg), MF_BYCOMMAND);
 	get_lang_msg("MENU_CONTROL_MACRO", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	ModifyMenu(ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND, ID_CONTROL_MACRO, ts.UIMsg);
+	GetMenuString(ControlMenu, ID_SHOW_MACRO, uimsg, sizeof(uimsg), MF_BYCOMMAND);
+	get_lang_msg("MENU_SHOW_MACRO_WINDOW", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	ModifyMenu(ControlMenu, ID_SHOW_MACRO, MF_BYCOMMAND, ID_SHOW_MACRO, ts.UIMsg);
 
 	GetMenuString(*Menu, ID_HELPMENU, uimsg, sizeof(uimsg), MF_BYPOSITION);
 	get_lang_msg("MENU_HELP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);



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