squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 00:47:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Implement a 'Completed' status. Closes #2326 #2483 #939.

Browse Source
This commit is contained in:
sledgehammer999
2015-03-28 21:09:13 +02:00
parent 8420559e05
commit f9e7345776
8 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/qtlibtorrent/torrentmodel.cpp
View File

@@ -70,6 +70,11 @@ QIcon get_stalled_uploading_icon() {
return cached;
}
QIcon get_completed_icon() {
static QIcon cached = QIcon(":/icons/skin/completed.png");
return cached;
}
QIcon get_checking_icon() {
static QIcon cached = QIcon(":/icons/skin/checking.png");
return cached;
@@ -81,6 +86,16 @@ QIcon get_error_icon() {
}
}
TorrentStatusReport::TorrentStatusReport()
: nb_downloading(0)
, nb_seeding(0)
, nb_completed(0)
, nb_active(0)
, nb_inactive(0)
, nb_paused(0)
{
}
TorrentModelItem::TorrentModelItem(const QTorrentHandle &h)
: m_torrent(h)
, m_lastStatus(h.status(torrent_handle::query_accurate_download_counters))
@@ -151,8 +166,9 @@ QIcon TorrentModelItem::getIconByState(State state) {
case STATE_SEEDING:
return get_uploading_icon();
case STATE_PAUSED_DL:
case STATE_PAUSED_UP:
return get_paused_icon();
case STATE_PAUSED_UP:
return get_completed_icon();
case STATE_QUEUED_DL:
case STATE_QUEUED_UP:
return get_queued_icon();
@@ -549,6 +565,7 @@ TorrentStatusReport TorrentModel::getTorrentStatusReport() const
++report.nb_downloading;
break;
case TorrentModelItem::STATE_PAUSED_DL:
case TorrentModelItem::STATE_PAUSED_MISSING:
++report.nb_paused;
case TorrentModelItem::STATE_STALLED_DL:
case TorrentModelItem::STATE_CHECKING_DL:
@@ -560,17 +577,16 @@ TorrentStatusReport TorrentModel::getTorrentStatusReport() const
case TorrentModelItem::STATE_SEEDING:
++report.nb_active;
++report.nb_seeding;
++report.nb_completed;
break;
case TorrentModelItem::STATE_PAUSED_UP:
case TorrentModelItem::STATE_PAUSED_MISSING:
++report.nb_paused;
case TorrentModelItem::STATE_STALLED_UP:
case TorrentModelItem::STATE_CHECKING_UP:
case TorrentModelItem::STATE_QUEUED_UP: {
case TorrentModelItem::STATE_QUEUED_UP:
++report.nb_seeding;
case TorrentModelItem::STATE_PAUSED_UP:
++report.nb_completed;
++report.nb_inactive;
break;
}
default:
break;
}

9
src/core/qtlibtorrent/torrentmodel.h
View File

@@ -40,8 +40,13 @@
#include "qtorrenthandle.h"
struct TorrentStatusReport {
TorrentStatusReport(): nb_downloading(0), nb_seeding(0), nb_active(0), nb_inactive(0), nb_paused(0) {}
uint nb_downloading; uint nb_seeding; uint nb_active; uint nb_inactive; uint nb_paused;
TorrentStatusReport();
uint nb_downloading;
uint nb_seeding;
uint nb_completed;
uint nb_active;
uint nb_inactive;
uint nb_paused;
};
class TorrentModelItem : public QObject {