dcplusplus-commit

[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.

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

[<zou...@us...>]

Revision: 1043
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1043&view=rev
Author:   zouzou123gen
Date:     2008-03-18 12:06:54 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
fixes in "Experts only" settings page

Modified Paths:
--------------
    dcplusplus/trunk/win32/Advanced3Page.cpp
    dcplusplus/trunk/win32/DCPlusPlus.rc
    dcplusplus/trunk/win32/resource.h

Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp	2008-03-16 16:28:29 UTC (rev 1042)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp	2008-03-18 19:06:54 UTC (rev 1043)
@@ -25,23 +25,28 @@
 #include <dcpp/SettingsManager.h>
 
 PropPage::TextItem Advanced3Page::texts[] = {
+	{ IDC_SETTINGS_ROLLBACK, N_("Rollback") },
 	{ IDC_SETTINGS_B, N_("B") },
-	{ IDC_SETTINGS_WRITE_BUFFER, N_("Write buffer size") },
-	{ IDC_SETTINGS_KB, N_("KiB") },
 	{ IDC_SETTINGS_MAX_HASH_SPEED, N_("Max hash speed") },
 	{ IDC_SETTINGS_MBS, N_("MiB/s") },
 	{ IDC_SETTINGS_PM_HISTORY, N_("PM history") },
-	{ IDC_SETTINGS_SEARCH_HISTORY, N_("Search history") },
 	{ IDC_SETTINGS_TEXT_MINISLOT, N_("Mini slot size") },
 	{ IDC_SETTINGS_KB2, N_("KiB") },
-	{ IDC_SETTINGS_BIND_ADDRESS, N_("Bind address") },
 	{ IDC_SETTINGS_MAX_FILELIST_SIZE, N_("Max filelist size") },
 	{ IDC_SETTINGS_MB, N_("MiB") },
+	{ IDC_SETTINGS_PID, N_("PID") },
 	{ IDC_SETTINGS_AUTO_REFRESH_TIME, N_("Auto refresh time") },
+	{ IDC_SETTINGS_WRITE_BUFFER, N_("Write buffer size") },
+	{ IDC_SETTINGS_KB, N_("KiB") },
 	{ IDC_SETTINGS_AUTO_SEARCH_LIMIT, N_("Auto-search limit") },
-	{ IDC_SETTINGS_MIN_SEGMENT_SIZE, N_("Min segment size") },
+	{ IDC_SETTINGS_SEARCH_HISTORY, N_("Search history") },
+	{ IDC_SETTINGS_BIND_ADDRESS, N_("Bind address") },
 	{ IDC_SETTINGS_SOCKET_IN_BUFFER, N_("Socket read buffer") },
+	{ IDC_SETTINGS_B2, N_("B") },
 	{ IDC_SETTINGS_SOCKET_OUT_BUFFER, N_("Socket write buffer") },
+	{ IDC_SETTINGS_B3, N_("B") },
+	{ IDC_SETTINGS_MIN_SEGMENT_SIZE, N_("Min segment size") },
+	{ IDC_SETTINGS_KB3, N_("KiB") },
 	{ 0, 0 }
 };
 

Modified: dcplusplus/trunk/win32/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/win32/DCPlusPlus.rc	2008-03-16 16:28:29 UTC (rev 1042)
+++ dcplusplus/trunk/win32/DCPlusPlus.rc	2008-03-18 19:06:54 UTC (rev 1043)
@@ -428,11 +428,11 @@
     RTEXT           "Max filelist size",IDC_SETTINGS_MAX_FILELIST_SIZE,7,78,57,8
     EDITTEXT        IDC_MAX_FILELIST_SIZE,69,75,45,14,ES_AUTOHSCROLL
     LTEXT           "MiB",IDC_SETTINGS_MB,117,78,16,8
-    RTEXT           "PID",IDC_STATIC,7,95,57,8
+    RTEXT           "PID",IDC_SETTINGS_PID,7,95,57,8
     EDITTEXT        IDC_PRIVATE_ID,69,92,45,14,ES_AUTOHSCROLL
-    LTEXT           "Auto refresh time",IDC_SETTINGS_AUTO_REFRESH_TIME,7,112,57,8
+    RTEXT           "Auto refresh time",IDC_SETTINGS_AUTO_REFRESH_TIME,7,112,57,8
     EDITTEXT        IDC_AUTO_REFRESH_TIME,69,110,45,14,ES_AUTOHSCROLL
-    RTEXT           "File write buffer",IDC_SETTINGS_WRITE_BUFFER,134,10,70,8
+    RTEXT           "Write buffer size",IDC_SETTINGS_WRITE_BUFFER,134,10,70,8
     EDITTEXT        IDC_BUFFERSIZE,208,7,41,14,ES_AUTOHSCROLL
     LTEXT           "KiB",IDC_SETTINGS_KB,252,10,16,8
     RTEXT           "Auto-search limit",IDC_SETTINGS_AUTO_SEARCH_LIMIT,134,27,70,8
@@ -444,13 +444,13 @@
     EDITTEXT        IDC_BIND_ADDRESS,208,58,41,14,ES_AUTOHSCROLL
     RTEXT           "Socket read buffer",IDC_SETTINGS_SOCKET_IN_BUFFER,134,78,70,8
     EDITTEXT        IDC_SOCKET_IN_BUFFER,208,75,41,14,ES_AUTOHSCROLL
-    LTEXT           "B",IDC_STATIC,252,78,16,8
+    LTEXT           "B",IDC_SETTINGS_B2,252,78,16,8
     RTEXT           "Socket write buffer",IDC_SETTINGS_SOCKET_OUT_BUFFER,134,95,70,8
     EDITTEXT        IDC_SOCKET_OUT_BUFFER,208,93,41,14,ES_AUTOHSCROLL
-    LTEXT           "B",IDC_STATIC,252,95,16,8
+    LTEXT           "B",IDC_SETTINGS_B3,252,95,16,8
     RTEXT           "Min segment size",IDC_SETTINGS_MIN_SEGMENT_SIZE,134,112,70,8
     EDITTEXT        IDC_MIN_SEGMENT_SIZE,208,110,41,14,ES_AUTOHSCROLL
-    LTEXT           "KiB",IDC_STATIC,252,112,16,8
+    LTEXT           "KiB",IDC_SETTINGS_KB3,252,112,16,8
 END
 
 IDD_NETWORKPAGE DIALOGEX 100, 0, 275, 225

Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h	2008-03-16 16:28:29 UTC (rev 1042)
+++ dcplusplus/trunk/win32/resource.h	2008-03-18 19:06:54 UTC (rev 1043)
@@ -451,5 +451,8 @@
 #define IDC_MIN_SEGMENT_SIZE 2293
 #define IDC_GREETZ 2294
 #define IDC_LATEST_VERSION 2295
+#define IDC_SETTINGS_PID 2296
+#define IDC_SETTINGS_B2 2297
+#define IDC_SETTINGS_B3 2298
 
 #endif


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