d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8531 from Chocobo1/https

Browse Source 
Improve URL scheme handling
This commit is contained in:
Mike Tzou 2018-03-05 01:28:27 +08:00 committed by GitHub
commit b0781e820c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/advancedsettings.cpp
View File

@ -289,7 +289,7 @@ void AdvancedSettings::loadAdvancedSettings()
addRow(LIBTORRENT_HEADER, tr("libtorrent Section"), &labelLibtorrentLink); addRow(LIBTORRENT_HEADER, tr("libtorrent Section"), &labelLibtorrentLink);
item(LIBTORRENT_HEADER, PROPERTY)->setFont(boldFont); item(LIBTORRENT_HEADER, PROPERTY)->setFont(boldFont);
labelLibtorrentLink.setText(QString("<a href=\"%1\">%2</a>").arg("http://www.libtorrent.org/reference.html").arg(tr("Open documentation"))); labelLibtorrentLink.setText(QString("<a href=\"%1\">%2</a>").arg("https://www.libtorrent.org/reference.html").arg(tr("Open documentation")));
labelLibtorrentLink.setOpenExternalLinks(true); labelLibtorrentLink.setOpenExternalLinks(true);
// Disk write cache // Disk write cache
spin_cache.setMinimum(-1); spin_cache.setMinimum(-1);

16
src/gui/transferlistfilterswidget.cpp
View File

@ -59,7 +59,19 @@
#include "transferlistwidget.h" #include "transferlistwidget.h"
#include "utils.h" #include "utils.h"
const QLatin1String GOOGLE_FAVICON_URL("https://www.google.com/s2/favicons?domain="); namespace
{
QString getScheme(const QString &tracker)
{
const QUrl url {tracker};
QString scheme = url.scheme();
if (scheme.isEmpty())
scheme = "http";
return scheme;
}
const QLatin1String GOOGLE_FAVICON_URL("https://www.google.com/s2/favicons?domain=");
}
FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList) FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList)
: QListWidget(parent) : QListWidget(parent)
@ -237,7 +249,7 @@ void TrackerFiltersList::addItem(const QString &tracker, const QString &hash)
trackerItem = new QListWidgetItem(); trackerItem = new QListWidgetItem();
trackerItem->setData(Qt::DecorationRole, GuiIconProvider::instance()->getIcon("network-server")); trackerItem->setData(Qt::DecorationRole, GuiIconProvider::instance()->getIcon("network-server"));
downloadFavicon(QString("http://%1/favicon.ico").arg(host)); downloadFavicon(QString("%1://%2/favicon.ico").arg(getScheme(tracker), host));
} }
if (!trackerItem) return; if (!trackerItem) return;