linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3079
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2012-10-16 19:39:17 +0200
message:
  restore file list status bar counts
modified:
  win32/DirectoryListingFrame.cpp
  win32/DirectoryListingFrame.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp	2012-10-16 16:17:56 +0000
+++ win32/DirectoryListingFrame.cpp	2012-10-16 17:39:17 +0000
@@ -610,6 +610,7 @@
 		finishLoad();
 		addRecent();
 		refreshTree(dir);
+		initStatusText();
 	}); }, [this, finishLoad](tstring s) { callAsync([=] {
 		// error callback
 		error = std::move(s);
@@ -629,8 +630,6 @@
 		delete loader;
 		loader = nullptr;
 	}
-
-	initStatusText();
 }
 
 void DirectoryListingFrame::loadXML(const string& txt) {
@@ -1220,8 +1219,8 @@
 }
 
 void DirectoryListingFrame::initStatusText() {
-	status->setText(STATUS_TOTAL_FILES, str(TF_("Files: %1%") % dl->getTotalFileCount(true)));
-	status->setText(STATUS_TOTAL_SIZE, str(TF_("Size: %1%") % Text::toT(Util::formatBytes(dl->getTotalSize(true)))));
+	status->setText(STATUS_TOTAL_FILES, str(TF_("Files (total): %1%") % dl->getTotalFileCount(true)));
+	status->setText(STATUS_TOTAL_SIZE, str(TF_("Size (total): %1%") % Text::toT(Util::formatBytes(dl->getTotalSize(true)))));
 	status->setText(STATUS_SPEED, str(TF_("Speed: %1%/s") % Text::toT(Util::formatBytes(speed))));
 }
 

=== modified file 'win32/DirectoryListingFrame.h'
--- win32/DirectoryListingFrame.h	2012-10-15 19:18:21 +0000
+++ win32/DirectoryListingFrame.h	2012-10-16 17:39:17 +0000
@@ -210,8 +210,6 @@
 	HTREEITEM treeRoot;
 	DirectoryListing::Directory* curDir;
 
-	string size;
-
 	bool loaded;
 	bool updating;
 	bool searching;