d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-12 05:11:24 +00:00
Code Issues Projects Releases Wiki Activity

Rename the 'Unpaused' filter to 'Resumed'.

Browse Source
This commit is contained in:
sledgehammer999 2015-01-04 01:32:31 +02:00
parent 93f557b747
commit 68c06c7485
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/Icons/skin/unpaused.png → src/Icons/skin/resumed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 B

After

Width:  |  Height:  |  Size: 431 B

2
src/icons.qrc
View File

@ -361,7 +361,7 @@
<file>Icons/skin/tabs.gif</file> <file>Icons/skin/tabs.gif</file>
<file>Icons/skin/toolbox-divider.gif</file> <file>Icons/skin/toolbox-divider.gif</file>
<file>Icons/skin/toolbox-divider2.gif</file> <file>Icons/skin/toolbox-divider2.gif</file>
<file>Icons/skin/unpaused.png</file> <file>Icons/skin/resumed.png</file>
<file>Icons/skin/uploading.png</file> <file>Icons/skin/uploading.png</file>
<file>Icons/oxygen/system-log-out.png</file> <file>Icons/oxygen/system-log-out.png</file>
<file>Icons/oxygen/go-bottom.png</file> <file>Icons/oxygen/go-bottom.png</file>

2
src/torrentfilterenum.h
View File

@ -32,6 +32,6 @@
#define TORRENTFILTERENUM_H #define TORRENTFILTERENUM_H
namespace TorrentFilter { namespace TorrentFilter {
enum TorrentFilter {ALL, DOWNLOADING, COMPLETED, PAUSED, UNPAUSED, ACTIVE, INACTIVE}; enum TorrentFilter {ALL, DOWNLOADING, COMPLETED, PAUSED, RESUMED, ACTIVE, INACTIVE};
} }
#endif // TORRENTFILTERENUM_H #endif // TORRENTFILTERENUM_H

8
src/transferlistfilterswidget.cpp
View File

@ -194,9 +194,9 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
QListWidgetItem *paused = new QListWidgetItem(statusFilters); QListWidgetItem *paused = new QListWidgetItem(statusFilters);
paused->setData(Qt::DisplayRole, QVariant(tr("Paused") + " (0)")); paused->setData(Qt::DisplayRole, QVariant(tr("Paused") + " (0)"));
paused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/paused.png")); paused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/paused.png"));
QListWidgetItem *unpaused = new QListWidgetItem(statusFilters); QListWidgetItem *resumed = new QListWidgetItem(statusFilters);
unpaused->setData(Qt::DisplayRole, QVariant(tr("Unpaused") + " (0)")); resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed") + " (0)"));
unpaused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/unpaused.png")); resumed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/resumed.png"));
QListWidgetItem *active = new QListWidgetItem(statusFilters); QListWidgetItem *active = new QListWidgetItem(statusFilters);
active->setData(Qt::DisplayRole, QVariant(tr("Active") + " (0)")); active->setData(Qt::DisplayRole, QVariant(tr("Active") + " (0)"));
active->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filteractive.png")); active->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filteractive.png"));
@ -268,7 +268,7 @@ void TransferListFiltersWidget::updateTorrentNumbers() {
statusFilters->item(TorrentFilter::DOWNLOADING)->setData(Qt::DisplayRole, QVariant(tr("Downloading")+" ("+QString::number(report.nb_downloading)+")")); statusFilters->item(TorrentFilter::DOWNLOADING)->setData(Qt::DisplayRole, QVariant(tr("Downloading")+" ("+QString::number(report.nb_downloading)+")"));
statusFilters->item(TorrentFilter::COMPLETED)->setData(Qt::DisplayRole, QVariant(tr("Completed")+" ("+QString::number(report.nb_seeding)+")")); statusFilters->item(TorrentFilter::COMPLETED)->setData(Qt::DisplayRole, QVariant(tr("Completed")+" ("+QString::number(report.nb_seeding)+")"));
statusFilters->item(TorrentFilter::PAUSED)->setData(Qt::DisplayRole, QVariant(tr("Paused")+" ("+QString::number(report.nb_paused)+")")); statusFilters->item(TorrentFilter::PAUSED)->setData(Qt::DisplayRole, QVariant(tr("Paused")+" ("+QString::number(report.nb_paused)+")"));
statusFilters->item(TorrentFilter::UNPAUSED)->setData(Qt::DisplayRole, QVariant(tr("Unpaused")+" ("+QString::number(report.nb_active+report.nb_inactive-report.nb_paused)+")")); statusFilters->item(TorrentFilter::RESUMED)->setData(Qt::DisplayRole, QVariant(tr("Resumed")+" ("+QString::number(report.nb_active+report.nb_inactive-report.nb_paused)+")"));
statusFilters->item(TorrentFilter::ACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Active")+" ("+QString::number(report.nb_active)+")")); statusFilters->item(TorrentFilter::ACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Active")+" ("+QString::number(report.nb_active)+")"));
statusFilters->item(TorrentFilter::INACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Inactive")+" ("+QString::number(report.nb_inactive)+")")); statusFilters->item(TorrentFilter::INACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Inactive")+" ("+QString::number(report.nb_inactive)+")"));
} }

2
src/transferlistsortmodel.cpp
View File

@ -222,7 +222,7 @@ bool TransferListSortModel::matchStatusFilter(int sourceRow, const QModelIndex &
case TorrentFilter::PAUSED: case TorrentFilter::PAUSED:
return (state == TorrentModelItem::STATE_PAUSED_UP || state == TorrentModelItem::STATE_PAUSED_DL); return (state == TorrentModelItem::STATE_PAUSED_UP || state == TorrentModelItem::STATE_PAUSED_DL);
case TorrentFilter::UNPAUSED: case TorrentFilter::RESUMED:
return (state != TorrentModelItem::STATE_PAUSED_UP && state != TorrentModelItem::STATE_PAUSED_DL); return (state != TorrentModelItem::STATE_PAUSED_UP && state != TorrentModelItem::STATE_PAUSED_DL);
case TorrentFilter::ACTIVE: case TorrentFilter::ACTIVE: