mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-26 06:12:49 -06:00
Fixed UVS2 to get in sync with updated FtpClient::WhenProgress
git-svn-id: svn://ultimatepp.org/upp/trunk@1788 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
20cdfd26c9
commit
b089efbf76
2 changed files with 9 additions and 9 deletions
|
|
@ -763,11 +763,11 @@ private:
|
|||
bool OnLoadGateHeaders(String data);
|
||||
bool OnLoadGateAll(String data);
|
||||
bool OnDecompressGate(int len, int total);
|
||||
bool OnFtpSaveGate();
|
||||
bool OnFtpLoadGate();
|
||||
bool OnFtpSaveGate(int, int);
|
||||
bool OnFtpLoadGate(int, int);
|
||||
bool OnSaveGate(int len, int total);
|
||||
bool OnTreeGate(int count, int total);
|
||||
bool OnFtpProgress();
|
||||
bool OnFtpProgress(int, int);
|
||||
void OnWaitConnect();
|
||||
|
||||
void DoViewSortName();
|
||||
|
|
@ -3292,7 +3292,7 @@ void DlgFiles::SetProgressSize(int size, int total, int start_msecs)
|
|||
progress.Text(out);
|
||||
}
|
||||
|
||||
bool DlgFiles::OnFtpLoadGate()
|
||||
bool DlgFiles::OnFtpLoadGate(int, int)
|
||||
{
|
||||
return OnLoadGateAll(ftp_client.GetLoadedPart());
|
||||
}
|
||||
|
|
@ -3313,7 +3313,7 @@ bool DlgFiles::OnDecompressGate(int len, int total)
|
|||
return IsCanceled();
|
||||
}
|
||||
|
||||
bool DlgFiles::OnFtpSaveGate()
|
||||
bool DlgFiles::OnFtpSaveGate(int, int)
|
||||
{
|
||||
return OnSaveGate(ftp_client.GetSavePos(), ftp_client.GetSaveTotal());
|
||||
}
|
||||
|
|
@ -3326,7 +3326,7 @@ bool DlgFiles::OnSaveGate(int done, int total)
|
|||
return IsCanceled();
|
||||
}
|
||||
|
||||
bool DlgFiles::OnFtpProgress()
|
||||
bool DlgFiles::OnFtpProgress(int, int)
|
||||
{
|
||||
return IsCanceled();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef __uvs_version__
|
||||
#define __uvs_version__
|
||||
|
||||
#define UVS2_VERSION "2.41"
|
||||
#define UVS2_DATE Date(2008, 3, 7)
|
||||
#define UVS2_COPYRIGHT "Copyright © 2002-2007 Ultimate Development, spol. s r.o."
|
||||
#define UVS2_VERSION "2.42"
|
||||
#define UVS2_DATE Date(2009, 12, 8)
|
||||
#define UVS2_COPYRIGHT "Copyright © 2002-2009 Ultimate Development, spol. s r.o."
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue