- COSMETIC: Display "unpaused/total_torrent" in download/upload tabs

Changelog

@@ -17,6 +17,7 @@
     - COSMETIC: Do not display progress bar in seeding list (always 100%)
     - COSMETIC: Added a progress bar for torrent creation
     - COSMETIC: Display tracker errors in a cleaner way
+    - COSMETIC: Display "unpaused/total_torrent" in download/upload tabs
 
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
     - FEATURE: Based on new libtorrent v0.13

src/GUI.cpp

@@ -127,14 +127,14 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   tabs = new QTabWidget();
   // Download torrents tab
   downloadingTorrentTab = new DownloadingTorrents(this, BTSession);
-  tabs->addTab(downloadingTorrentTab, tr("Downloads") + QString::fromUtf8(" (0)"));
+  tabs->addTab(downloadingTorrentTab, tr("Downloads") + QString::fromUtf8(" (0/0)"));
   tabs->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
   vboxLayout->addWidget(tabs);
   connect(downloadingTorrentTab, SIGNAL(unfinishedTorrentsNumberChanged(unsigned int)), this, SLOT(updateUnfinishedTorrentNumber(unsigned int)));
   connect(downloadingTorrentTab, SIGNAL(torrentDoubleClicked(QString, bool)), this, SLOT(torrentDoubleClicked(QString, bool)));
   // Finished torrents tab
   finishedTorrentTab = new FinishedTorrents(this, BTSession);
-  tabs->addTab(finishedTorrentTab, tr("Finished") + QString::fromUtf8(" (0)"));
+  tabs->addTab(finishedTorrentTab, tr("Finished") + QString::fromUtf8(" (0/0)"));
   tabs->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   connect(finishedTorrentTab, SIGNAL(torrentDoubleClicked(QString, bool)), this, SLOT(torrentDoubleClicked(QString, bool)));
 
@@ -1021,11 +1021,13 @@ void GUI::configureSession(bool deleteOptions) {
 }
 
 void GUI::updateUnfinishedTorrentNumber(unsigned int nb) {
-  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb)+QString::fromUtf8(")"));
+  unsigned int paused = BTSession->getUnfinishedPausedTorrentsNb();
+  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
 }
 
 void GUI::updateFinishedTorrentNumber(unsigned int nb) {
-  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb)+QString::fromUtf8(")"));
+  unsigned int paused = BTSession->getFinishedPausedTorrentsNb();
+  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
 }
 
 // Allow to change action on double-click
@@ -1072,15 +1074,19 @@ void GUI::togglePausedState(QString hash) {
     downloadingTorrentTab->setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(h.name()));
     if(inDownloadList) {
       downloadingTorrentTab->resumeTorrent(hash);
+      updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
     }else{
       finishedTorrentTab->resumeTorrent(hash);
+      updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     }
   }else{
     BTSession->pauseTorrent(hash);
     if(inDownloadList) {
       downloadingTorrentTab->pauseTorrent(hash);
+      updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
     }else{
       finishedTorrentTab->pauseTorrent(hash);
+      updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     }
     downloadingTorrentTab->setInfoBar(tr("'%1' paused.", "xxx.avi paused.").arg(h.name()));
   }
@@ -1104,8 +1110,11 @@ void GUI::on_actionPause_All_triggered() {
       finishedTorrentTab->pauseTorrent(hash);
     }
   }
-  if(change)
+  if(change) {
+    updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
+    updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     downloadingTorrentTab->setInfoBar(tr("All downloads were paused."));
+  }
 }
 
 // pause selected items in the list
@@ -1125,8 +1134,10 @@ void GUI::on_actionPause_triggered() {
     if(BTSession->pauseTorrent(hash)){
       if(inDownloadList) {
         downloadingTorrentTab->pauseTorrent(hash);
+        updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
       } else {
         finishedTorrentTab->pauseTorrent(hash);
+        updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
       }
       downloadingTorrentTab->setInfoBar(tr("'%1' paused.", "xxx.avi paused.").arg(BTSession->getTorrentHandle(hash).name()));
     }
@@ -1136,6 +1147,8 @@ void GUI::on_actionPause_triggered() {
 void GUI::pauseTorrent(QString hash) {
   downloadingTorrentTab->pauseTorrent(hash);
   finishedTorrentTab->pauseTorrent(hash);
+  updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
+  updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
 }
 
 // Resume All Downloads in DL list
@@ -1156,8 +1169,11 @@ void GUI::on_actionStart_All_triggered() {
       finishedTorrentTab->resumeTorrent(hash);
     }
   }
-  if(change)
+  if(change) {
+    updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
+    updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     downloadingTorrentTab->setInfoBar(tr("All downloads were resumed."));
+  }
 }
 
 // start selected items in the list
@@ -1177,8 +1193,10 @@ void GUI::on_actionStart_triggered() {
     if(BTSession->resumeTorrent(hash)){
       if(inDownloadList) {
         downloadingTorrentTab->resumeTorrent(hash);
+        updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
       } else {
         finishedTorrentTab->resumeTorrent(hash);
+        updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
       }
       downloadingTorrentTab->setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(BTSession->getTorrentHandle(hash).name()));
     }

src/bittorrent.cpp

@@ -203,6 +203,26 @@ bool bittorrent::isPaused(QString hash) const{
   return h.is_paused();
 }
 
+unsigned int bittorrent::getFinishedPausedTorrentsNb() const {
+  unsigned int nbPaused = 0;
+  foreach(QString hash, finishedTorrents) {
+    if(isPaused(hash)) {
+      ++nbPaused;
+    }
+  }
+  return nbPaused;
+}
+
+unsigned int bittorrent::getUnfinishedPausedTorrentsNb() const {
+  unsigned int nbPaused = 0;
+  foreach(QString hash, unfinishedTorrents) {
+    if(isPaused(hash)) {
+      ++nbPaused;
+    }
+  }
+  return nbPaused;
+}
+
 // Delete a torrent from the session, given its hash
 // permanent = true means that the torrent will be removed from the hard-drive too
 void bittorrent::deleteTorrent(QString hash, bool permanent) {

src/bittorrent.h

@@ -95,6 +95,8 @@ class bittorrent : public QObject{
     QStringList getUnfinishedTorrents() const;
     bool isFinished(QString hash) const;
     bool has_filtered_files(QString hash) const;
+    unsigned int getFinishedPausedTorrentsNb() const;
+    unsigned int getUnfinishedPausedTorrentsNb() const;
 
   public slots:
     void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);