Merge pull request #4170 from vlakoff/filtering-v3

Support wildcards for filtering torrent list and torrent content
This commit is contained in:
sledgehammer999 2015-11-29 18:13:58 -06:00
commit f4ef0633c9
3 changed files with 2 additions and 3 deletions

View File

@ -855,7 +855,7 @@ void PropertiesWidget::filteredFilesChanged() {
} }
void PropertiesWidget::filterText(const QString& filter) { void PropertiesWidget::filterText(const QString& filter) {
PropListModel->setFilterFixedString(filter); PropListModel->setFilterRegExp(QRegExp(filter, Qt::CaseInsensitive, QRegExp::WildcardUnix));
if (filter.isEmpty()) { if (filter.isEmpty()) {
filesList->collapseAll(); filesList->collapseAll();
filesList->expand(PropListModel->index(0, 0)); filesList->expand(PropListModel->index(0, 0));

View File

@ -38,7 +38,6 @@ TorrentContentFilterModel::TorrentContentFilterModel(QObject *parent):
connect(m_model, SIGNAL(filteredFilesChanged()), this, SIGNAL(filteredFilesChanged())); connect(m_model, SIGNAL(filteredFilesChanged()), this, SIGNAL(filteredFilesChanged()));
setSourceModel(m_model); setSourceModel(m_model);
// Filter settings // Filter settings
setFilterCaseSensitivity(Qt::CaseInsensitive);
setFilterKeyColumn(TorrentContentModelItem::COL_NAME); setFilterKeyColumn(TorrentContentModelItem::COL_NAME);
setFilterRole(Qt::DisplayRole); setFilterRole(Qt::DisplayRole);
setDynamicSortFilter(true); setDynamicSortFilter(true);

View File

@ -874,7 +874,7 @@ void TransferListWidget::applyTrackerFilter(const QStringList &hashes)
void TransferListWidget::applyNameFilter(const QString& name) void TransferListWidget::applyNameFilter(const QString& name)
{ {
nameFilterModel->setFilterRegExp(QRegExp(QRegExp::escape(name), Qt::CaseInsensitive)); nameFilterModel->setFilterRegExp(QRegExp(name, Qt::CaseInsensitive, QRegExp::WildcardUnix));
} }
void TransferListWidget::applyStatusFilter(int f) void TransferListWidget::applyStatusFilter(int f)