reapack

commit acff47ea50ca5b1e28382eca61019a71db2593b9
parent fb26c560d72355dd69e16e23f2a122f83fc1b6ab
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Sun,  6 Dec 2015 00:53:24 -0500

show the total number of queued downloads in the progress dialog

Diffstat:
M
src/progress.cpp
 | 
18
++++++++++++++----
M
src/progress.hpp
 | 
7
++++---

2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/progress.cpp b/src/progress.cpp
@@ -10,7 +10,8 @@ using namespace std;
 
 Progress::Progress()
   : Dialog(IDD_PROGRESS_DIALOG),
-    m_transaction(0), m_done(0), m_total(0), m_label(0), m_progress(0)
+    m_transaction(0), m_current(0), m_label(0), m_progress(0),
+    m_done(0), m_total(0)
 {
 }
 
@@ -53,19 +54,28 @@ void Progress::addDownload(Download *dl)
   updateProgress();
 
   dl->onStart([=] {
-    const string text = "Downloading: " + dl->name() + "\n" + dl->url();
-    SetWindowText(m_label, text.c_str());
+    m_current = dl;
+    updateProgress();
   });
 
   dl->onFinish([=] {
     m_done++;
     updateProgress();
+    m_current = 0;
   });
 }
 
 void Progress::updateProgress()
 {
-  const double pos = m_done / m_total;
+  if(m_current) {
+    const string text = "Downloading " +
+      to_string(m_done + 1) + " of " + to_string(m_total) + ": " +
+      m_current->name() + "\n" + m_current->url();
+
+    SetWindowText(m_label, text.c_str());
+  }
+
+  const double pos = (double)m_done / m_total;
   const int percent = (int)(pos * 100);
   const string title = string(TITLE) + " (" + to_string(percent) + "%)";
 
diff --git a/src/progress.hpp b/src/progress.hpp
@@ -21,12 +21,13 @@ private:
   void updateProgress();
 
   Transaction *m_transaction;
-
-  int m_done;
-  double m_total;
+  Download *m_current;
 
   HWND m_label;
   HWND m_progress;
+
+  int m_done;
+  int m_total;
 };
 
 #endif