Tera TermRevision: 8985
https://osdn.net/projects/ttssh2/scm/svn/commits/8985
Author: zmatsuo
Date: 2020-11-02 00:32:38 +0900 (Mon, 02 Nov 2020)
Log Message:
-----------
ftdlg.cpp,h 無効部分削除、OpLog,OpSendFileを移動
Modified Paths:
--------------
branches/proto_unicode/teraterm/common/ttftypes.h
branches/proto_unicode/teraterm/teraterm/filesys.cpp
branches/proto_unicode/teraterm/teraterm/filesys_log.cpp
branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp
branches/proto_unicode/teraterm/teraterm/ftdlg.cpp
branches/proto_unicode/teraterm/teraterm/ftdlg.h
-------------- next part --------------
Modified: branches/proto_unicode/teraterm/common/ttftypes.h
===================================================================
--- branches/proto_unicode/teraterm/common/ttftypes.h 2020-11-01 15:32:22 UTC (rev 8984)
+++ branches/proto_unicode/teraterm/common/ttftypes.h 2020-11-01 15:32:38 UTC (rev 8985)
@@ -37,8 +37,8 @@
#define PROTO_QV 5
#define PROTO_YM 6
-#define OpLog 1
-#define OpSendFile 2
+//#define OpLog 1
+//#define OpSendFile 2
#define OpKmtRcv 3
#define OpKmtGet 4
#define OpKmtSend 5
Modified: branches/proto_unicode/teraterm/teraterm/filesys.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys.cpp 2020-11-01 15:32:22 UTC (rev 8984)
+++ branches/proto_unicode/teraterm/teraterm/filesys.cpp 2020-11-01 15:32:38 UTC (rev 8985)
@@ -110,9 +110,9 @@
if (FTDlg!=NULL)
{
- CFileTransDlgInfo info;
+ CFileTransDlg::Info info;
info.UILanguageFile = ts.UILanguageFile;
- info.OpId = OpSendFile;
+ info.OpId = CFileTransDlg::OpSendFile;
info.DlgCaption = ToWcharA(fv->DlgCaption);
info.FileName = NULL;
info.FullName = ToWcharA(fv->FullName);
Modified: branches/proto_unicode/teraterm/teraterm/filesys_log.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys_log.cpp 2020-11-01 15:32:22 UTC (rev 8984)
+++ branches/proto_unicode/teraterm/teraterm/filesys_log.cpp 2020-11-01 15:32:38 UTC (rev 8985)
@@ -138,9 +138,9 @@
get_lang_msgW("FILEDLG_TRANS_TITLE_LOG", uimsg, _countof(uimsg), TitLogW, ts.UILanguageFile);
aswprintf(&DlgCaption, L"Tera Term: %s", uimsg);
- CFileTransDlgInfo info;
+ CFileTransDlg::Info info;
info.UILanguageFile = ts.UILanguageFile;
- info.OpId = OpLog;
+ info.OpId = CFileTransDlg::OpLog;
info.DlgCaption = DlgCaption;
info.FileName = NULL;
info.FullName = fv->FullName;
Modified: branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp 2020-11-01 15:32:22 UTC (rev 8984)
+++ branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp 2020-11-01 15:32:38 UTC (rev 8985)
@@ -902,14 +902,6 @@
if (c=='\\'||c=='/') fv->DirLen++;
strncpy_s(fv->DlgCaption, sizeof(fv->DlgCaption),"Tera Term: ", _TRUNCATE);
switch (fv->OpId) {
- case OpLog:
- get_lang_msg("FILEDLG_TRANS_TITLE_LOG", uimsg, sizeof(uimsg), TitLog, UILanguageFile);
- strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
- break;
- case OpSendFile:
- get_lang_msg("FILEDLG_TRANS_TITLE_SENDFILE", uimsg, sizeof(uimsg), TitSendFile, UILanguageFile);
- strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
- break;
case OpKmtRcv:
get_lang_msg("FILEDLG_TRANS_TITLE_KMTRCV", uimsg, sizeof(uimsg), TitKmtRcv, UILanguageFile);
strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
Modified: branches/proto_unicode/teraterm/teraterm/ftdlg.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/ftdlg.cpp 2020-11-01 15:32:22 UTC (rev 8984)
+++ branches/proto_unicode/teraterm/teraterm/ftdlg.cpp 2020-11-01 15:32:38 UTC (rev 8985)
@@ -66,7 +66,7 @@
free(FullName);
}
-BOOL CFileTransDlg::Create(HINSTANCE hInstance, CFileTransDlgInfo *info)
+BOOL CFileTransDlg::Create(HINSTANCE hInstance, CFileTransDlg::Info *info)
{
BOOL Ok;
int fuLoad = LR_DEFAULTCOLOR;
@@ -133,28 +133,6 @@
return Ok;
}
-#if 0
-BOOL CFileTransDlg::Create(HINSTANCE hInstance, HWND hParent, PFileVar fv, PComVar pcv, PTTSet pts)
-{
- CFileTransDlgInfo info;
-
- info.UILanguageFile = pts->UILanguageFile;
- info.OpId = fv->OpId;
- info.DlgCaption = ToWcharA(fv->DlgCaption);
- info.FileName = ToWcharA(&fv->FullName[fv->DirLen]);
- info.FullName = ToWcharA(fv->FullName);
- info.HideDialog = fv->HideDialog;
- info.HMainWin = fv->HMainWin;
- BOOL r = Create(hInstance, &info);
- fv->HWin = m_hWnd;
- fv->ProgStat = ProgStat;
- free(info.DlgCaption);
- free(info.FileName);
- free(info.FullName);
- return r;
-}
-#endif
-
/**
* \x83e\x83L\x83X\x83g\x82̕ύX\x82̂\xDD
*/
@@ -222,15 +200,6 @@
}
}
-#if 0
-void CFileTransDlg::RefreshNum(TFileVar *fv)
-{
- ProgStat = fv->ProgStat;
- RefreshNum(fv->StartTime, fv->FileSize, fv->ByteCount);
- fv->ProgStat = ProgStat;
-}
-#endif
-
/////////////////////////////////////////////////////////////////////////////
// CFileTransDlg message handler
Modified: branches/proto_unicode/teraterm/teraterm/ftdlg.h
===================================================================
--- branches/proto_unicode/teraterm/teraterm/ftdlg.h 2020-11-01 15:32:22 UTC (rev 8984)
+++ branches/proto_unicode/teraterm/teraterm/ftdlg.h 2020-11-01 15:32:38 UTC (rev 8985)
@@ -34,31 +34,30 @@
/////////////////////////////////////////////////////////////////////////////
// CFileTransDlg dialog
-typedef struct {
- const char *UILanguageFile;
- WORD OpId;
- wchar_t *DlgCaption;
- wchar_t *FullName;
- wchar_t *FileName; // NULL\x82̂Ƃ\xAB\x81AFullName\x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8D쐬\x82\xB7\x82\xE9
- BOOL HideDialog;
- HWND HMainWin;
-} CFileTransDlgInfo;
-
class CFileTransDlg : public TTCDialog
{
public:
+ enum Op {
+ OpLog,
+ OpSendFile
+ };
+
+ struct Info {
+ const char *UILanguageFile;
+ Op OpId;
+ wchar_t *DlgCaption;
+ wchar_t *FullName;
+ wchar_t *FileName; // NULL\x82̂Ƃ\xAB\x81AFullName\x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8D쐬\x82\xB7\x82\xE9
+ BOOL HideDialog;
+ HWND HMainWin;
+ };
+
CFileTransDlg();
~CFileTransDlg();
- BOOL Create(HINSTANCE hInstance, CFileTransDlgInfo *info);
-#if 0
- BOOL Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PComVar pcv, PTTSet pts);
-#endif
+ BOOL Create(HINSTANCE hInstance, Info *info);
void ChangeButton(BOOL PauseFlag);
void RefreshNum(DWORD StartTime, LONG FileSize, LONG ByteCount);
-#if 0
- void RefreshNum(TFileVar *fv);
-#endif
private:
virtual BOOL OnCancel();