Tera TermRevision: 9056
https://osdn.net/projects/ttssh2/scm/svn/commits/9056
Author: zmatsuo
Date: 2020-12-20 21:07:03 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
ftdlg.cpp,h から FileVar 依存を削除
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/ftdlg.cpp
trunk/teraterm/teraterm/ftdlg.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:06:51 UTC (rev 9055)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:07:03 UTC (rev 9056)
@@ -256,8 +256,20 @@
if (FTDlg!=NULL)
{
- FTDlg->Create(hInst, HVTWin, fv, &cv, &ts);
- FTDlg->RefreshNum(fv);
+ CFileTransDlgInfo info;
+ info.UILanguageFile = ts.UILanguageFile;
+ info.OpId = OpSendFile;
+ info.DlgCaption = ToWcharA(fv->DlgCaption);
+ info.FileName = NULL;
+ info.FullName = ToWcharA(fv->FullName);
+ info.HideDialog = ts.LogHideDialog ? TRUE : FALSE;
+ info.HMainWin = HVTWin;
+ //FTDlg->Create(hInst, HVTWin, fv, &cv, &ts);
+ FTDlg->Create(hInst, &info);
+ //FTDlg->RefreshNum(fv);
+ FTDlg->RefreshNum(0, fv->FileSize, fv->ByteCount);
+ free(info.DlgCaption);
+ free(info.FullName);
}
SendDlg = FTDlg; /* File send */
@@ -753,13 +765,16 @@
SendVar->ByteCount = SendVar->ByteCount + c;
if (FileRetrySend)
{
- if (SendVar->ByteCount != BCOld)
- SendDlg->RefreshNum(SendVar);
+ if (SendVar->ByteCount != BCOld) {
+ //SendDlg->RefreshNum(SendVar);
+ SendDlg->RefreshNum(SendVar->StartTime, SendVar->FileSize, SendVar->ByteCount);
+ }
return;
}
}
FileDlgRefresh = SendVar->ByteCount;
- SendDlg->RefreshNum(SendVar);
+ //SendDlg->RefreshNum(SendVar);
+ SendDlg->RefreshNum(SendVar->StartTime, SendVar->FileSize, SendVar->ByteCount);
BCOld = SendVar->ByteCount;
if (fc != 0)
return;
@@ -849,8 +864,10 @@
FileRetrySend = (c==0);
if (FileRetrySend)
{
- if (SendVar->ByteCount != BCOld)
- SendDlg->RefreshNum(SendVar);
+ if (SendVar->ByteCount != BCOld) {
+ //SendDlg->RefreshNum(SendVar);
+ SendDlg->RefreshNum(SendVar->StartTime, SendVar->FileSize, SendVar->ByteCount);
+ }
return;
}
if (ts.LocalEcho>0)
@@ -862,7 +879,8 @@
}
}
if ((fc==0) || ((SendVar->ByteCount % 100 == 0) && (FileBracketPtr == 0))) {
- SendDlg->RefreshNum(SendVar);
+ //SendDlg->RefreshNum(SendVar);
+ SendDlg->RefreshNum(SendVar->StartTime, SendVar->FileSize, SendVar->ByteCount);
BCOld = SendVar->ByteCount;
if (fc!=0)
return;
Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp 2020-12-20 12:06:51 UTC (rev 9055)
+++ trunk/teraterm/teraterm/ftdlg.cpp 2020-12-20 12:07:03 UTC (rev 9056)
@@ -133,6 +133,7 @@
return Ok;
}
+#if 0
BOOL CFileTransDlg::Create(HINSTANCE hInstance, HWND hParent, PFileVar fv, PComVar pcv, PTTSet pts)
{
CFileTransDlgInfo info;
@@ -152,6 +153,7 @@
free(info.FullName);
return r;
}
+#endif
/**
* \x83e\x83L\x83X\x83g\x82̕ύX\x82̂\xDD
@@ -220,6 +222,7 @@
}
}
+#if 0
void CFileTransDlg::RefreshNum(TFileVar *fv)
{
ProgStat = fv->ProgStat;
@@ -226,6 +229,7 @@
RefreshNum(fv->StartTime, fv->FileSize, fv->ByteCount);
fv->ProgStat = ProgStat;
}
+#endif
/////////////////////////////////////////////////////////////////////////////
// CFileTransDlg message handler
Modified: trunk/teraterm/teraterm/ftdlg.h
===================================================================
--- trunk/teraterm/teraterm/ftdlg.h 2020-12-20 12:06:51 UTC (rev 9055)
+++ trunk/teraterm/teraterm/ftdlg.h 2020-12-20 12:07:03 UTC (rev 9056)
@@ -51,10 +51,14 @@
~CFileTransDlg();
BOOL Create(HINSTANCE hInstance, CFileTransDlgInfo *info);
+#if 0
BOOL Create(HINSTANCE hInstance, HWND hParent, PFileVar pfv, PComVar pcv, PTTSet pts);
+#endif
void ChangeButton(BOOL PauseFlag);
void RefreshNum(DWORD StartTime, LONG FileSize, LONG ByteCount);
+#if 0
void RefreshNum(TFileVar *fv);
+#endif
private:
virtual BOOL OnCancel();