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

Merge pull request #10567 from Chocobo1/backport

Browse source 
Backport #10445 to v4_1_x
This commit is contained in:
sledgehammer999 2019-05-05 19:52:14 +03:00 • committed by GitHub
commit 1d9dcde99b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/mainwindow.cpp
View file

@ -246,8 +246,7 @@ MainWindow::MainWindow(QWidget *parent)
m_transferListWidget = new TransferListWidget(hSplitter, this);
// transferList->setStyleSheet("QTreeView {border: none;}"); // borderless
m_propertiesWidget = new PropertiesWidget(hSplitter, this, m_transferListWidget);
m_transferListFiltersWidget = new TransferListFiltersWidget(m_splitter, m_transferListWidget);
m_transferListFiltersWidget->setDownloadTrackerFavicon(isDownloadTrackerFavicon());
m_transferListFiltersWidget = new TransferListFiltersWidget(m_splitter, m_transferListWidget, isDownloadTrackerFavicon());
hSplitter->addWidget(m_transferListWidget);
hSplitter->addWidget(m_propertiesWidget);
m_splitter->addWidget(m_transferListFiltersWidget);
@ -526,7 +525,7 @@ void MainWindow::setTorrentAddedNotificationsEnabled(bool value)
bool MainWindow::isDownloadTrackerFavicon() const
{
return settings()->loadValue(KEY_DOWNLOAD_TRACKER_FAVICON, true).toBool();
return settings()->loadValue(KEY_DOWNLOAD_TRACKER_FAVICON, false).toBool();
}
void MainWindow::setDownloadTrackerFavicon(bool value)

8
src/gui/transferlistfilterswidget.cpp
View file

@ -193,10 +193,10 @@ void StatusFilterWidget::handleNewTorrent(BitTorrent::TorrentHandle *const) {}
void StatusFilterWidget::torrentAboutToBeDeleted(BitTorrent::TorrentHandle *const) {}
TrackerFiltersList::TrackerFiltersList(QWidget *parent, TransferListWidget *transferList)
TrackerFiltersList::TrackerFiltersList(QWidget *parent, TransferListWidget *transferList, const bool downloadFavicon)
: BaseFilterWidget(parent, transferList)
, m_totalTorrents(0)
, m_downloadTrackerFavicon(true)
, m_downloadTrackerFavicon(downloadFavicon)
{
QListWidgetItem *allTrackers = new QListWidgetItem(this);
allTrackers->setData(Qt::DisplayRole, QVariant(tr("All (0)", "this is for the tracker filter")));
@ -551,7 +551,7 @@ QStringList TrackerFiltersList::getHashes(int row)
return m_trackers.value(trackerFromRow(row));
}
TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList)
TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList, const bool downloadFavicon)
: QFrame(parent)
, m_transferList(transferList)
{
@ -631,7 +631,7 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
trackerLabel->setFont(font);
frameLayout->addWidget(trackerLabel);
m_trackerFilters = new TrackerFiltersList(this, transferList);
m_trackerFilters = new TrackerFiltersList(this, transferList, downloadFavicon);
frameLayout->addWidget(m_trackerFilters);
connect(statusLabel, &QCheckBox::toggled, statusFilters, &StatusFilterWidget::toggleFilter);

4
src/gui/transferlistfilterswidget.h
View file

@ -90,7 +90,7 @@ class TrackerFiltersList : public BaseFilterWidget
Q_OBJECT
public:
TrackerFiltersList(QWidget *parent, TransferListWidget *transferList);
TrackerFiltersList(QWidget *parent, TransferListWidget *transferList, bool downloadFavicon);
~TrackerFiltersList() override;
// Redefine addItem() to make sure the list stays sorted
@ -137,7 +137,7 @@ class TransferListFiltersWidget : public QFrame
Q_OBJECT
public:
TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList);
TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList, bool downloadFavicon);
void setDownloadTrackerFavicon(bool value);
public slots: