Changeset 15927
- Timestamp:
- 2008-06-09T14:34:46+12:00 (16 years ago)
- Location:
- other-projects/trunk/gsinstaller
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/trunk/gsinstaller/DiskSpace.cpp
r11664 r15927 54 54 } 55 55 56 unsigned longDiskSpace::totalFreeSpace()57 { return this->freeClusters * this->sectorsPerCluster * this->bytesPerSector;56 unsigned double DiskSpace::totalFreeSpace() 57 { return this->freeClusters * (((double) (this->sectorsPerCluster * this->bytesPerSector)) / (double) (1024)); 58 58 } 59 59 -
other-projects/trunk/gsinstaller/DiskSpace.h
r11664 r15927 15 15 int fileClusters(int fileSize); 16 16 BOOL initialisedOk(); 17 unsigned longtotalFreeSpace();17 unsigned double totalFreeSpace(); 18 18 }; 19 19 -
other-projects/trunk/gsinstaller/README.txt
r11685 r15927 16 16 1. C:\MSDEV\bin\VCVARS32.bat 17 17 2. nmake /f win32.mak (in the gsinstaller directory) 18 19 Note: stlport.zip is required for compiling. This file is avaible in Greenstone SVN at http://svn.greenstone.org/gsdl/trunk/packages/windows/stlport/. Download and unzip the zip file, and change the include path in win32.mak accordingly. -
other-projects/trunk/gsinstaller/fileCopier.cpp
r11664 r15927 216 216 } 217 217 218 unsigned longfileCopySet::getCopiedSize(DiskSpace &space)218 unsigned double fileCopySet::getCopiedSize(DiskSpace &space) 219 219 { 220 220 // initialise counters for size … … 229 229 here ++; 230 230 } 231 return copiedSize;231 return (double) copiedSize / (double) 1024; 232 232 } 233 233 … … 303 303 if (space.totalFreeSpace() < copiedSize) 304 304 { 305 char buffer[100]; 306 sprintf(buffer, "Total free space on disk %3.1fMb, but the size of the copied collection is %3.1fMb", (double) space.totalFreeSpace() / (double) (1024), (double) copiedSize / (double) (1024)); 307 MessageBox(0, buffer, "Greenstone Installer", MB_OK); 308 305 309 return false; 306 310 } -
other-projects/trunk/gsinstaller/fileCopier.h
r11664 r15927 29 29 unsigned long getOriginalSize(); 30 30 unsigned long getOriginalFiles(); 31 unsigned longgetCopiedSize(DiskSpace &space);31 unsigned double getCopiedSize(DiskSpace &space); 32 32 bool ensureParent(FilePath &child, fileCopyMonitor *monitor); 33 33 bool copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar *progressBar);
Note:
See TracChangeset
for help on using the changeset viewer.