Tera TermRevision: 9104
https://osdn.net/projects/ttssh2/scm/svn/commits/9104
Author: zmatsuo
Date: 2020-12-20 21:16:27 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
ttftypes.h への依存を減らした
- 不要な ttftypes.h の include を削除
- logダイアログのタイトルを filesys_log.cpp へ移動
- FILEDLG_TRANS_TITLE_LOGのデフォルト値
- ファイル送信ダイアログのタイトルを sendfiledlg.cpp へ移動
- FILEDLG_TRANS_TITLE_SENDFILEのデフォルト値
Modified Paths:
--------------
trunk/teraterm/common/ttftypes.h
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/filesys_log.cpp
trunk/teraterm/teraterm/ftdlg.cpp
trunk/teraterm/teraterm/protodlg.cpp
trunk/teraterm/teraterm/sendfiledlg.cpp
trunk/teraterm/teraterm/sendmem.cpp
trunk/teraterm/teraterm/ttdde.c
trunk/teraterm/teraterm/vtterm.c
trunk/teraterm/ttpfile/bplus.c
trunk/teraterm/ttpfile/ftlib.c
trunk/teraterm/ttpfile/kermit.c
trunk/teraterm/ttpfile/quickvan.c
trunk/teraterm/ttpfile/ymodem.c
trunk/teraterm/ttpfile/zmodem.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttftypes.h
===================================================================
--- trunk/teraterm/common/ttftypes.h 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/common/ttftypes.h 2020-12-20 12:16:27 UTC (rev 9104)
@@ -36,6 +36,3 @@
#define PROTO_BP 4
#define PROTO_QV 5
#define PROTO_YM 6
-
-#define TitLog "Log"
-#define TitSendFile "Send file"
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:16:27 UTC (rev 9104)
@@ -37,7 +37,6 @@
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include "ftdlg.h"
#include "ttwinman.h"
#include "commlib.h"
Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/filesys_log.cpp 2020-12-20 12:16:27 UTC (rev 9104)
@@ -40,7 +40,6 @@
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include "ftdlg.h"
#include "ttwinman.h"
#include "commlib.h"
@@ -60,6 +59,8 @@
#include "filesys_log.h"
#include "filesys.h" // for ProtoGetProtoFlag()
+#define TitLog L"Log"
+
/*
Line Head flag for timestamping
2007.05.24 Gentaro
@@ -135,8 +136,7 @@
wchar_t *DlgCaption;
wchar_t uimsg[MAX_UIMSG];
-#define TitLogW L"Log"
- get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLogW, ts.UILanguageFile);
+ get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLog, ts.UILanguageFile);
aswprintf(&DlgCaption, L"Tera Term: %s", uimsg);
CFileTransDlg::Info info;
@@ -590,8 +590,7 @@
wchar_t caption[MAX_PATH];
wchar_t uimsg[MAX_UIMSG];
-#define TitLogW L"Log"
- get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLogW, UILanguageFile);
+ get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLog, UILanguageFile);
wcsncpy_s(caption, _countof(caption), L"Tera Term: ", _TRUNCATE);
wcsncat_s(caption, _countof(caption), uimsg, _TRUNCATE);
Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/ftdlg.cpp 2020-12-20 12:16:27 UTC (rev 9104)
@@ -36,7 +36,6 @@
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include "ttlib.h"
#include "dlglib.h"
#include "tt_res.h"
Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/protodlg.cpp 2020-12-20 12:16:27 UTC (rev 9104)
@@ -31,7 +31,6 @@
#include "teraterm.h"
#include "tt_res.h"
#include "tttypes.h"
-//#include "ttftypes.h"
#include "ttlib.h"
#include "dlglib.h"
#include "protodlg.h"
Modified: trunk/teraterm/teraterm/sendfiledlg.cpp
===================================================================
--- trunk/teraterm/teraterm/sendfiledlg.cpp 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/sendfiledlg.cpp 2020-12-20 12:16:27 UTC (rev 9104)
@@ -41,12 +41,11 @@
#include "tttypes.h" // for WM_USER_DLGHELP2
#include "helpid.h"
#include "codeconv.h"
-#include "ttftypes.h" // for TitSendFile
#include "asprintf.h"
#include "sendfiledlg.h"
-#define TitSendFileW L"Send file" // TODO ttftype.h\x93\xE0\x82\xC9ANSI\x94ł\xAA\x82\xA0\x82\xE9
+#define TitSendFile L"Send file"
static INT_PTR CALLBACK SendFileDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
{
@@ -143,7 +142,7 @@
wchar_t TempDir[MAX_PATH];
_GetCurrentDirectoryW(_countof(TempDir), TempDir);
- wchar_t *uimsg = TTGetLangStrW("Tera Term", "FILEDLG_TRANS_TITLE_SENDFILE", TitSendFileW, data->UILanguageFile);
+ wchar_t *uimsg = TTGetLangStrW("Tera Term", "FILEDLG_TRANS_TITLE_SENDFILE", TitSendFile, data->UILanguageFile);
wchar_t *title;
aswprintf(&title, L"Tera Term: %s", uimsg);
free(uimsg);
Modified: trunk/teraterm/teraterm/sendmem.cpp
===================================================================
--- trunk/teraterm/teraterm/sendmem.cpp 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/sendmem.cpp 2020-12-20 12:16:27 UTC (rev 9104)
@@ -44,8 +44,7 @@
#define SENDMEM_USE_OLD_API 1
#if SENDMEM_USE_OLD_API
-#include "ttftypes.h" // for TFileVar
-#include "filesys.h" // for SendVar
+#include "filesys.h" // for FileSendStart()
#else
#include "fileread.h"
#endif
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/ttdde.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -34,7 +34,6 @@
#include <string.h>
#include <ddeml.h>
#include "ttwinman.h"
-#include "ttftypes.h"
#include "filesys.h"
#include "ttsetup.h"
#include "telnet.h"
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/teraterm/vtterm.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -49,7 +49,6 @@
#include "vtdisp.h"
#include "keyboard.h"
#include "ttlib.h"
-#include "ttftypes.h"
#include "filesys.h"
#include "teraprn.h"
#include "telnet.h"
Modified: trunk/teraterm/ttpfile/bplus.c
===================================================================
--- trunk/teraterm/ttpfile/bplus.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/ttpfile/bplus.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -30,7 +30,6 @@
/* TTFILE.DLL, B-Plus protocol */
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include <string.h>
#include "tt_res.h"
Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/ttpfile/ftlib.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -31,7 +31,6 @@
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include "ttlib.h"
#include <stdio.h>
#include <string.h>
Modified: trunk/teraterm/ttpfile/kermit.c
===================================================================
--- trunk/teraterm/ttpfile/kermit.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/ttpfile/kermit.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -30,7 +30,6 @@
/* TTFILE.DLL, Kermit protocol */
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include <stdio.h>
#include <time.h>
#include <string.h>
Modified: trunk/teraterm/ttpfile/quickvan.c
===================================================================
--- trunk/teraterm/ttpfile/quickvan.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/ttpfile/quickvan.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -30,7 +30,6 @@
/* TTFILE.DLL, Quick-VAN protocol */
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include <stdio.h>
#include <string.h>
#include <time.h>
Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/ttpfile/ymodem.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -35,7 +35,6 @@
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include "tt_res.h"
#include "ttcommon.h"
Modified: trunk/teraterm/ttpfile/zmodem.c
===================================================================
--- trunk/teraterm/ttpfile/zmodem.c 2020-12-20 12:16:14 UTC (rev 9103)
+++ trunk/teraterm/ttpfile/zmodem.c 2020-12-20 12:16:27 UTC (rev 9104)
@@ -45,7 +45,6 @@
/* TTFILE.DLL, ZMODEM protocol */
#include "teraterm.h"
#include "tttypes.h"
-#include "ttftypes.h"
#include <stdio.h>
#include <stdarg.h>