github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-07 21:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #3165 from Chocobo1/rss_sort

Browse source 
Sort labels in RSS Downloader dialog
This commit is contained in:
sledgehammer999 2015-10-03 18:52:46 -05:00
commit 8b547644b0
4 changed files with 203 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gui/rss/automatedrssdownloader.cpp
View file

@ -43,6 +43,7 @@
#include "guiiconprovider.h"
#include "autoexpandabledialog.h"
#include "core/utils/fs.h"
#include "core/utils/string.h"
AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& manager, QWidget *parent) :
QDialog(parent),
@ -262,9 +263,9 @@ void AutomatedRssDownloader::updateRuleDefinitionBox()
QDateTime dateTime = rule->lastMatch();
QString lMatch;
if (dateTime.isValid())
lMatch = tr("Last match: %1 days ago").arg(dateTime.daysTo(QDateTime::currentDateTime()));
lMatch = tr("Last Match: %1 days ago").arg(dateTime.daysTo(QDateTime::currentDateTime()));
else
lMatch = tr("Last match: Unknown");
lMatch = tr("Last Match: Unknown");
ui->lblLastMatch->setText(lMatch);
updateMustLineValidity();
updateMustNotLineValidity();
@ -310,10 +311,10 @@ RssDownloadRulePtr AutomatedRssDownloader::getCurrentRule() const
void AutomatedRssDownloader::initLabelCombobox()
{
// Load custom labels
const QStringList customLabels = Preferences::instance()->getTorrentLabels();
foreach (const QString& label, customLabels) {
ui->comboLabel->addItem(label);
}
QStringList customLabels = Preferences::instance()->getTorrentLabels();
std::sort(customLabels.begin(), customLabels.end(), Utils::String::NaturalCompare());
foreach (const QString& l, customLabels)
ui->comboLabel->addItem(l);
}
void AutomatedRssDownloader::saveEditedRule()