svnno****@sourc*****
svnno****@sourc*****
2010年 4月 5日 (月) 12:37:18 JST
Tera TermRevision: 3842
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3842
Author: maya
Date: 2010-04-05 12:37:18 +0900 (Mon, 05 Apr 2010)
Log Message:
-----------
"Show Macro Window" メニュー㮠ID ãŠã‚ˆã³å®šç¾©ã‚’ä¿®æ£
"Show Macro Window" メニューを "Macro" ã®ä¸‹ã«ç§»å‹•ã—ãŸ
Modified Paths:
--------------
trunk/doc/en/html/reference/keycode.txt
trunk/doc/ja/html/reference/keycode.txt
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/ttermpro.rc
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/reference/keycode.txt
===================================================================
--- trunk/doc/en/html/reference/keycode.txt 2010-04-04 14:45:45 UTC (rev 3841)
+++ trunk/doc/en/html/reference/keycode.txt 2010-04-05 03:37:18 UTC (rev 3842)
@@ -424,6 +424,7 @@
[Control] Open TEK 50450
[Control] Close TEK 50460
[Control] Macro 50470
+[Control] Show Macro Window 50480
[Window] Window 50810
[Help] Index 50910
[Help] About Tera Term 50990
Modified: trunk/doc/ja/html/reference/keycode.txt
===================================================================
--- trunk/doc/ja/html/reference/keycode.txt 2010-04-04 14:45:45 UTC (rev 3841)
+++ trunk/doc/ja/html/reference/keycode.txt 2010-04-05 03:37:18 UTC (rev 3842)
@@ -434,6 +434,7 @@
[Control] Open TEK 50450
[Control] Close TEK 50460
[Control] Macro 50470
+[Control] Show Macro Window 50480
[Window] Window 50810
[Help] Index 50910
[Help] About Tera Term 50990
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2010-04-04 14:45:45 UTC (rev 3841)
+++ trunk/installer/release/lang/English.lng 2010-04-05 03:37:18 UTC (rev 3842)
@@ -66,7 +66,7 @@
MENU_CONTROL_OPENTEK=&Open TEK
MENU_CONTROL_CLOSETEK=&Close TEK
MENU_CONTROL_MACRO=&Macro
-MENU_SHOW_MACRO_WINDOW=Show Macro &Window
+MENU_CONTROL_SHOW_MACRO=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-04 14:45:45 UTC (rev 3841)
+++ trunk/installer/release/lang/German.lng 2010-04-05 03:37:18 UTC (rev 3842)
@@ -66,7 +66,7 @@
MENU_CONTROL_OPENTEK=&Öffne TEK
MENU_CONTROL_CLOSETEK=&Schliesse TEK
MENU_CONTROL_MACRO=&Macro
-MENU_SHOW_MACRO_WINDOW=Show Macro &Window
+MENU_CONTROL_SHOW_MACRO=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-04 14:45:45 UTC (rev 3841)
+++ trunk/installer/release/lang/Japanese.lng 2010-04-05 03:37:18 UTC (rev 3842)
@@ -66,7 +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_CONTROL_SHOW_MACRO=ƒ}ƒNƒƒEƒBƒ“ƒhƒE‚Ì•\Ž¦(&W)
MENU_WINDOW=ƒEƒBƒ“ƒhƒE(&W)
MENU_WINDOW_WINDOW=ƒEƒBƒ“ƒhƒE(&W)
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2010-04-04 14:45:45 UTC (rev 3841)
+++ trunk/teraterm/common/tt_res.h 2010-04-05 03:37:18 UTC (rev 3842)
@@ -210,6 +210,7 @@
#define ID_CONTROL_OPENTEK 50450
#define ID_CONTROL_CLOSETEK 50460
#define ID_CONTROL_MACRO 50470
+#define ID_CONTROL_SHOW_MACRO 50480
#define ID_HELP_INDEX2 50910
#define ID_HELP_USING2 50920
#define ID_HELP_ABOUT 50990
@@ -228,7 +229,6 @@
#define ID_TEKHELP_ABOUT 51990
#define ID_EDIT_EXTERNALSETUP 52005
#define ID_FILE_TERATERMMENU 52006
-#define ID_SHOW_MACRO 52030
// Next default values for new objects
//
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2010-04-04 14:45:45 UTC (rev 3841)
+++ trunk/teraterm/teraterm/ttermpro.rc 2010-04-05 03:37:18 UTC (rev 3842)
@@ -520,8 +520,8 @@
MENUITEM "&Open TEK", ID_CONTROL_OPENTEK
MENUITEM "&Close TEK", ID_CONTROL_CLOSETEK
MENUITEM SEPARATOR
- MENUITEM "Show Macro &Window", 52030, GRAYED
MENUITEM "&Macro", ID_CONTROL_MACRO
+ MENUITEM "Show Macro &Window", ID_CONTROL_SHOW_MACRO
END
POPUP "&Help"
BEGIN
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2010-04-04 14:45:45 UTC (rev 3841)
+++ trunk/teraterm/teraterm/vtwin.cpp 2010-04-05 03:37:18 UTC (rev 3842)
@@ -203,7 +203,7 @@
ON_COMMAND(ID_CONTROL_OPENTEK, OnControlOpenTEK)
ON_COMMAND(ID_CONTROL_CLOSETEK, OnControlCloseTEK)
ON_COMMAND(ID_CONTROL_MACRO, OnControlMacro)
- ON_COMMAND(ID_SHOW_MACRO, OnShowMacroWindow)
+ ON_COMMAND(ID_CONTROL_SHOW_MACRO, OnShowMacroWindow)
ON_COMMAND(ID_WINDOW_WINDOW, OnWindowWindow)
ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
@@ -1210,9 +1210,9 @@
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(ControlMenu, ID_CONTROL_SHOW_MACRO, uimsg, sizeof(uimsg), MF_BYCOMMAND);
+ get_lang_msg("MENU_CONTROL_SHOW_MACRO", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+ ModifyMenu(ControlMenu, ID_CONTROL_SHOW_MACRO, MF_BYCOMMAND, ID_CONTROL_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);
@@ -1373,11 +1373,11 @@
if ((ConvH!=0) || (FileVar!=NULL)) {
EnableMenuItem(ControlMenu,ID_CONTROL_MACRO,MF_BYCOMMAND | MF_GRAYED);
- EnableMenuItem(ControlMenu,ID_SHOW_MACRO,MF_BYCOMMAND | MF_ENABLED);
+ EnableMenuItem(ControlMenu,ID_CONTROL_SHOW_MACRO,MF_BYCOMMAND | MF_ENABLED);
}
else {
EnableMenuItem(ControlMenu,ID_CONTROL_MACRO,MF_BYCOMMAND | MF_ENABLED);
- EnableMenuItem(ControlMenu,ID_SHOW_MACRO,MF_BYCOMMAND | MF_GRAYED);
+ EnableMenuItem(ControlMenu,ID_CONTROL_SHOW_MACRO,MF_BYCOMMAND | MF_GRAYED);
}
}