[Dcplusplus-commit] SF.net SVN: dcplusplus: [1017] dcplusplus/trunk/win32

[<arn...@us...>]

Revision: 1017
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1017&view=rev
Author:   arnetheduck
Date:     2008-02-21 12:56:33 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
Fix download ticking

Modified Paths:
--------------
    dcplusplus/trunk/win32/DirectoryListingFrame.h
    dcplusplus/trunk/win32/PublicHubsFrame.cpp
    dcplusplus/trunk/win32/TransferView.cpp
    dcplusplus/trunk/win32/TransferView.h

Modified: dcplusplus/trunk/win32/DirectoryListingFrame.h
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.h	2008-02-18 20:19:27 UTC (rev 1016)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.h	2008-02-21 20:56:33 UTC (rev 1017)
@@ -99,8 +99,8 @@
 		}
 		ItemInfo(DirectoryListing::Directory* d) : type(DIRECTORY), dir(d) {
 			columns[COLUMN_FILENAME] = Text::toT(d->getName());			
-			columns[COLUMN_EXACTSIZE] = Text::toT(Util::formatExactSize(d->getTotalSize()));
-			columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(d->getTotalSize()));
+			columns[COLUMN_EXACTSIZE] = d->getComplete() ? Text::toT(Util::formatExactSize(d->getTotalSize())) : _T("?");
+			columns[COLUMN_SIZE] = d->getComplete() ? Text::toT(Util::formatBytes(d->getTotalSize())) : _T("?");
 		}
 		
 		const tstring& getText() const {

Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp	2008-02-18 20:19:27 UTC (rev 1016)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp	2008-02-21 20:56:33 UTC (rev 1017)
@@ -456,7 +456,7 @@
 }
 
 void PublicHubsFrame::handleRefresh() {
-	setStatus(STATUS_STATUS, CT_("Downloading public hub list..."));
+	setStatus(STATUS_STATUS, T_("Downloading public hub list..."));
 	FavoriteManager::getInstance()->refresh(true);
 	updateDropDown();
 }

Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp	2008-02-18 20:19:27 UTC (rev 1016)
+++ dcplusplus/trunk/win32/TransferView.cpp	2008-02-21 20:56:33 UTC (rev 1017)
@@ -734,8 +734,8 @@
 	speak(CONNECTIONS_UPDATE, ui);
 }
 
-void TransferView::onTransferTick(Transfer* t) {
-	UpdateInfo* ui = new UpdateInfo(t->getUser(), true);
+void TransferView::onTransferTick(Transfer* t, bool isDownload) {
+	UpdateInfo* ui = new UpdateInfo(t->getUser(), isDownload);
 	ui->setTransfered(t->getPos(), t->getActual());
 	ui->setSpeed(t->getAverageSpeed());
 	ui->setChunk(t->getPos(), t->getSize());
@@ -744,7 +744,7 @@
 
 void TransferView::on(DownloadManagerListener::Tick, const DownloadList& dl) throw()  {
 	for(DownloadList::const_iterator i = dl.begin(); i != dl.end(); ++i) {
-		onTransferTick(*i);
+		onTransferTick(*i, true);
 	}
 
 	std::vector<TickInfo*> dis;
@@ -815,24 +815,24 @@
 
 void TransferView::on(UploadManagerListener::Tick, const UploadList& ul) throw() {
 	for(UploadList::const_iterator i = ul.begin(); i != ul.end(); ++i) {
-		onTransferTick(*i);
+		onTransferTick(*i, false);
 	}
 
 	speak();
 }
 
 void TransferView::on(DownloadManagerListener::Complete, Download* d) throw() { 
-	onTransferComplete(d, false);
+	onTransferComplete(d, true);
 
 	speak(DOWNLOADS_REMOVE_USER, new TickInfo(d->getPath()));
 }
 
 void TransferView::on(UploadManagerListener::Complete, Upload* aUpload) throw() { 
-	onTransferComplete(aUpload, true); 
+	onTransferComplete(aUpload, false); 
 }
 
-void TransferView::onTransferComplete(Transfer* aTransfer, bool isUpload) {
-	UpdateInfo* ui = new UpdateInfo(aTransfer->getUser(), !isUpload);
+void TransferView::onTransferComplete(Transfer* aTransfer, bool isDownload) {
+	UpdateInfo* ui = new UpdateInfo(aTransfer->getUser(), isDownload);
 
 	ui->setStatus(ConnectionInfo::STATUS_WAITING);
 	ui->setStatusString(T_("Idle"));

Modified: dcplusplus/trunk/win32/TransferView.h
===================================================================
--- dcplusplus/trunk/win32/TransferView.h	2008-02-18 20:19:27 UTC (rev 1016)
+++ dcplusplus/trunk/win32/TransferView.h	2008-02-21 20:56:33 UTC (rev 1017)
@@ -291,8 +291,8 @@
 
 	virtual void on(QueueManagerListener::Removed, QueueItem*) throw();
 
-	void onTransferTick(Transfer* aTransfer);
-	void onTransferComplete(Transfer* aTransfer, bool isUpload);
+	void onTransferTick(Transfer* aTransfer, bool isDownload);
+	void onTransferComplete(Transfer* aTransfer, bool isDownload);
 	void starting(UpdateInfo* ui, Transfer* t);
 	
 #ifdef PORT_ME


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.