github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 21:03:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Follow project coding style. Issue #2192.

Browse source
This commit is contained in:
buinsky 2015-01-29 20:35:57 +03:00
commit 623797a6c4
2 changed files with 450 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

118
src/gui/transferlistfilterswidget.cpp
View file

@ -48,7 +48,8 @@
#include "autoexpandabledialog.h" #include "autoexpandabledialog.h"
#include "torrentfilterenum.h" #include "torrentfilterenum.h"
LabelFiltersList::LabelFiltersList(QWidget *parent): QListWidget(parent) { LabelFiltersList::LabelFiltersList(QWidget *parent): QListWidget(parent)
{
itemHover = 0; itemHover = 0;
// Accept drop // Accept drop
setAcceptDrops(true); setAcceptDrops(true);
@ -59,7 +60,8 @@ LabelFiltersList::LabelFiltersList(QWidget *parent): QListWidget(parent) {
#endif #endif
} }
void LabelFiltersList::addItem(QListWidgetItem *it) { void LabelFiltersList::addItem(QListWidgetItem *it)
{
Q_ASSERT(count() >= 2); Q_ASSERT(count() >= 2);
for (int i = 2; i<count(); ++i) { for (int i = 2; i<count(); ++i) {
if (item(i)->text().localeAwareCompare(it->text()) >= 0) { if (item(i)->text().localeAwareCompare(it->text()) >= 0) {
@ -70,7 +72,8 @@ void LabelFiltersList::addItem(QListWidgetItem *it) {
QListWidget::addItem(it); QListWidget::addItem(it);
} }
QString LabelFiltersList::labelFromRow(int row) const { QString LabelFiltersList::labelFromRow(int row) const
{
Q_ASSERT(row > 1); Q_ASSERT(row > 1);
const QString &label = item(row)->text(); const QString &label = item(row)->text();
QStringList parts = label.split(" "); QStringList parts = label.split(" ");
@ -79,15 +82,16 @@ QString LabelFiltersList::labelFromRow(int row) const {
return parts.join(" "); return parts.join(" ");
} }
int LabelFiltersList::rowFromLabel(QString label) const { int LabelFiltersList::rowFromLabel(QString label) const
{
Q_ASSERT(!label.isEmpty()); Q_ASSERT(!label.isEmpty());
for (int i=2; i<count(); ++i) { for (int i = 2; i<count(); ++i)
if (label == labelFromRow(i)) return i; if (label == labelFromRow(i)) return i;
}
return -1; return -1;
} }
void LabelFiltersList::dragMoveEvent(QDragMoveEvent *event) { void LabelFiltersList::dragMoveEvent(QDragMoveEvent *event)
{
if (itemAt(event->pos()) && row(itemAt(event->pos())) > 0) { if (itemAt(event->pos()) && row(itemAt(event->pos())) > 0) {
if (itemHover) { if (itemHover) {
if (itemHover != itemAt(event->pos())) { if (itemHover != itemAt(event->pos())) {
@ -95,50 +99,56 @@ void LabelFiltersList::dragMoveEvent(QDragMoveEvent *event) {
itemHover = itemAt(event->pos()); itemHover = itemAt(event->pos());
setItemHover(true); setItemHover(true);
} }
} else { }
else {
itemHover = itemAt(event->pos()); itemHover = itemAt(event->pos());
setItemHover(true); setItemHover(true);
} }
event->acceptProposedAction(); event->acceptProposedAction();
} else { }
else {
if (itemHover) if (itemHover)
setItemHover(false); setItemHover(false);
event->ignore(); event->ignore();
} }
} }
void LabelFiltersList::dropEvent(QDropEvent *event) { void LabelFiltersList::dropEvent(QDropEvent *event)
{
qDebug("Drop Event in labels list"); qDebug("Drop Event in labels list");
if (itemAt(event->pos())) { if (itemAt(event->pos()))
emit torrentDropped(row(itemAt(event->pos()))); emit torrentDropped(row(itemAt(event->pos())));
}
event->ignore(); event->ignore();
setItemHover(false); setItemHover(false);
// Select current item again // Select current item again
currentItem()->setSelected(true); currentItem()->setSelected(true);
} }
void LabelFiltersList::dragLeaveEvent(QDragLeaveEvent*) { void LabelFiltersList::dragLeaveEvent(QDragLeaveEvent*)
{
if (itemHover) if (itemHover)
setItemHover(false); setItemHover(false);
// Select current item again // Select current item again
currentItem()->setSelected(true); currentItem()->setSelected(true);
} }
void LabelFiltersList::setItemHover(bool hover) { void LabelFiltersList::setItemHover(bool hover)
{
Q_ASSERT(itemHover); Q_ASSERT(itemHover);
if (hover) { if (hover) {
itemHover->setData(Qt::DecorationRole, IconProvider::instance()->getIcon("folder-documents.png")); itemHover->setData(Qt::DecorationRole, IconProvider::instance()->getIcon("folder-documents.png"));
itemHover->setSelected(true); itemHover->setSelected(true);
//setCurrentItem(itemHover); //setCurrentItem(itemHover);
} else { }
else {
itemHover->setData(Qt::DecorationRole, IconProvider::instance()->getIcon("inode-directory.png")); itemHover->setData(Qt::DecorationRole, IconProvider::instance()->getIcon("inode-directory.png"));
//itemHover->setSelected(false); //itemHover->setSelected(false);
itemHover = 0; itemHover = 0;
} }
} }
StatusFiltersWidget::StatusFiltersWidget(QWidget *parent) : QListWidget(parent), m_shown(false) { StatusFiltersWidget::StatusFiltersWidget(QWidget *parent): QListWidget(parent), m_shown(false)
{
setUniformItemSizes(true); setUniformItemSizes(true);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
// Height is fixed (sizeHint().height() is used) // Height is fixed (sizeHint().height() is used)
@ -149,14 +159,16 @@ StatusFiltersWidget::StatusFiltersWidget(QWidget *parent) : QListWidget(parent),
#endif #endif
} }
QSize StatusFiltersWidget::sizeHint() const { QSize StatusFiltersWidget::sizeHint() const
{
QSize size = QListWidget::sizeHint(); QSize size = QListWidget::sizeHint();
// Height should be exactly the height of the content // Height should be exactly the height of the content
size.setHeight(contentsSize().height() + 2 * frameWidth() + 6); size.setHeight(contentsSize().height() + 2 * frameWidth() + 6);
return size; return size;
} }
TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList): QFrame(parent), transferList(transferList), nb_labeled(0), nb_torrents(0) { TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList): QFrame(parent), transferList(transferList), nb_labeled(0), nb_torrents(0)
{
// Construct lists // Construct lists
vLayout = new QVBoxLayout(); vLayout = new QVBoxLayout();
vLayout->setContentsMargins(0, 4, 0, 0); vLayout->setContentsMargins(0, 4, 0, 0);
@ -184,25 +196,25 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
// Add status filters // Add status filters
QListWidgetItem *all = new QListWidgetItem(statusFilters); QListWidgetItem *all = new QListWidgetItem(statusFilters);
all->setData(Qt::DisplayRole, QVariant(tr("All") + " (0)")); all->setData(Qt::DisplayRole, QVariant(tr("All") + " (0)"));
all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.png")); all->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filterall.png"));
QListWidgetItem *downloading = new QListWidgetItem(statusFilters); QListWidgetItem *downloading = new QListWidgetItem(statusFilters);
downloading->setData(Qt::DisplayRole, QVariant(tr("Downloading") + " (0)")); downloading->setData(Qt::DisplayRole, QVariant(tr("Downloading") + " (0)"));
downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.png")); downloading->setData(Qt::DecorationRole, QIcon(":/Icons/skin/downloading.png"));
QListWidgetItem *completed = new QListWidgetItem(statusFilters); QListWidgetItem *completed = new QListWidgetItem(statusFilters);
completed->setData(Qt::DisplayRole, QVariant(tr("Completed") + " (0)")); completed->setData(Qt::DisplayRole, QVariant(tr("Completed") + " (0)"));
completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.png")); completed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/uploading.png"));
QListWidgetItem *paused = new QListWidgetItem(statusFilters); QListWidgetItem *paused = new QListWidgetItem(statusFilters);
paused->setData(Qt::DisplayRole, QVariant(tr("Paused") + " (0)")); paused->setData(Qt::DisplayRole, QVariant(tr("Paused") + " (0)"));
paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.png")); paused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/paused.png"));
QListWidgetItem *resumed = new QListWidgetItem(statusFilters); QListWidgetItem *resumed = new QListWidgetItem(statusFilters);
resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed") + " (0)")); resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed") + " (0)"));
resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.png")); resumed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/resumed.png"));
QListWidgetItem *active = new QListWidgetItem(statusFilters); QListWidgetItem *active = new QListWidgetItem(statusFilters);
active->setData(Qt::DisplayRole, QVariant(tr("Active") + " (0)")); active->setData(Qt::DisplayRole, QVariant(tr("Active") + " (0)"));
active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.png")); active->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filteractive.png"));
QListWidgetItem *inactive = new QListWidgetItem(statusFilters); QListWidgetItem *inactive = new QListWidgetItem(statusFilters);
inactive->setData(Qt::DisplayRole, QVariant(tr("Inactive") + " (0)")); inactive->setData(Qt::DisplayRole, QVariant(tr("Inactive") + " (0)"));
inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.png")); inactive->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filterinactive.png"));
// SIGNAL/SLOT // SIGNAL/SLOT
connect(statusFilters, SIGNAL(currentRowChanged(int)), transferList, SLOT(applyStatusFilter(int))); connect(statusFilters, SIGNAL(currentRowChanged(int)), transferList, SLOT(applyStatusFilter(int)));
@ -232,24 +244,28 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
connect(labelFilters, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showLabelMenu(QPoint))); connect(labelFilters, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showLabelMenu(QPoint)));
} }
TransferListFiltersWidget::~TransferListFiltersWidget() { TransferListFiltersWidget::~TransferListFiltersWidget()
{
saveSettings(); saveSettings();
delete statusFilters; delete statusFilters;
delete labelFilters; delete labelFilters;
delete vLayout; delete vLayout;
} }
StatusFiltersWidget* TransferListFiltersWidget::getStatusFilters() const { StatusFiltersWidget* TransferListFiltersWidget::getStatusFilters() const
{
return statusFilters; return statusFilters;
} }
void TransferListFiltersWidget::saveSettings() const { void TransferListFiltersWidget::saveSettings() const
{
Preferences* const pref = Preferences::instance(); Preferences* const pref = Preferences::instance();
pref->setTransSelFilter(statusFilters->currentRow()); pref->setTransSelFilter(statusFilters->currentRow());
pref->setTorrentLabels(customLabels.keys()); pref->setTorrentLabels(customLabels.keys());
} }
void TransferListFiltersWidget::loadSettings() { void TransferListFiltersWidget::loadSettings()
{
statusFilters->setCurrentRow(Preferences::instance()->getTransSelFilter()); statusFilters->setCurrentRow(Preferences::instance()->getTransSelFilter());
const QStringList label_list = Preferences::instance()->getTorrentLabels(); const QStringList label_list = Preferences::instance()->getTorrentLabels();
foreach (const QString &label, label_list) { foreach (const QString &label, label_list) {
@ -262,7 +278,8 @@ void TransferListFiltersWidget::loadSettings() {
} }
} }
void TransferListFiltersWidget::updateTorrentNumbers() { void TransferListFiltersWidget::updateTorrentNumbers()
{
const TorrentStatusReport report = transferList->getSourceModel()->getTorrentStatusReport(); const TorrentStatusReport report = transferList->getSourceModel()->getTorrentStatusReport();
statusFilters->item(TorrentFilter::ALL)->setData(Qt::DisplayRole, QVariant(tr("All") + " (" + QString::number(report.nb_active + report.nb_inactive) + ")")); statusFilters->item(TorrentFilter::ALL)->setData(Qt::DisplayRole, QVariant(tr("All") + " (" + QString::number(report.nb_active + report.nb_inactive) + ")"));
statusFilters->item(TorrentFilter::DOWNLOADING)->setData(Qt::DisplayRole, QVariant(tr("Downloading") + " (" + QString::number(report.nb_downloading) + ")")); statusFilters->item(TorrentFilter::DOWNLOADING)->setData(Qt::DisplayRole, QVariant(tr("Downloading") + " (" + QString::number(report.nb_downloading) + ")"));
@ -273,16 +290,17 @@ void TransferListFiltersWidget::updateTorrentNumbers() {
statusFilters->item(TorrentFilter::INACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Inactive") + " (" + QString::number(report.nb_inactive) + ")")); statusFilters->item(TorrentFilter::INACTIVE)->setData(Qt::DisplayRole, QVariant(tr("Inactive") + " (" + QString::number(report.nb_inactive) + ")"));
} }
void TransferListFiltersWidget::torrentDropped(int row) { void TransferListFiltersWidget::torrentDropped(int row)
{
Q_ASSERT(row > 0); Q_ASSERT(row > 0);
if (row == 1) { if (row == 1)
transferList->setSelectionLabel(""); transferList->setSelectionLabel("");
} else { else
transferList->setSelectionLabel(labelFilters->labelFromRow(row)); transferList->setSelectionLabel(labelFilters->labelFromRow(row));
} }
}
void TransferListFiltersWidget::addLabel(QString& label) { void TransferListFiltersWidget::addLabel(QString& label)
{
label = fsutils::toValidFileSystemName(label.trimmed()); label = fsutils::toValidFileSystemName(label.trimmed());
if (label.isEmpty() || customLabels.contains(label)) return; if (label.isEmpty() || customLabels.contains(label)) return;
QListWidgetItem *newLabel = new QListWidgetItem(); QListWidgetItem *newLabel = new QListWidgetItem();
@ -293,7 +311,8 @@ void TransferListFiltersWidget::addLabel(QString& label) {
Preferences::instance()->addTorrentLabel(label); Preferences::instance()->addTorrentLabel(label);
} }
void TransferListFiltersWidget::showLabelMenu(QPoint) { void TransferListFiltersWidget::showLabelMenu(QPoint)
{
QMenu labelMenu(labelFilters); QMenu labelMenu(labelFilters);
QAction *addAct = labelMenu.addAction(IconProvider::instance()->getIcon("list-add"), tr("Add label...")); QAction *addAct = labelMenu.addAction(IconProvider::instance()->getIcon("list-add"), tr("Add label..."));
QAction *removeAct = 0; QAction *removeAct = 0;
@ -339,7 +358,8 @@ void TransferListFiltersWidget::showLabelMenu(QPoint) {
if (ok && !label.isEmpty()) { if (ok && !label.isEmpty()) {
if (fsutils::isValidFileSystemName(label)) { if (fsutils::isValidFileSystemName(label)) {
addLabel(label); addLabel(label);
} else { }
else {
QMessageBox::warning(this, tr("Invalid label name"), tr("Please don't use any special characters in the label name.")); QMessageBox::warning(this, tr("Invalid label name"), tr("Please don't use any special characters in the label name."));
invalid = true; invalid = true;
} }
@ -350,7 +370,8 @@ void TransferListFiltersWidget::showLabelMenu(QPoint) {
} }
} }
void TransferListFiltersWidget::removeSelectedLabel() { void TransferListFiltersWidget::removeSelectedLabel()
{
const int row = labelFilters->row(labelFilters->selectedItems().first()); const int row = labelFilters->row(labelFilters->selectedItems().first());
Q_ASSERT(row > 1); Q_ASSERT(row > 1);
const QString &label = labelFilters->labelFromRow(row); const QString &label = labelFilters->labelFromRow(row);
@ -367,13 +388,13 @@ void TransferListFiltersWidget::removeSelectedLabel() {
Preferences::instance()->removeTorrentLabel(label); Preferences::instance()->removeTorrentLabel(label);
} }
void TransferListFiltersWidget::removeUnusedLabels() { void TransferListFiltersWidget::removeUnusedLabels()
{
QStringList unusedLabels; QStringList unusedLabels;
QHash<QString, int>::const_iterator i; QHash<QString, int>::const_iterator i;
for (i = customLabels.begin(); i != customLabels.end(); ++i) { for (i = customLabels.begin(); i != customLabels.end(); ++i)
if (i.value() == 0) if (i.value() == 0)
unusedLabels << i.key(); unusedLabels << i.key();
}
foreach (const QString &label, unusedLabels) { foreach (const QString &label, unusedLabels) {
customLabels.remove(label); customLabels.remove(label);
delete labelFilters->takeItem(labelFilters->rowFromLabel(label)); delete labelFilters->takeItem(labelFilters->rowFromLabel(label));
@ -381,7 +402,8 @@ void TransferListFiltersWidget::removeUnusedLabels() {
} }
} }
void TransferListFiltersWidget::applyLabelFilter(int row) { void TransferListFiltersWidget::applyLabelFilter(int row)
{
switch (row) { switch (row) {
case 0: case 0:
transferList->applyLabelFilterAll(); transferList->applyLabelFilterAll();
@ -394,7 +416,8 @@ void TransferListFiltersWidget::applyLabelFilter(int row) {
} }
} }
void TransferListFiltersWidget::torrentChangedLabel(TorrentModelItem *torrentItem, QString old_label, QString new_label) { void TransferListFiltersWidget::torrentChangedLabel(TorrentModelItem *torrentItem, QString old_label, QString new_label)
{
Q_UNUSED(torrentItem); Q_UNUSED(torrentItem);
qDebug("Torrent label changed from %s to %s", qPrintable(old_label), qPrintable(new_label)); qDebug("Torrent label changed from %s to %s", qPrintable(old_label), qPrintable(new_label));
if (!old_label.isEmpty()) { if (!old_label.isEmpty()) {
@ -422,7 +445,8 @@ void TransferListFiltersWidget::torrentChangedLabel(TorrentModelItem *torrentIte
updateStickyLabelCounters(); updateStickyLabelCounters();
} }
void TransferListFiltersWidget::handleNewTorrent(TorrentModelItem* torrentItem) { void TransferListFiltersWidget::handleNewTorrent(TorrentModelItem* torrentItem)
{
QString label = torrentItem->data(TorrentModelItem::TR_LABEL).toString(); QString label = torrentItem->data(TorrentModelItem::TR_LABEL).toString();
qDebug("New torrent was added with label: %s", qPrintable(label)); qDebug("New torrent was added with label: %s", qPrintable(label));
if (!label.isEmpty()) { if (!label.isEmpty()) {
@ -449,7 +473,8 @@ void TransferListFiltersWidget::handleNewTorrent(TorrentModelItem* torrentItem)
updateStickyLabelCounters(); updateStickyLabelCounters();
} }
void TransferListFiltersWidget::torrentAboutToBeDeleted(TorrentModelItem* torrentItem) { void TransferListFiltersWidget::torrentAboutToBeDeleted(TorrentModelItem* torrentItem)
{
Q_ASSERT(torrentItem); Q_ASSERT(torrentItem);
QString label = torrentItem->data(TorrentModelItem::TR_LABEL).toString(); QString label = torrentItem->data(TorrentModelItem::TR_LABEL).toString();
if (!label.isEmpty()) { if (!label.isEmpty()) {
@ -469,7 +494,8 @@ void TransferListFiltersWidget::torrentAboutToBeDeleted(TorrentModelItem* torren
updateStickyLabelCounters(); updateStickyLabelCounters();
} }
void TransferListFiltersWidget::updateStickyLabelCounters() { void TransferListFiltersWidget::updateStickyLabelCounters()
{
labelFilters->item(0)->setText(tr("All labels") + " (" + QString::number(nb_torrents) + ")"); labelFilters->item(0)->setText(tr("All labels") + " (" + QString::number(nb_torrents) + ")");
labelFilters->item(1)->setText(tr("Unlabeled") + " (" + QString::number(nb_torrents - nb_labeled) + ")"); labelFilters->item(1)->setText(tr("Unlabeled") + " (" + QString::number(nb_torrents - nb_labeled) + ")");
} }

9
src/gui/transferlistfilterswidget.h
View file

@ -43,7 +43,8 @@ QT_END_NAMESPACE
class TransferListWidget; class TransferListWidget;
class TorrentModelItem; class TorrentModelItem;
class LabelFiltersList: public QListWidget { class LabelFiltersList: public QListWidget
{
Q_OBJECT Q_OBJECT
private: private:
@ -68,7 +69,8 @@ protected:
void setItemHover(bool hover); void setItemHover(bool hover);
}; };
class StatusFiltersWidget : public QListWidget { class StatusFiltersWidget: public QListWidget
{
Q_OBJECT Q_OBJECT
public: public:
@ -81,7 +83,8 @@ private:
bool m_shown; bool m_shown;
}; };
class TransferListFiltersWidget: public QFrame { class TransferListFiltersWidget: public QFrame
{
Q_OBJECT Q_OBJECT
private: private: