mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2026-01-02 21:52:32 -06:00
Implement search filters in the proxy model. Partially closes #972
This commit is contained in:
Eugene Shalygin
committed by
Eugene Shalygin
Eugene Shalygin
parent
93d8cadaaf
commit
1336cb7a61
@@ -29,6 +29,7 @@
|
||||
*/
|
||||
|
||||
#include <QDir>
|
||||
#include <QMetaEnum>
|
||||
#include <QTreeView>
|
||||
#include <QStandardItemModel>
|
||||
#include <QHeaderView>
|
||||
@@ -41,16 +42,28 @@
|
||||
|
||||
#include "base/utils/misc.h"
|
||||
#include "base/preferences.h"
|
||||
#include "base/settingsstorage.h"
|
||||
#include "guiiconprovider.h"
|
||||
#include "searchsortmodel.h"
|
||||
#include "searchlistdelegate.h"
|
||||
#include "searchwidget.h"
|
||||
#include "searchtab.h"
|
||||
|
||||
namespace
|
||||
{
|
||||
#define SETTINGS_KEY(name) "Search/" name
|
||||
|
||||
const QString KEY_FILTER_MODE_SETTING_NAME = SETTINGS_KEY("FilteringMode");
|
||||
}
|
||||
|
||||
SearchTab::SearchTab(SearchWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_parent(parent)
|
||||
{
|
||||
m_box = new QVBoxLayout(this);
|
||||
setupUi(this);
|
||||
retranslateUi(this);
|
||||
|
||||
m_box = static_cast<QVBoxLayout*>(this->layout());
|
||||
m_resultsLbl = new QLabel(this);
|
||||
m_resultsBrowser = new QTreeView(this);
|
||||
#ifdef QBT_USES_QT5
|
||||
@@ -65,14 +78,12 @@ SearchTab::SearchTab(SearchWidget *parent)
|
||||
m_box->addWidget(m_resultsLbl);
|
||||
m_box->addWidget(m_resultsBrowser);
|
||||
|
||||
setLayout(m_box);
|
||||
|
||||
// Set Search results list model
|
||||
m_searchListModel = new QStandardItemModel(0, SearchSortModel::NB_SEARCH_COLUMNS, this);
|
||||
m_searchListModel->setHeaderData(SearchSortModel::NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
|
||||
m_searchListModel->setHeaderData(SearchSortModel::SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
|
||||
m_searchListModel->setHeaderData(SearchSortModel::SEEDS, Qt::Horizontal, tr("Seeders", "i.e: Number of full sources"));
|
||||
m_searchListModel->setHeaderData(SearchSortModel::LEECHS, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
|
||||
m_searchListModel->setHeaderData(SearchSortModel::LEECHES, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
|
||||
m_searchListModel->setHeaderData(SearchSortModel::ENGINE_URL, Qt::Horizontal, tr("Search engine"));
|
||||
|
||||
m_proxyModel = new SearchSortModel(this);
|
||||
@@ -99,6 +110,22 @@ SearchTab::SearchTab(SearchWidget *parent)
|
||||
|
||||
// Sort by Seeds
|
||||
m_resultsBrowser->sortByColumn(SearchSortModel::SEEDS, Qt::DescendingOrder);
|
||||
|
||||
fillFilterComboBoxes();
|
||||
|
||||
updateFilter();
|
||||
|
||||
connect(filterMode, SIGNAL(currentIndexChanged(int)), this, SLOT(updateFilter()));
|
||||
connect(minSeeds, SIGNAL(editingFinished()), this, SLOT(updateFilter()));
|
||||
connect(minSeeds, SIGNAL(valueChanged(int)), this, SLOT(updateFilter()));
|
||||
connect(maxSeeds, SIGNAL(editingFinished()), this, SLOT(updateFilter()));
|
||||
connect(maxSeeds, SIGNAL(valueChanged(int)), this, SLOT(updateFilter()));
|
||||
connect(minSize, SIGNAL(editingFinished()), this, SLOT(updateFilter()));
|
||||
connect(minSize, SIGNAL(valueChanged(double)), this, SLOT(updateFilter()));
|
||||
connect(maxSize, SIGNAL(editingFinished()), this, SLOT(updateFilter()));
|
||||
connect(maxSize, SIGNAL(valueChanged(double)), this, SLOT(updateFilter()));
|
||||
connect(minSizeUnit, SIGNAL(currentIndexChanged(int)), this, SLOT(updateFilter()));
|
||||
connect(maxSizeUnit, SIGNAL(currentIndexChanged(int)), this, SLOT(updateFilter()));
|
||||
}
|
||||
|
||||
void SearchTab::downloadSelectedItem(const QModelIndex &index)
|
||||
@@ -123,24 +150,18 @@ bool SearchTab::loadColWidthResultsList()
|
||||
return false;
|
||||
|
||||
unsigned int listSize = widthList.size();
|
||||
for (unsigned int i = 0; i < listSize; ++i) {
|
||||
for (unsigned int i = 0; i < listSize; ++i)
|
||||
m_resultsBrowser->header()->resizeSection(i, widthList.at(i).toInt());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
QLabel* SearchTab::getCurrentLabel() const
|
||||
{
|
||||
return m_resultsLbl;
|
||||
}
|
||||
|
||||
QTreeView* SearchTab::getCurrentTreeView() const
|
||||
{
|
||||
return m_resultsBrowser;
|
||||
}
|
||||
|
||||
QSortFilterProxyModel* SearchTab::getCurrentSearchListProxy() const
|
||||
SearchSortModel* SearchTab::getCurrentSearchListProxy() const
|
||||
{
|
||||
return m_proxyModel;
|
||||
}
|
||||
@@ -154,19 +175,128 @@ QStandardItemModel* SearchTab::getCurrentSearchListModel() const
|
||||
void SearchTab::setRowColor(int row, QString color)
|
||||
{
|
||||
m_proxyModel->setDynamicSortFilter(false);
|
||||
for (int i = 0; i < m_proxyModel->columnCount(); ++i) {
|
||||
for (int i = 0; i < m_proxyModel->columnCount(); ++i)
|
||||
m_proxyModel->setData(m_proxyModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
|
||||
}
|
||||
|
||||
m_proxyModel->setDynamicSortFilter(true);
|
||||
}
|
||||
|
||||
QString SearchTab::status() const
|
||||
SearchTab::Status SearchTab::status() const
|
||||
{
|
||||
return m_status;
|
||||
}
|
||||
|
||||
void SearchTab::setStatus(const QString &value)
|
||||
void SearchTab::setStatus(Status value)
|
||||
{
|
||||
m_status = value;
|
||||
setStatusTip(statusText(value));
|
||||
const int thisTabIndex = m_parent->searchTabs()->indexOf(this);
|
||||
m_parent->searchTabs()->setTabToolTip(thisTabIndex, statusTip());
|
||||
m_parent->searchTabs()->setTabIcon(thisTabIndex, GuiIconProvider::instance()->getIcon(statusIconName(value)));
|
||||
}
|
||||
|
||||
void SearchTab::updateResultsCount()
|
||||
{
|
||||
const int totalResults = getCurrentSearchListModel() ? getCurrentSearchListModel()->rowCount(QModelIndex()) : 0;
|
||||
const int filteredResults = getCurrentSearchListProxy() ? getCurrentSearchListProxy()->rowCount(QModelIndex()) : totalResults;
|
||||
m_resultsLbl->setText(tr("Results (showing <i>%1</i> out of <i>%2</i>):", "i.e: Search results")
|
||||
.arg(filteredResults).arg(totalResults));
|
||||
}
|
||||
|
||||
void SearchTab::updateFilter()
|
||||
{
|
||||
using Utils::Misc::SizeUnit;
|
||||
SearchSortModel* filterModel = getCurrentSearchListProxy();
|
||||
filterModel->enableNameFilter(filteringMode() == OnlyNames);
|
||||
// we update size and seeds filter parameters in the model even if they are disabled
|
||||
// because we need to read them from the model when search tabs switch
|
||||
filterModel->setSeedsFilter(minSeeds->value(), maxSeeds->value());
|
||||
filterModel->setSizeFilter(
|
||||
sizeInBytes(minSize->value(), static_cast<SizeUnit>(minSizeUnit->currentIndex())),
|
||||
sizeInBytes(maxSize->value(), static_cast<SizeUnit>(maxSizeUnit->currentIndex())));
|
||||
|
||||
SettingsStorage::instance()->storeValue(KEY_FILTER_MODE_SETTING_NAME,
|
||||
filterMode->itemData(filterMode->currentIndex()));
|
||||
filterModel->invalidate();
|
||||
updateResultsCount();
|
||||
}
|
||||
|
||||
void SearchTab::fillFilterComboBoxes()
|
||||
{
|
||||
using Utils::Misc::SizeUnit;
|
||||
QStringList unitStrings;
|
||||
unitStrings.append(unitString(SizeUnit::Byte));
|
||||
unitStrings.append(unitString(SizeUnit::KibiByte));
|
||||
unitStrings.append(unitString(SizeUnit::MebiByte));
|
||||
unitStrings.append(unitString(SizeUnit::GibiByte));
|
||||
unitStrings.append(unitString(SizeUnit::TebiByte));
|
||||
unitStrings.append(unitString(SizeUnit::PebiByte));
|
||||
unitStrings.append(unitString(SizeUnit::ExbiByte));
|
||||
|
||||
minSizeUnit->clear();
|
||||
maxSizeUnit->clear();
|
||||
minSizeUnit->addItems(unitStrings);
|
||||
maxSizeUnit->addItems(unitStrings);
|
||||
|
||||
minSize->setValue(0);
|
||||
minSizeUnit->setCurrentIndex(static_cast<int>(SizeUnit::MebiByte));
|
||||
|
||||
maxSize->setValue(-1);
|
||||
maxSizeUnit->setCurrentIndex(static_cast<int>(SizeUnit::TebiByte));
|
||||
|
||||
filterMode->clear();
|
||||
|
||||
QMetaEnum nameFilteringModeEnum =
|
||||
this->metaObject()->enumerator(this->metaObject()->indexOfEnumerator("NameFilteringMode"));
|
||||
|
||||
filterMode->addItem(tr("Torrent names only"), nameFilteringModeEnum.valueToKey(OnlyNames));
|
||||
filterMode->addItem(tr("Everywhere"), nameFilteringModeEnum.valueToKey(Everywhere));
|
||||
|
||||
QVariant selectedMode = SettingsStorage::instance()->loadValue(
|
||||
KEY_FILTER_MODE_SETTING_NAME, nameFilteringModeEnum.valueToKey(OnlyNames));
|
||||
int index = filterMode->findData(selectedMode);
|
||||
filterMode->setCurrentIndex(index == -1 ? 0 : index);
|
||||
}
|
||||
|
||||
QString SearchTab::statusText(SearchTab::Status st)
|
||||
{
|
||||
switch (st) {
|
||||
case Status::Ongoing:
|
||||
return tr("Searching...");
|
||||
case Status::Finished:
|
||||
return tr("Search has finished");
|
||||
case Status::Aborted:
|
||||
return tr("Search aborted");
|
||||
case Status::Error:
|
||||
return tr("An error occurred during search...");
|
||||
case Status::NoResults:
|
||||
return tr("Search returned no results");
|
||||
default:
|
||||
return QString();
|
||||
}
|
||||
}
|
||||
|
||||
QString SearchTab::statusIconName(SearchTab::Status st)
|
||||
{
|
||||
switch (st) {
|
||||
case Status::Ongoing:
|
||||
return QLatin1String("task-ongoing");
|
||||
case Status::Finished:
|
||||
return QLatin1String("task-complete");
|
||||
case Status::Aborted:
|
||||
return QLatin1String("task-reject");
|
||||
case Status::Error:
|
||||
return QLatin1String("task-attention");
|
||||
case Status::NoResults:
|
||||
return QLatin1String("task-attention");
|
||||
default:
|
||||
return QString();
|
||||
}
|
||||
}
|
||||
|
||||
SearchTab::NameFilteringMode SearchTab::filteringMode() const
|
||||
{
|
||||
QMetaEnum metaEnum =
|
||||
this->metaObject()->enumerator(this->metaObject()->indexOfEnumerator("NameFilteringMode"));
|
||||
return static_cast<NameFilteringMode>(metaEnum.keyToValue(filterMode->itemData(filterMode->currentIndex()).toByteArray()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user