svnno****@sourc*****
svnno****@sourc*****
2014年 7月 6日 (日) 20:51:04 JST
Tera TermRevision: 5636
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5636
Author: yutakapon
Date: 2014-07-06 20:51:03 +0900 (Sun, 06 Jul 2014)
Log Message:
-----------
チケット #33967 言語UI変更でヘルプが切り替わらない
設定 - 全般 - 言語UIで、メッセージカタログを切り替えた場合、ヘルプファイルも
切り替わるようにした。
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/33967
Modified Paths:
--------------
trunk/teraterm/common/ttcommon.h
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpmacro/errdlg.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h 2014-07-06 11:01:23 UTC (rev 5635)
+++ trunk/teraterm/common/ttcommon.h 2014-07-06 11:51:03 UTC (rev 5636)
@@ -40,7 +40,7 @@
void FAR PASCAL ShowAllWinCascade(HWND);
void FAR PASCAL BroadcastClosingMessage(HWND myhwnd);
void FAR PASCAL UndoAllWin();
-void FAR PASCAL OpenHelp(UINT Command, DWORD Data);
+void FAR PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2014-07-06 11:01:23 UTC (rev 5635)
+++ trunk/teraterm/teraterm/tekwin.cpp 2014-07-06 11:51:03 UTC (rev 5636)
@@ -696,7 +696,7 @@
LONG CTEKWindow::OnDlgHelp(UINT wParam, LONG lParam)
{
- OpenHelp(HH_HELP_CONTEXT,HelpId);
+ OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
return 0;
}
@@ -819,7 +819,7 @@
void CTEKWindow::OnHelpIndex()
{
- OpenHelp(HH_DISPLAY_TOPIC,0);
+ OpenHelp(HH_DISPLAY_TOPIC, 0, ts.UILanguageFile);
}
void CTEKWindow::OnHelpAbout()
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2014-07-06 11:01:23 UTC (rev 5635)
+++ trunk/teraterm/teraterm/vtwin.cpp 2014-07-06 11:51:03 UTC (rev 5636)
@@ -1811,7 +1811,7 @@
}
CommClose(&cv);
- OpenHelp(HH_CLOSE_ALL,0);
+ OpenHelp(HH_CLOSE_ALL, 0, ts.UILanguageFile);
FreeIME();
FreeTTSET();
@@ -3516,7 +3516,7 @@
LONG CVTWindow::OnDlgHelp(UINT wParam, LONG lParam)
{
- OpenHelp(HH_HELP_CONTEXT,HelpId);
+ OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
return 0;
}
@@ -5426,7 +5426,7 @@
void CVTWindow::OnHelpIndex()
{
- OpenHelp(HH_DISPLAY_TOPIC,0);
+ OpenHelp(HH_DISPLAY_TOPIC, 0, ts.UILanguageFile);
}
void CVTWindow::OnHelpAbout()
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2014-07-06 11:01:23 UTC (rev 5635)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2014-07-06 11:51:03 UTC (rev 5636)
@@ -1126,13 +1126,13 @@
}
}
-void FAR PASCAL OpenHelp(UINT Command, DWORD Data)
+void FAR PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
{
char HomeDir[MAX_PATH];
char Temp[MAX_PATH];
HWND HWin;
char HelpFN[MAX_PATH];
- char UILanguageFile[MAX_PATH];
+// char UILanguageFile[MAX_PATH];
char uimsg[MAX_UIMSG];
/* Get home directory */
@@ -1141,7 +1141,7 @@
}
ExtractDirName(Temp, HomeDir);
- GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
+// GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
get_lang_msg("HELPFILE", uimsg, sizeof(uimsg), "teraterm.chm", UILanguageFile);
// \x83w\x83\x8B\x83v\x82̃I\x81[\x83i\x81[\x82͏\xED\x82Ƀf\x83X\x83N\x83g\x83b\x83v\x82ɂȂ\xE9 (2007.5.12 maya)
Modified: trunk/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/errdlg.cpp 2014-07-06 11:01:23 UTC (rev 5635)
+++ trunk/teraterm/ttpmacro/errdlg.cpp 2014-07-06 11:51:03 UTC (rev 5636)
@@ -115,5 +115,5 @@
void CErrDlg::OnBnClickedMacroerrhelp()
{
- OpenHelp(HH_HELP_CONTEXT,HlpMacroAppendixesError);
+ OpenHelp(HH_HELP_CONTEXT, HlpMacroAppendixesError, UILanguageFile);
}