linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2145
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Mon 2010-05-10 19:39:28 +0200
message:
  Add an "Elapsed" column in finished transfer windows
modified:
  changelog.txt
  help/window_finished_downloads.html
  help/window_finished_uploads.html
  win32/FinishedFrameBase.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 'changelog.txt'
--- changelog.txt	2010-05-10 17:23:07 +0000
+++ changelog.txt	2010-05-10 17:39:28 +0000
@@ -19,6 +19,7 @@
 * [L#556853] Fix sharing a whole drive (root folder) was impossible in random cases (emtee)
 * [L#559544] Don't clear multiline boxes with Ctrl+Alt+A (poy)
 * [L#545264] Correct ADC hub counts (emtee)
+* Add an "Elapsed" column in finished transfer windows (poy)
 
 -- 0.761 2010-03-14 --
 * [L#533840] Fix crashes with themed menus (poy)

=== modified file 'help/window_finished_downloads.html'
--- help/window_finished_downloads.html	2009-04-07 18:23:36 +0000
+++ help/window_finished_downloads.html	2010-05-10 17:39:28 +0000
@@ -37,6 +37,8 @@
   <dd>Which hub the source was on.</dd>
   <dt>Files</dt>
   <dd>Which files were downloded from the user.</dd>
+  <dt>Elapsed</dt>
+  <dd>The total time, in seconds, that it took for the file to be transferred.</dd>
 </dl>
 
 <h2>Context menu commands</h2>

=== modified file 'help/window_finished_uploads.html'
--- help/window_finished_uploads.html	2009-04-07 18:23:36 +0000
+++ help/window_finished_uploads.html	2010-05-10 17:39:28 +0000
@@ -37,6 +37,8 @@
   <dd>Which hub the user was on.</dd>
   <dt>Files</dt>
   <dd>Which files were uploaded to the user.</dd>
+  <dt>Elapsed</dt>
+  <dd>The total time, in seconds, that it took for the file to be transferred.</dd>
 </dl>
 
 <h2>Context menu commands</h2>

=== modified file 'win32/FinishedFrameBase.h'
--- win32/FinishedFrameBase.h	2010-03-11 17:25:17 +0000
+++ win32/FinishedFrameBase.h	2010-05-10 17:39:28 +0000
@@ -202,6 +202,7 @@
 		FILES_COLUMN_SPEED,
 		FILES_COLUMN_CRC32,
 		FILES_COLUMN_TIME,
+		FILES_COLUMN_ELAPSED,
 		FILES_COLUMN_LAST
 	};
 
@@ -213,6 +214,7 @@
 		USERS_COLUMN_SPEED,
 		USERS_COLUMN_FILES,
 		USERS_COLUMN_TIME,
+		USERS_COLUMN_ELAPSED,
 		USERS_COLUMN_LAST
 	};
 
@@ -247,6 +249,7 @@
 			columns[FILES_COLUMN_SPEED] = Text::toT(Util::formatBytes(entry->getAverageSpeed()) + "/s");
 			columns[FILES_COLUMN_CRC32] = entry->getCrc32Checked() ? T_("Yes") : T_("No");
 			columns[FILES_COLUMN_TIME] = Text::toT(Util::formatTime("%Y-%m-%d %H:%M:%S", entry->getTime()));
+			columns[FILES_COLUMN_ELAPSED] = Text::toT(Util::formatSeconds(entry->getMilliSeconds() / 1000));
 
 			return (sortCol != -1) ? (old != columns[sortCol]) : false;
 		}
@@ -264,6 +267,7 @@
 				case FILES_COLUMN_FILESIZE: return compare(a->entry->getFileSize(), b->entry->getFileSize());
 				case FILES_COLUMN_PERCENTAGE: return compare(a->entry->getTransferredPercentage(), b->entry->getTransferredPercentage());
 				case FILES_COLUMN_SPEED: return compare(a->entry->getAverageSpeed(), b->entry->getAverageSpeed());
+				case FILES_COLUMN_ELAPSED: return compare(a->entry->getMilliSeconds(), b->entry->getMilliSeconds());
 				default: return lstrcmpi(a->columns[col].c_str(), b->columns[col].c_str());
 			}
 		}
@@ -318,6 +322,7 @@
 			columns[USERS_COLUMN_SPEED] = Text::toT(Util::formatBytes(entry->getAverageSpeed()) + "/s");
 			columns[USERS_COLUMN_FILES] = Text::toT(Util::toString(entry->getFiles()));
 			columns[USERS_COLUMN_TIME] = Text::toT(Util::formatTime("%Y-%m-%d %H:%M:%S", entry->getTime()));
+			columns[USERS_COLUMN_ELAPSED] = Text::toT(Util::formatSeconds(entry->getMilliSeconds() / 1000));
 
 			return (sortCol != -1) ? (old != columns[sortCol]) : false;
 		}
@@ -333,6 +338,7 @@
 			switch(col) {
 				case USERS_COLUMN_TRANSFERRED: return compare(a->entry->getTransferred(), b->entry->getTransferred());
 				case USERS_COLUMN_SPEED: return compare(a->entry->getAverageSpeed(), b->entry->getAverageSpeed());
+				case USERS_COLUMN_ELAPSED: return compare(a->entry->getMilliSeconds(), b->entry->getMilliSeconds());
 				default: return lstrcmpi(a->columns[col].c_str(), b->columns[col].c_str());
 			}
 		}
@@ -691,7 +697,8 @@
 	{ N_("% transferred"), 80, true },
 	{ N_("Speed"), 100, true },
 	{ N_("CRC Checked"), 80, false },
-	{ N_("Time"), 125, false }
+	{ N_("Time"), 125, false },
+	{ N_("Elapsed"), 125, false }
 };
 
 template<class T, bool in_UL>
@@ -701,7 +708,8 @@
 	{ N_("Transferred"), 80, true },
 	{ N_("Speed"), 100, true },
 	{ N_("Files"), 300, false },
-	{ N_("Time"), 125, false }
+	{ N_("Time"), 125, false },
+	{ N_("Elapsed"), 125, false }
 };
 
 #endif // !defined(DCPLUSPLUS_WIN32_FINISHED_FRAME_BASE_H)