OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revisão7264 (tree)
Hora2018-11-18 00:43:41
Autorzmatsuo

Mensagem de Log

言語設定を変更するとすぐにダイアログで有効となるよう修正

Mudança Sumário

Diff

--- branches/cmake/teraterm/common/ttcommon.h (revision 7263)
+++ branches/cmake/teraterm/common/ttcommon.h (revision 7264)
@@ -74,13 +74,13 @@
7474 DllExport void WINAPI SelectWin(int WinId);
7575 DllExport void WINAPI SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
7676 DllExport HWND WINAPI GetNthWin(int n);
77-DllExport int WINAPI GetRegisteredWindowCount();
77+DllExport int WINAPI GetRegisteredWindowCount(void);
7878 DllExport void WINAPI ShowAllWin(int stat);
7979 DllExport void WINAPI ShowAllWinSidebySide(HWND);
8080 DllExport void WINAPI ShowAllWinStacked(HWND);
8181 DllExport void WINAPI ShowAllWinCascade(HWND);
8282 DllExport void WINAPI BroadcastClosingMessage(HWND myhwnd);
83-DllExport void WINAPI UndoAllWin();
83+DllExport void WINAPI UndoAllWin(void);
8484 DllExport void WINAPI OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
8585
8686 DllExport int WINAPI CommReadRawByte(PComVar cv, LPBYTE b);
@@ -100,7 +100,7 @@
100100 DllExport void WINAPI HideNotifyIcon(PComVar cv);
101101 DllExport void WINAPI SetVerNotifyIcon(PComVar cv, unsigned int ver);
102102 DllExport void WINAPI SetCustomNotifyIcon(HICON icon);
103-DllExport HICON WINAPI GetCustomNotifyIcon();
103+DllExport HICON WINAPI GetCustomNotifyIcon(void);
104104
105105 #define NotifyInfoMessage(cv, msg, title) NotifyMessage(cv, msg, title, 1)
106106 #define NotifyWarnMessage(cv, msg, title) NotifyMessage(cv, msg, title, 2)
--- branches/cmake/teraterm/teraterm/vtwin.cpp (revision 7263)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp (revision 7264)
@@ -1187,84 +1187,84 @@
11871187 void CVTWindow::InitMenu(HMENU *Menu)
11881188 {
11891189 static const DlgTextInfo MenuTextInfo[] = {
1190- ID_FILE, "MENU_FILE",
1191- ID_EDIT, "MENU_EDIT",
1192- ID_SETUP, "MENU_SETUP",
1193- ID_CONTROL, "MENU_CONTROL",
1194- ID_HELPMENU, "MENU_HELP",
1190+ { ID_FILE, "MENU_FILE" },
1191+ { ID_EDIT, "MENU_EDIT" },
1192+ { ID_SETUP, "MENU_SETUP" },
1193+ { ID_CONTROL, "MENU_CONTROL" },
1194+ { ID_HELPMENU, "MENU_HELP" },
11951195 };
11961196 static const DlgTextInfo FileMenuTextInfo[] = {
1197- ID_FILE_NEWCONNECTION, "MENU_FILE_NEW",
1198- ID_FILE_DUPLICATESESSION, "MENU_FILE_DUPLICATE",
1199- ID_FILE_CYGWINCONNECTION, "MENU_FILE_GYGWIN",
1200- ID_FILE_LOG, "MENU_FILE_LOG",
1201- ID_FILE_COMMENTTOLOG, "MENU_FILE_COMMENTLOG",
1202- ID_FILE_VIEWLOG, "MENU_FILE_VIEWLOG",
1203- ID_FILE_SHOWLOGDIALOG, "MENU_FILE_SHOWLOGDIALOG",
1204- ID_FILE_SENDFILE, "MENU_FILE_SENDFILE",
1205- ID_FILE_REPLAYLOG, "MENU_FILE_REPLAYLOG",
1206- ID_FILE_CHANGEDIR, "MENU_FILE_CHANGEDIR",
1207- ID_FILE_LOGMEIN, "MENU_FILE_LOGMETT",
1208- ID_FILE_PRINT2, "MENU_FILE_PRINT",
1209- ID_FILE_DISCONNECT, "MENU_FILE_DISCONNECT",
1210- ID_FILE_EXIT, "MENU_FILE_EXIT",
1211- ID_FILE_EXITALL, "MENU_FILE_EXITALL",
1212- 9, "MENU_TRANS",
1213- ID_FILE_KERMITRCV, "MENU_TRANS_KERMIT_RCV",
1214- ID_FILE_KERMITGET, "MENU_TRANS_KERMIT_GET",
1215- ID_FILE_KERMITSEND, "MENU_TRANS_KERMIT_SEND",
1216- ID_FILE_KERMITFINISH, "MENU_TRANS_KERMIT_FINISH",
1217- ID_FILE_XRCV, "MENU_TRANS_X_RCV",
1218- ID_FILE_XSEND, "MENU_TRANS_X_SEND",
1219- ID_FILE_YRCV, "MENU_TRANS_Y_RCV",
1220- ID_FILE_YSEND, "MENU_TRANS_Y_SEND",
1221- ID_FILE_ZRCV, "MENU_TRANS_Z_RCV",
1222- ID_FILE_ZSEND, "MENU_TRANS_Z_SEND",
1223- ID_FILE_BPRCV, "MENU_TRANS_BP_RCV",
1224- ID_FILE_BPSEND, "MENU_TRANS_BP_SEND",
1225- ID_FILE_QVRCV, "MENU_TRANS_QV_RCV",
1226- ID_FILE_QVSEND, "MENU_TRANS_QV_SEND",
1197+ { ID_FILE_NEWCONNECTION, "MENU_FILE_NEW" },
1198+ { ID_FILE_DUPLICATESESSION, "MENU_FILE_DUPLICATE" },
1199+ { ID_FILE_CYGWINCONNECTION, "MENU_FILE_GYGWIN" },
1200+ { ID_FILE_LOG, "MENU_FILE_LOG" },
1201+ { ID_FILE_COMMENTTOLOG, "MENU_FILE_COMMENTLOG" },
1202+ { ID_FILE_VIEWLOG, "MENU_FILE_VIEWLOG" },
1203+ { ID_FILE_SHOWLOGDIALOG, "MENU_FILE_SHOWLOGDIALOG" },
1204+ { ID_FILE_SENDFILE, "MENU_FILE_SENDFILE" },
1205+ { ID_FILE_REPLAYLOG, "MENU_FILE_REPLAYLOG" },
1206+ { ID_FILE_CHANGEDIR, "MENU_FILE_CHANGEDIR" },
1207+ { ID_FILE_LOGMEIN, "MENU_FILE_LOGMETT" },
1208+ { ID_FILE_PRINT2, "MENU_FILE_PRINT" },
1209+ { ID_FILE_DISCONNECT, "MENU_FILE_DISCONNECT" },
1210+ { ID_FILE_EXIT, "MENU_FILE_EXIT" },
1211+ { ID_FILE_EXITALL, "MENU_FILE_EXITALL" },
1212+ { 9, "MENU_TRANS" },
1213+ { ID_FILE_KERMITRCV, "MENU_TRANS_KERMIT_RCV" },
1214+ { ID_FILE_KERMITGET, "MENU_TRANS_KERMIT_GET" },
1215+ { ID_FILE_KERMITSEND, "MENU_TRANS_KERMIT_SEND" },
1216+ { ID_FILE_KERMITFINISH, "MENU_TRANS_KERMIT_FINISH" },
1217+ { ID_FILE_XRCV, "MENU_TRANS_X_RCV" },
1218+ { ID_FILE_XSEND, "MENU_TRANS_X_SEND" },
1219+ { ID_FILE_YRCV, "MENU_TRANS_Y_RCV" },
1220+ { ID_FILE_YSEND, "MENU_TRANS_Y_SEND" },
1221+ { ID_FILE_ZRCV, "MENU_TRANS_Z_RCV" },
1222+ { ID_FILE_ZSEND, "MENU_TRANS_Z_SEND" },
1223+ { ID_FILE_BPRCV, "MENU_TRANS_BP_RCV" },
1224+ { ID_FILE_BPSEND, "MENU_TRANS_BP_SEND" },
1225+ { ID_FILE_QVRCV, "MENU_TRANS_QV_RCV" },
1226+ { ID_FILE_QVSEND, "MENU_TRANS_QV_SEND" },
12271227 };
12281228 static const DlgTextInfo EditMenuTextInfo[] = {
1229- ID_EDIT_COPY2, "MENU_EDIT_COPY",
1230- ID_EDIT_COPYTABLE, "MENU_EDIT_COPYTABLE",
1231- ID_EDIT_PASTE2, "MENU_EDIT_PASTE",
1232- ID_EDIT_PASTECR, "MENU_EDIT_PASTECR",
1233- ID_EDIT_CLEARSCREEN, "MENU_EDIT_CLSCREEN",
1234- ID_EDIT_CLEARBUFFER, "MENU_EDIT_CLBUFFER",
1235- ID_EDIT_CANCELSELECT, "MENU_EDIT_CANCELSELECT",
1236- ID_EDIT_SELECTSCREEN, "MENU_EDIT_SELECTSCREEN",
1237- ID_EDIT_SELECTALL, "MENU_EDIT_SELECTALL",
1229+ { ID_EDIT_COPY2, "MENU_EDIT_COPY" },
1230+ { ID_EDIT_COPYTABLE, "MENU_EDIT_COPYTABLE" },
1231+ { ID_EDIT_PASTE2, "MENU_EDIT_PASTE" },
1232+ { ID_EDIT_PASTECR, "MENU_EDIT_PASTECR" },
1233+ { ID_EDIT_CLEARSCREEN, "MENU_EDIT_CLSCREEN" },
1234+ { ID_EDIT_CLEARBUFFER, "MENU_EDIT_CLBUFFER" },
1235+ { ID_EDIT_CANCELSELECT, "MENU_EDIT_CANCELSELECT" },
1236+ { ID_EDIT_SELECTSCREEN, "MENU_EDIT_SELECTSCREEN" },
1237+ { ID_EDIT_SELECTALL, "MENU_EDIT_SELECTALL" },
12381238 };
12391239 static const DlgTextInfo SetupMenuTextInfo1[] = {
1240- ID_SETUP_TERMINAL, "MENU_SETUP_TERMINAL",
1241- ID_SETUP_WINDOW, "MENU_SETUP_WINDOW",
1242- ID_SETUP_FONT, "MENU_SETUP_FONT",
1243- ID_SETUP_KEYBOARD, "MENU_SETUP_KEYBOARD",
1244- ID_SETUP_SERIALPORT, "MENU_SETUP_SERIALPORT",
1245- ID_SETUP_TCPIP, "MENU_SETUP_TCPIP",
1246- ID_SETUP_GENERAL, "MENU_SETUP_GENERAL",
1247- ID_SETUP_ADDITIONALSETTINGS, "MENU_SETUP_ADDITION",
1248- ID_SETUP_SAVE, "MENU_SETUP_SAVE",
1249- ID_SETUP_RESTORE, "MENU_SETUP_RESTORE",
1250- ID_OPEN_SETUP, "MENU_SETUP_OPENSETUP",
1251- ID_SETUP_LOADKEYMAP, "MENU_SETUP_LOADKEYMAP",
1240+ { ID_SETUP_TERMINAL, "MENU_SETUP_TERMINAL" },
1241+ { ID_SETUP_WINDOW, "MENU_SETUP_WINDOW" },
1242+ { ID_SETUP_FONT, "MENU_SETUP_FONT" },
1243+ { ID_SETUP_KEYBOARD, "MENU_SETUP_KEYBOARD" },
1244+ { ID_SETUP_SERIALPORT, "MENU_SETUP_SERIALPORT" },
1245+ { ID_SETUP_TCPIP, "MENU_SETUP_TCPIP" },
1246+ { ID_SETUP_GENERAL, "MENU_SETUP_GENERAL" },
1247+ { ID_SETUP_ADDITIONALSETTINGS, "MENU_SETUP_ADDITION" },
1248+ { ID_SETUP_SAVE, "MENU_SETUP_SAVE" },
1249+ { ID_SETUP_RESTORE, "MENU_SETUP_RESTORE" },
1250+ { ID_OPEN_SETUP, "MENU_SETUP_OPENSETUP" },
1251+ { ID_SETUP_LOADKEYMAP, "MENU_SETUP_LOADKEYMAP" },
12521252 };
12531253 static const DlgTextInfo ControlMenuTextInfo1[] = {
1254- ID_CONTROL_RESETTERMINAL, "MENU_CONTROL_RESET",
1255- ID_CONTROL_RESETREMOTETITLE, "MENU_CONTROL_RESETTITLE",
1256- ID_CONTROL_AREYOUTHERE, "MENU_CONTROL_AREYOUTHERE",
1257- ID_CONTROL_SENDBREAK, "MENU_CONTROL_SENDBREAK",
1258- ID_CONTROL_RESETPORT, "MENU_CONTROL_RESETPORT",
1259- ID_CONTROL_BROADCASTCOMMAND, "MENU_CONTROL_BROADCAST",
1260- ID_CONTROL_OPENTEK, "MENU_CONTROL_OPENTEK",
1261- ID_CONTROL_CLOSETEK, "MENU_CONTROL_CLOSETEK",
1262- ID_CONTROL_MACRO, "MENU_CONTROL_MACRO",
1263- ID_CONTROL_SHOW_MACRO, "MENU_CONTROL_SHOW_MACRO",
1254+ { ID_CONTROL_RESETTERMINAL, "MENU_CONTROL_RESET" },
1255+ { ID_CONTROL_RESETREMOTETITLE, "MENU_CONTROL_RESETTITLE" },
1256+ { ID_CONTROL_AREYOUTHERE, "MENU_CONTROL_AREYOUTHERE" },
1257+ { ID_CONTROL_SENDBREAK, "MENU_CONTROL_SENDBREAK" },
1258+ { ID_CONTROL_RESETPORT, "MENU_CONTROL_RESETPORT" },
1259+ { ID_CONTROL_BROADCASTCOMMAND, "MENU_CONTROL_BROADCAST" },
1260+ { ID_CONTROL_OPENTEK, "MENU_CONTROL_OPENTEK" },
1261+ { ID_CONTROL_CLOSETEK, "MENU_CONTROL_CLOSETEK" },
1262+ { ID_CONTROL_MACRO, "MENU_CONTROL_MACRO" },
1263+ { ID_CONTROL_SHOW_MACRO, "MENU_CONTROL_SHOW_MACRO" },
12641264 };
12651265 static const DlgTextInfo HelpMenuTextInfo[] = {
1266- ID_HELP_INDEX2, "MENU_HELP_INDEX",
1267- ID_HELP_ABOUT, "MENU_HELP_ABOUT",
1266+ { ID_HELP_INDEX2, "MENU_HELP_INDEX" },
1267+ { ID_HELP_ABOUT, "MENU_HELP_ABOUT" },
12681268 };
12691269
12701270 HMENU hMenu = LoadMenu(AfxGetInstanceHandle(),
@@ -1284,7 +1284,7 @@
12841284 WinMenu = CreatePopupMenu();
12851285 get_lang_msgT("MENU_WINDOW", uimsg, _countof(uimsg),
12861286 _T("&Window"), ts.UILanguageFile);
1287- ::InsertMenu(*Menu, ID_HELPMENU,
1287+ ::InsertMenu(hMenu, ID_HELPMENU,
12881288 MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
12891289 (int)WinMenu, uimsg);
12901290 }
@@ -1302,7 +1302,7 @@
13021302 SetDlgMenuTexts(hMenu, ControlMenuTextInfo1, _countof(ControlMenuTextInfo1), ts.UILanguageFile);
13031303 SetDlgMenuTexts(hMenu, HelpMenuTextInfo, _countof(HelpMenuTextInfo), ts.UILanguageFile);
13041304
1305- TTXModifyMenu(*Menu); /* TTPLUG */
1305+ TTXModifyMenu(hMenu); /* TTPLUG */
13061306 }
13071307
13081308 void CVTWindow::InitMenuPopup(HMENU SubMenu)
@@ -1478,8 +1478,8 @@
14781478 void CVTWindow::InitPasteMenu(HMENU *Menu)
14791479 {
14801480 static const DlgTextInfo MenuTextInfo[] = {
1481- ID_EDIT_PASTE2, "MENU_EDIT_PASTE",
1482- ID_EDIT_PASTECR, "MENU_EDIT_PASTECR",
1481+ { ID_EDIT_PASTE2, "MENU_EDIT_PASTE" },
1482+ { ID_EDIT_PASTECR, "MENU_EDIT_PASTECR" },
14831483 };
14841484 *Menu = LoadMenu(AfxGetInstanceHandle(),
14851485 MAKEINTRESOURCE(IDR_PASTEMENU));
--- branches/cmake/teraterm/ttpdlg/ttdlg.c (revision 7263)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c (revision 7264)
@@ -1459,7 +1459,7 @@
14591459 (Index==i-1)) {
14601460 return TRUE;
14611461 }
1462- SendDlgItemMessage(Dialog, IDC_TCPIPLIST, LB_GETTEXT,
1462+ SendDlgItemMessageA(Dialog, IDC_TCPIPLIST, LB_GETTEXT,
14631463 Index, (LPARAM)TempHost);
14641464 SendDlgItemMessage(Dialog, IDC_TCPIPLIST, LB_DELETESTRING,
14651465 Index, 0);
@@ -2553,7 +2553,6 @@
25532553 static int langui_sel = 1, uilist_count = 0;
25542554 PTTSet ts;
25552555 WORD w;
2556- char Temp[8];
25572556
25582557 switch (Message) {
25592558 case WM_INITDIALOG:
@@ -2565,6 +2564,7 @@
25652564 SendDlgItemMessageA(Dialog, IDC_GENPORT, CB_ADDSTRING,
25662565 0, (LPARAM)"TCP/IP");
25672566 for (w=1;w<=ts->MaxComPort;w++) {
2567+ char Temp[8];
25682568 _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "COM%d", w);
25692569 SendDlgItemMessageA(Dialog, IDC_GENPORT, CB_ADDSTRING,
25702570 0, (LPARAM)Temp);
@@ -2640,6 +2640,8 @@
26402640 _fullpath(ts->UILanguageFile, ts->UILanguageFile_ini, sizeof(ts->UILanguageFile));
26412641 SetCurrentDirectoryA(CurDir);
26422642
2643+ strncpy_s(UILanguageFile, sizeof(UILanguageFile), ts->UILanguageFile, _TRUNCATE);
2644+
26432645 // タイトルの更新を行う。(2014.2.23 yutaka)
26442646 PostMessage(GetParent(Dialog),WM_USER_CHANGETITLE,0,0);
26452647 }
Show on old repository browser