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

Merge pull request #13495 from thalieht/peerlistZero

Browse source 
Fix regression of not hiding zero values in the peer list
This commit is contained in:
Mike Tzou 2020-10-13 03:27:38 +08:00 • committed by GitHub
commit 8276b6f468
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gui/properties/peerlistwidget.cpp
View file

@ -425,16 +425,21 @@ void PeerListWidget::updatePeer(const BitTorrent::TorrentHandle *torrent, const
} }
const int row = (*itemIter)->row(); const int row = (*itemIter)->row();
const bool hideValues = Preferences::instance()->getHideZeroValues();
setModelData(row, PeerListColumns::CONNECTION, peer.connectionType(), peer.connectionType()); setModelData(row, PeerListColumns::CONNECTION, peer.connectionType(), peer.connectionType());
setModelData(row, PeerListColumns::FLAGS, peer.flags(), peer.flags(), {}, peer.flagsDescription()); setModelData(row, PeerListColumns::FLAGS, peer.flags(), peer.flags(), {}, peer.flagsDescription());
const QString client = peer.client().toHtmlEscaped(); const QString client = peer.client().toHtmlEscaped();
setModelData(row, PeerListColumns::CLIENT, client, client); setModelData(row, PeerListColumns::CLIENT, client, client);
setModelData(row, PeerListColumns::PROGRESS, (Utils::String::fromDouble(peer.progress() * 100, 1) + '%'), peer.progress(), intDataTextAlignment); setModelData(row, PeerListColumns::PROGRESS, (Utils::String::fromDouble(peer.progress() * 100, 1) + '%'), peer.progress(), intDataTextAlignment);
setModelData(row, PeerListColumns::DOWN_SPEED, Utils::Misc::friendlyUnit(peer.payloadDownSpeed(), 1), peer.payloadDownSpeed(), intDataTextAlignment); const QString downSpeed = (hideValues && (peer.payloadDownSpeed() <= 0)) ? QString {} : Utils::Misc::friendlyUnit(peer.payloadDownSpeed(), true);
setModelData(row, PeerListColumns::UP_SPEED, Utils::Misc::friendlyUnit(peer.payloadUpSpeed(), true), peer.payloadUpSpeed(), intDataTextAlignment); setModelData(row, PeerListColumns::DOWN_SPEED, downSpeed, peer.payloadDownSpeed(), intDataTextAlignment);
setModelData(row, PeerListColumns::TOT_DOWN, Utils::Misc::friendlyUnit(peer.totalDownload()), peer.totalDownload(), intDataTextAlignment); const QString upSpeed = (hideValues && (peer.payloadUpSpeed() <= 0)) ? QString {} : Utils::Misc::friendlyUnit(peer.payloadUpSpeed(), true);
setModelData(row, PeerListColumns::TOT_UP, Utils::Misc::friendlyUnit(peer.totalUpload()), peer.totalUpload(), intDataTextAlignment); setModelData(row, PeerListColumns::UP_SPEED, upSpeed, peer.payloadUpSpeed(), intDataTextAlignment);
const QString totalDown = (hideValues && (peer.totalDownload() <= 0)) ? QString {} : Utils::Misc::friendlyUnit(peer.totalDownload());
setModelData(row, PeerListColumns::TOT_DOWN, totalDown, peer.totalDownload(), intDataTextAlignment);
const QString totalUp = (hideValues && (peer.totalUpload() <= 0)) ? QString {} : Utils::Misc::friendlyUnit(peer.totalUpload());
setModelData(row, PeerListColumns::TOT_UP, totalUp, peer.totalUpload(), intDataTextAlignment);
setModelData(row, PeerListColumns::RELEVANCE, (Utils::String::fromDouble(peer.relevance() * 100, 1) + '%'), peer.relevance(), intDataTextAlignment); setModelData(row, PeerListColumns::RELEVANCE, (Utils::String::fromDouble(peer.relevance() * 100, 1) + '%'), peer.relevance(), intDataTextAlignment);
const QStringList downloadingFiles {torrent->info().filesForPiece(peer.downloadingPieceIndex())}; const QStringList downloadingFiles {torrent->info().filesForPiece(peer.downloadingPieceIndex())};

10
src/gui/transferlistmodel.cpp
View file

@ -239,19 +239,19 @@ QString TransferListModel::displayValue(const BitTorrent::TorrentHandle *torrent
const auto availabilityString = [hideValues](const qreal value) -> QString const auto availabilityString = [hideValues](const qreal value) -> QString
{ {
return ((value <= 0) && hideValues) return (hideValues && (value <= 0))
? QString {} : Utils::String::fromDouble(value, 3); ? QString {} : Utils::String::fromDouble(value, 3);
}; };
const auto unitString = [hideValues](const qint64 value, const bool isSpeedUnit = false) -> QString const auto unitString = [hideValues](const qint64 value, const bool isSpeedUnit = false) -> QString
{ {
return ((value == 0) && hideValues) return (hideValues && (value == 0))
? QString {} : Utils::Misc::friendlyUnit(value, isSpeedUnit); ? QString {} : Utils::Misc::friendlyUnit(value, isSpeedUnit);
}; };
const auto limitString = [hideValues](const qint64 value) -> QString const auto limitString = [hideValues](const qint64 value) -> QString
{ {
if ((value == 0) && hideValues) if (hideValues && (value == 0))
return {}; return {};
return (value > 0) return (value > 0)
@ -261,14 +261,14 @@ QString TransferListModel::displayValue(const BitTorrent::TorrentHandle *torrent
const auto amountString = [hideValues](const qint64 value, const qint64 total) -> QString const auto amountString = [hideValues](const qint64 value, const qint64 total) -> QString
{ {
return ((value == 0) && (total == 0) && hideValues) return (hideValues && (value == 0) && (total == 0))
? QString {} ? QString {}
: QString::number(value) + " (" + QString::number(total) + ')'; : QString::number(value) + " (" + QString::number(total) + ')';
}; };
const auto ratioString = [hideValues](const qreal value) -> QString const auto ratioString = [hideValues](const qreal value) -> QString
{ {
if ((value <= 0) && hideValues) if (hideValues && (value <= 0))
return {}; return {};
return ((static_cast<int>(value) == -1) || (value > BitTorrent::TorrentHandle::MAX_RATIO)) return ((static_cast<int>(value) == -1) || (value > BitTorrent::TorrentHandle::MAX_RATIO))