From 68c06c74853f12a6acd4f0b93ef22eec5ddc5251 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sun, 4 Jan 2015 01:32:31 +0200 Subject: [PATCH] Rename the 'Unpaused' filter to 'Resumed'. --- src/Icons/skin/{unpaused.png => resumed.png} | Bin src/icons.qrc | 2 +- src/torrentfilterenum.h | 2 +- src/transferlistfilterswidget.cpp | 8 ++++---- src/transferlistsortmodel.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/Icons/skin/{unpaused.png => resumed.png} (100%) diff --git a/src/Icons/skin/unpaused.png b/src/Icons/skin/resumed.png similarity index 100% rename from src/Icons/skin/unpaused.png rename to src/Icons/skin/resumed.png diff --git a/src/icons.qrc b/src/icons.qrc index 928354efe..8628ef1f4 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -361,7 +361,7 @@ Icons/skin/tabs.gif Icons/skin/toolbox-divider.gif Icons/skin/toolbox-divider2.gif - Icons/skin/unpaused.png + Icons/skin/resumed.png Icons/skin/uploading.png Icons/oxygen/system-log-out.png Icons/oxygen/go-bottom.png diff --git a/src/torrentfilterenum.h b/src/torrentfilterenum.h index 17f88af6e..0776db413 100644 --- a/src/torrentfilterenum.h +++ b/src/torrentfilterenum.h @@ -32,6 +32,6 @@ #define TORRENTFILTERENUM_H namespace TorrentFilter { -enum TorrentFilter {ALL, DOWNLOADING, COMPLETED, PAUSED, UNPAUSED, ACTIVE, INACTIVE}; +enum TorrentFilter {ALL, DOWNLOADING, COMPLETED, PAUSED, RESUMED, ACTIVE, INACTIVE}; } #endif // TORRENTFILTERENUM_H diff --git a/src/transferlistfilterswidget.cpp b/src/transferlistfilterswidget.cpp index c247b1a15..b6b84cb01 100644 --- a/src/transferlistfilterswidget.cpp +++ b/src/transferlistfilterswidget.cpp @@ -194,9 +194,9 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi QListWidgetItem *paused = new QListWidgetItem(statusFilters); paused->setData(Qt::DisplayRole, QVariant(tr("Paused") + " (0)")); paused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/paused.png")); - QListWidgetItem *unpaused = new QListWidgetItem(statusFilters); - unpaused->setData(Qt::DisplayRole, QVariant(tr("Unpaused") + " (0)")); - unpaused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/unpaused.png")); + QListWidgetItem *resumed = new QListWidgetItem(statusFilters); + resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed") + " (0)")); + resumed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/resumed.png")); QListWidgetItem *active = new QListWidgetItem(statusFilters); active->setData(Qt::DisplayRole, QVariant(tr("Active") + " (0)")); 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::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::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::INACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Inactive")+" ("+QString::number(report.nb_inactive)+")")); } diff --git a/src/transferlistsortmodel.cpp b/src/transferlistsortmodel.cpp index 890b44208..f93419d79 100644 --- a/src/transferlistsortmodel.cpp +++ b/src/transferlistsortmodel.cpp @@ -222,7 +222,7 @@ bool TransferListSortModel::matchStatusFilter(int sourceRow, const QModelIndex & case TorrentFilter::PAUSED: 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); case TorrentFilter::ACTIVE: