From d046b7a53283e946d1dd9ff00ae00078944b1e1b Mon Sep 17 00:00:00 2001 From: ngosang Date: Tue, 10 Feb 2015 01:46:27 +0100 Subject: [PATCH] Change "remove empty labels" to "remove unused labels". --- src/gui/transferlistfilterswidget.cpp | 16 ++++++++-------- src/gui/transferlistfilterswidget.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 1efb555eb..2f05ef95d 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -297,11 +297,11 @@ void TransferListFiltersWidget::showLabelMenu(QPoint) { QMenu labelMenu(labelFilters); QAction *addAct = labelMenu.addAction(IconProvider::instance()->getIcon("list-add"), tr("Add label...")); QAction *removeAct = 0; - QAction *removeEmptyAct = 0; + QAction *removeUnusedAct = 0; if (!labelFilters->selectedItems().empty() && labelFilters->row(labelFilters->selectedItems().first()) > 1) removeAct = labelMenu.addAction(IconProvider::instance()->getIcon("list-remove"), tr("Remove label")); else - removeEmptyAct = labelMenu.addAction(IconProvider::instance()->getIcon("list-remove"), tr("Remove empty labels")); + removeUnusedAct = labelMenu.addAction(IconProvider::instance()->getIcon("list-remove"), tr("Remove unused labels")); labelMenu.addSeparator(); QAction *startAct = labelMenu.addAction(IconProvider::instance()->getIcon("media-playback-start"), tr("Resume torrents")); QAction *pauseAct = labelMenu.addAction(IconProvider::instance()->getIcon("media-playback-pause"), tr("Pause torrents")); @@ -313,8 +313,8 @@ void TransferListFiltersWidget::showLabelMenu(QPoint) { removeSelectedLabel(); return; } - if (act == removeEmptyAct) { - removeEmptyLabels(); + if (act == removeUnusedAct) { + removeUnusedLabels(); return; } if (act == deleteTorrentsAct) { @@ -367,14 +367,14 @@ void TransferListFiltersWidget::removeSelectedLabel() { Preferences::instance()->removeTorrentLabel(label); } -void TransferListFiltersWidget::removeEmptyLabels() { - QStringList emptyLabels; +void TransferListFiltersWidget::removeUnusedLabels() { + QStringList unusedLabels; QHash::const_iterator i; for (i = customLabels.begin(); i != customLabels.end(); ++i) { if (i.value() == 0) - emptyLabels << i.key(); + unusedLabels << i.key(); } - foreach (const QString &label, emptyLabels) { + foreach (const QString &label, unusedLabels) { customLabels.remove(label); delete labelFilters->takeItem(labelFilters->rowFromLabel(label)); Preferences::instance()->removeTorrentLabel(label); diff --git a/src/gui/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h index 543790bba..7bea61df7 100644 --- a/src/gui/transferlistfilterswidget.h +++ b/src/gui/transferlistfilterswidget.h @@ -108,7 +108,7 @@ protected slots: void addLabel(QString& label); void showLabelMenu(QPoint); void removeSelectedLabel(); - void removeEmptyLabels(); + void removeUnusedLabels(); void applyLabelFilter(int row); void torrentChangedLabel(TorrentModelItem *torrentItem, QString old_label, QString new_label); void handleNewTorrent(TorrentModelItem* torrentItem);