diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr | 22 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.res | bin | 1852 -> 1852 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp | 19 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm | bin | 1093 -> 1510 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/StatusFrm.h | 9 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/zlib.bpr | 5 |
6 files changed, 31 insertions, 24 deletions
diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr index a5be646..2eccedd 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr @@ -28,7 +28,7 @@ <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="ilink32"/> - <USERDEFINES value="VCL;_DEBUG"/> + <USERDEFINES value="VCL"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="InstallMgr.cpp"/> <INCLUDEPATH value="curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/> @@ -40,12 +40,12 @@ <IDLCFLAGS value="-I..\BibleCS -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix cpp -DVCL -boa"/> - <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -r- - -a8 -b- -k -y -v -vi- -c -tW -tWM"/> - <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/> + <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 + -b- -k- -vi -c -tW -tWM"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -aa -Tpe -x -Gn"/> </OPTIONS> <LINKER> <ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/> @@ -58,7 +58,7 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=1 MinorVer=5 -Release=3 +Release=4 Build=0 Debug=0 PreRelease=0 @@ -71,13 +71,13 @@ CodePage=1252 [Version Info Keys] CompanyName=CrossWire Bible Society FileDescription=SWORD Installation Manager -FileVersion=1.5.3.0 +FileVersion=1.5.4.0 InternalName=InstallMgr LegalCopyright=Copyright 2002 by CrossWire Bible Society LegalTrademarks= OriginalFilename= ProductName=The SWORD Project -ProductVersion=1.5.3 +ProductVersion=1.5.4 Comments=Seek Jesus who exchanges temporary for eternal [HistoryLists\hlIncludePath] @@ -103,8 +103,8 @@ Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] Count=8 -Item0=VCL;_DEBUG -Item1=VCL +Item0=VCL +Item1=VCL;_DEBUG Item2=VCL;__STDC__ true Item3=VCL;__STDC__ Item4=VCL;_MSC_VER diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res Binary files differindex 67f5484..a67dc92 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp index d3e5c34..a162354 100644 --- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp +++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp @@ -21,7 +21,12 @@ TStatusForm *StatusForm; void status_callback(double dltotal, double dlnow) { - StatusForm->statusBar->Caption = ::IntToStr((long)dlnow) + " bytes out of " + ::IntToStr((long)dltotal) + " transferred (" + IntToStr((int)((float)(dlnow + 1) / (float)(dltotal) * 100)) + "%)"; + int filePercent = (int)((float)(dlnow + 1) / (float)(dltotal) * 100); + int totalPercent = (int)((float)(dlnow + StatusForm->completedBytes + 1) / (float)(StatusForm->totalBytes) * 100); + StatusForm->statusBar->Caption = ::IntToStr((long)dlnow) + " bytes out of " + ::IntToStr((long)dltotal) + " transferred (file: " + IntToStr(filePercent) + "% / total: " + IntToStr(totalPercent) + "%)"; + StatusForm->fileProgress->Position = filePercent; + StatusForm->totalProgress->Position = totalPercent; + StatusForm->statusBar->Repaint(); } @@ -101,7 +106,7 @@ void __fastcall TStatusForm::TFTPThread::Execute() string url = "ftp://" + ist->Source + ist->Directory.c_str() + "/" + src + "/"; //dont forget the final slash - vector<struct ftpparse> dirList = FTPURLGetDir(session, url.c_str()); + vector<struct ftpparse> dirList = FTPURLGetDir(session, url.c_str(), passive); if (!dirList.size()) { MessageBox(0, "Can't connect. Please check your configuration.", "Connection Error", MB_OK); @@ -110,6 +115,10 @@ void __fastcall TStatusForm::TFTPThread::Execute() // StatusForm->ftpCon->List(dirText, "*", true); // TIdFTPListItems *dirList = StatusForm->ftpCon->DirectoryListing; + StatusForm->totalBytes = 0; + for (int i = 0; i < dirList.size(); i++) + StatusForm->totalBytes += dirList[i].size; + StatusForm->completedBytes = 0; for (int i = 0; i < dirList.size(); i++) { if (dirList[i].flagtrycwd != 1) { buffer = dest + "/" + (dirList[i].name); @@ -125,15 +134,15 @@ void __fastcall TStatusForm::TFTPThread::Execute() TMainForm::createParent(buffer.c_str()); // make sure parent directory exists Synchronize((TThreadMethod)&PreDownload1); try { - StatusForm->currentFileSize = dirList[i].size; // StatusForm->ftpCon->Get(dirList->Items[i]->FileName.c_str(), buffer.c_str(), true, false); string url = "ftp://" + ist->Source + ist->Directory.c_str() + "/" + src + "/" + dirList[i].name; //dont forget the final slash - if (FTPURLGetFile(session, buffer.c_str(), url.c_str(), status_callback)) { + if (FTPURLGetFile(session, buffer.c_str(), url.c_str(), passive, status_callback)) { MessageBox(0, "Can't download file. If you have not done so recently, you might try pressing the Refresh from Remote Source button.", "Download Error", MB_OK); StatusForm->Button1Click(0); // abort thread } + StatusForm->completedBytes += dirList[i].size; } catch (...) {} if (Terminated) @@ -171,8 +180,6 @@ void __fastcall TStatusForm::TFTPThread::FTPLinkPacketRecvd(TObject *Sender) //void __fastcall TStatusForm::TFTPThread::UpdateBytes(void) { void __fastcall TStatusForm::UpdateBytes(void) { - StatusForm->statusBar->Caption = IntToStr(StatusForm->currentByteCount) + " bytes out of " + IntToStr(StatusForm->currentFileSize) + " transferred (" + IntToStr((int)((float)(StatusForm->currentByteCount + 1) / (float)(StatusForm->currentFileSize + 1) * 100)) + "%)"; - StatusForm->statusBar->Repaint(); } diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm Binary files differindex 08ca739..4d009c4 100644 --- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm +++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h index b00ed50..54bcbca 100644 --- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h +++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h @@ -9,6 +9,7 @@ #include <ExtCtrls.hpp> //#include <NMFtp.hpp> #include "MainFrm.h" +#include <ComCtrls.hpp> //#include "IdBaseComponent.hpp" //#include "IdComponent.hpp" //#include "IdFTP.hpp" @@ -35,6 +36,10 @@ __published: // IDE-managed Components TPanel *statusBar; TPanel *Panel3; TPanel *actionBar; + TPanel *Panel4; + TPanel *Panel5; + TProgressBar *fileProgress; + TProgressBar *totalProgress; void __fastcall FormShow(TObject *Sender); void __fastcall Cleanup(TObject *Sender); void __fastcall FormClose(TObject *Sender, TCloseAction &Action); @@ -67,8 +72,8 @@ private: // User declarations } *ftpThread; public: // User declarations TFTPCon *ftpCon; - long currentByteCount; - long currentFileSize; + long completedBytes; + long totalBytes; InstallSourceTab *ist; string src; string dest; diff --git a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr index 635316b..b23ce01 100644 --- a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr +++ b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr @@ -113,11 +113,6 @@ ShowInfoMsgs=0 LinkDebugVcl=0 LinkCGLIB=0 -[CORBA] -AddServerUnit=1 -AddClientUnit=1 -PrecompiledHeaders=1 - [Language] ActiveLang= ProjectLang= |