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

Feat: Add column that displays the percent of selected data from a torrent.

Browse source
This commit is contained in:
Stiliyan Tonev (Bark) 2025-01-09 11:40:32 +02:00
commit ae74a1b914
5 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/transferlistmodel.cpp
View file

@ -194,6 +194,7 @@ QVariant TransferListModel::headerData(const int section, const Qt::Orientation
case TR_INFOHASH_V2: return tr("Info Hash v2", "i.e: torrent info hash v2"); case TR_INFOHASH_V2: return tr("Info Hash v2", "i.e: torrent info hash v2");
case TR_REANNOUNCE: return tr("Reannounce In", "Indicates the time until next trackers reannounce"); case TR_REANNOUNCE: return tr("Reannounce In", "Indicates the time until next trackers reannounce");
case TR_PRIVATE: return tr("Private", "Flags private torrents"); case TR_PRIVATE: return tr("Private", "Flags private torrents");
case TR_PERCENT_SELECTED: return tr("% Selected", "Percentage of torrent selected");
default: return {}; default: return {};
} }
} }
@ -443,8 +444,9 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
return reannounceString(torrent->nextAnnounce()); return reannounceString(torrent->nextAnnounce());
case TR_PRIVATE: case TR_PRIVATE:
return privateString(torrent->isPrivate(), torrent->hasMetadata()); return privateString(torrent->isPrivate(), torrent->hasMetadata());
case TR_PERCENT_SELECTED:
return QString::number((torrent->wantedSize() * 100) / torrent->totalSize()) + u'%';
} }
return {}; return {};
} }
@ -526,6 +528,8 @@ QVariant TransferListModel::internalValue(const BitTorrent::Torrent *torrent, co
return torrent->nextAnnounce(); return torrent->nextAnnounce();
case TR_PRIVATE: case TR_PRIVATE:
return (torrent->hasMetadata() ? torrent->isPrivate() : QVariant()); return (torrent->hasMetadata() ? torrent->isPrivate() : QVariant());
case TR_PERCENT_SELECTED:
return (torrent->wantedSize() * 100) / torrent->totalSize();
} }
return {}; return {};

1
src/gui/transferlistmodel.h
View file

@ -87,6 +87,7 @@ public:
TR_INFOHASH_V2, TR_INFOHASH_V2,
TR_REANNOUNCE, TR_REANNOUNCE,
TR_PRIVATE, TR_PRIVATE,
TR_PERCENT_SELECTED,
NB_COLUMNS NB_COLUMNS
}; };

2
src/gui/transferlistsortmodel.cpp
View file

@ -208,6 +208,7 @@ int TransferListSortModel::compare(const QModelIndex &left, const QModelIndex &r
case TransferListModel::TR_RATIO: case TransferListModel::TR_RATIO:
case TransferListModel::TR_RATIO_LIMIT: case TransferListModel::TR_RATIO_LIMIT:
case TransferListModel::TR_POPULARITY: case TransferListModel::TR_POPULARITY:
case TransferListModel::TR_PERCENT_SELECTED:
return customCompare(leftValue.toReal(), rightValue.toReal()); return customCompare(leftValue.toReal(), rightValue.toReal());
case TransferListModel::TR_STATUS: case TransferListModel::TR_STATUS:
@ -241,7 +242,6 @@ int TransferListSortModel::compare(const QModelIndex &left, const QModelIndex &r
const auto totalR = right.data(TransferListModel::AdditionalUnderlyingDataRole).toInt(); const auto totalR = right.data(TransferListModel::AdditionalUnderlyingDataRole).toInt();
return threeWayCompare(totalL, totalR); return threeWayCompare(totalL, totalR);
} }
default: default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Missing comparison case"); Q_ASSERT_X(false, Q_FUNC_INFO, "Missing comparison case");
break; break;

1
src/gui/transferlistwidget.cpp
View file

@ -192,6 +192,7 @@ TransferListWidget::TransferListWidget(IGUIApplication *app, QWidget *parent)
setColumnHidden(TransferListModel::TR_TOTAL_SIZE, true); setColumnHidden(TransferListModel::TR_TOTAL_SIZE, true);
setColumnHidden(TransferListModel::TR_REANNOUNCE, true); setColumnHidden(TransferListModel::TR_REANNOUNCE, true);
setColumnHidden(TransferListModel::TR_PRIVATE, true); setColumnHidden(TransferListModel::TR_PRIVATE, true);
setColumnHidden(TransferListModel::TR_PERCENT_SELECTED, true);
} }
//Ensure that at least one column is visible at all times //Ensure that at least one column is visible at all times

1
src/webui/www/private/scripts/dynamicTable.js
View file

@ -1145,6 +1145,7 @@ window.qBittorrent.DynamicTable ??= (() => {
this.newColumn("infohash_v2", "", "QBT_TR(Info Hash v2)QBT_TR[CONTEXT=TransferListModel]", 100, false); this.newColumn("infohash_v2", "", "QBT_TR(Info Hash v2)QBT_TR[CONTEXT=TransferListModel]", 100, false);
this.newColumn("reannounce", "", "QBT_TR(Reannounce In)QBT_TR[CONTEXT=TransferListModel]", 100, false); this.newColumn("reannounce", "", "QBT_TR(Reannounce In)QBT_TR[CONTEXT=TransferListModel]", 100, false);
this.newColumn("private", "", "QBT_TR(Private)QBT_TR[CONTEXT=TransferListModel]", 100, false); this.newColumn("private", "", "QBT_TR(Private)QBT_TR[CONTEXT=TransferListModel]", 100, false);
this.newColumn("percent_selected", "", "QBT_TR(Percent Selected)QBT_TR[CONTEXT=TransferListModel]", 100, false);
this.columns["state_icon"].dataProperties[0] = "state"; this.columns["state_icon"].dataProperties[0] = "state";
this.columns["name"].dataProperties.push("state"); this.columns["name"].dataProperties.push("state");