diff --git a/src/core/qtlibtorrent/torrentmodel.h b/src/core/qtlibtorrent/torrentmodel.h index 0c8ba7ac0..5042537b8 100644 --- a/src/core/qtlibtorrent/torrentmodel.h +++ b/src/core/qtlibtorrent/torrentmodel.h @@ -48,7 +48,7 @@ class TorrentModelItem : public QObject { Q_OBJECT public: - enum State {STATE_DOWNLOADING, STATE_DOWNLOADING_META, STATE_ALLOCATING, STATE_STALLED_DL, STATE_STALLED_UP, STATE_SEEDING, STATE_PAUSED_DL, STATE_PAUSED_UP, STATE_PAUSED_MISSING, STATE_QUEUED_DL, STATE_QUEUED_UP, STATE_CHECKING_UP, STATE_CHECKING_DL, STATE_QUEUED_CHECK, STATE_QUEUED_FASTCHECK, STATE_INVALID}; + enum State {STATE_DOWNLOADING, STATE_DOWNLOADING_META, STATE_ALLOCATING, STATE_STALLED_DL, STATE_SEEDING, STATE_STALLED_UP, STATE_QUEUED_DL, STATE_QUEUED_UP, STATE_CHECKING_UP, STATE_CHECKING_DL, STATE_QUEUED_CHECK, STATE_QUEUED_FASTCHECK, STATE_PAUSED_DL, STATE_PAUSED_UP, STATE_PAUSED_MISSING, STATE_INVALID}; enum Column {TR_NAME, TR_PRIORITY, TR_SIZE, TR_TOTAL_SIZE, TR_PROGRESS, TR_STATUS, TR_SEEDS, TR_PEERS, TR_DLSPEED, TR_UPSPEED, TR_ETA, TR_RATIO, TR_LABEL, TR_ADD_DATE, TR_SEED_DATE, TR_TRACKER, TR_DLLIMIT, TR_UPLIMIT, TR_AMOUNT_DOWNLOADED, TR_AMOUNT_UPLOADED, TR_AMOUNT_LEFT, TR_TIME_ELAPSED, TR_SAVE_PATH, TR_COMPLETED, TR_RATIO_LIMIT, TR_SEEN_COMPLETE_DATE, TR_LAST_ACTIVITY, NB_COLUMNS}; public: diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp index 402e22a08..f3c3ceed8 100644 --- a/src/gui/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -97,23 +97,16 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem case TorrentModelItem::STATE_ALLOCATING: display = tr("Allocating", "qBittorrent is allocating the files on disk"); break; - case TorrentModelItem::STATE_PAUSED_DL: - case TorrentModelItem::STATE_PAUSED_UP: - display = tr("Paused"); - break; - case TorrentModelItem::STATE_PAUSED_MISSING: - display = tr("Missing Files"); - break; - case TorrentModelItem::STATE_QUEUED_DL: - case TorrentModelItem::STATE_QUEUED_UP: - display = tr("Queued", "i.e. torrent is queued"); + case TorrentModelItem::STATE_STALLED_DL: + display = tr("Stalled", "Torrent is waiting for download to begin"); break; case TorrentModelItem::STATE_SEEDING: case TorrentModelItem::STATE_STALLED_UP: display = tr("Seeding", "Torrent is complete and in upload-only mode"); break; - case TorrentModelItem::STATE_STALLED_DL: - display = tr("Stalled", "Torrent is waiting for download to begin"); + case TorrentModelItem::STATE_QUEUED_DL: + case TorrentModelItem::STATE_QUEUED_UP: + display = tr("Queued", "i.e. torrent is queued"); break; case TorrentModelItem::STATE_CHECKING_DL: case TorrentModelItem::STATE_CHECKING_UP: @@ -125,6 +118,13 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem case TorrentModelItem::STATE_QUEUED_FASTCHECK: display = tr("Checking resume data", "used when loading the torrents from disk after qbt is launched. It checks the correctness of the .fastresume file. Normally it is completed in a fraction of a second, unless loading many many torrents."); break; + case TorrentModelItem::STATE_PAUSED_DL: + case TorrentModelItem::STATE_PAUSED_UP: + display = tr("Paused"); + break; + case TorrentModelItem::STATE_PAUSED_MISSING: + display = tr("Missing Files"); + break; default: display = ""; }