diff --git a/src/libtremotesf b/src/libtremotesf index 970f7368..fd73a34d 160000 --- a/src/libtremotesf +++ b/src/libtremotesf @@ -1 +1 @@ -Subproject commit 970f73688da7b479cbbc0926a0962d76056da127 +Subproject commit fd73a34d67c84389db7779c75f82023e982ad2d5 diff --git a/src/tremotesf/ui/screens/mainwindow/torrentsmodel.cpp b/src/tremotesf/ui/screens/mainwindow/torrentsmodel.cpp index 1acf4fd6..618b3fa5 100644 --- a/src/tremotesf/ui/screens/mainwindow/torrentsmodel.cpp +++ b/src/tremotesf/ui/screens/mainwindow/torrentsmodel.cpp @@ -118,9 +118,13 @@ namespace tremotesf { case Column::QueuePosition: return torrent->data().queuePosition; case Column::Seeders: - return torrent->data().activeSeedersCount; + return torrent->data().totalSeedersFromTrackersCount; case Column::Leechers: - return torrent->data().activeLeechersCount; + return torrent->data().totalLeechersFromTrackersCount; + case Column::PeersSendingToUs: + return torrent->data().peersSendingToUsCount; + case Column::PeersGettingFromUs: + return torrent->data().peersGettingFromUsCount; case Column::DownloadSpeed: return Utils::formatByteSpeed(torrent->data().downloadSpeed); case Column::UploadSpeed: @@ -260,6 +264,10 @@ namespace tremotesf { return qApp->translate("tremotesf", "Seeders"); case Column::Leechers: return qApp->translate("tremotesf", "Leechers"); + case Column::PeersSendingToUs: + return qApp->translate("tremotesf", "Downloading to peers"); + case Column::PeersGettingFromUs: + return qApp->translate("tremotesf", "Uploading to peers"); case Column::DownloadSpeed: return qApp->translate("tremotesf", "Down Speed"); case Column::UploadSpeed: diff --git a/src/tremotesf/ui/screens/mainwindow/torrentsmodel.h b/src/tremotesf/ui/screens/mainwindow/torrentsmodel.h index ff1fab81..92ae8ab7 100644 --- a/src/tremotesf/ui/screens/mainwindow/torrentsmodel.h +++ b/src/tremotesf/ui/screens/mainwindow/torrentsmodel.h @@ -31,6 +31,8 @@ namespace tremotesf { QueuePosition, Seeders, Leechers, + PeersSendingToUs, + PeersGettingFromUs, DownloadSpeed, UploadSpeed, Eta, diff --git a/src/tremotesf/ui/screens/torrentproperties/torrentpropertiesdialog.cpp b/src/tremotesf/ui/screens/torrentproperties/torrentpropertiesdialog.cpp index 1d26da9a..f4754595 100644 --- a/src/tremotesf/ui/screens/torrentproperties/torrentpropertiesdialog.cpp +++ b/src/tremotesf/ui/screens/torrentproperties/torrentpropertiesdialog.cpp @@ -136,10 +136,23 @@ namespace tremotesf { activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "ETA:"), etaLabel); auto seedersLabel = new QLabel(this); activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Seeders:"), seedersLabel); - auto activeWebSeedersLabel = new QLabel(this); - activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Active web seeders:"), activeWebSeedersLabel); auto leechersLabel = new QLabel(this); activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Leechers:"), leechersLabel); + auto peersSendingToUsLabel = new QLabel(this); + activityGroupBoxLayout->addRow( + qApp->translate("tremotesf", "Peers we are downloading from:"), + peersSendingToUsLabel + ); + auto webSeedersSendingToUsLabel = new QLabel(this); + activityGroupBoxLayout->addRow( + qApp->translate("tremotesf", "Web seeders we are downloading from:"), + webSeedersSendingToUsLabel + ); + auto peersGettingFromUsLabel = new QLabel(this); + activityGroupBoxLayout->addRow( + qApp->translate("tremotesf", "Peers we are uploading to:"), + peersGettingFromUsLabel + ); auto lastActivityLabel = new QLabel(this); activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Last activity:"), lastActivityLabel); detailsTabLayout->addWidget(activityGroupBox); @@ -184,10 +197,12 @@ namespace tremotesf { uploadSpeedLabel->setText(Utils::formatByteSpeed(mTorrent->data().uploadSpeed)); etaLabel->setText(Utils::formatEta(mTorrent->data().eta)); - const QLocale locale; - seedersLabel->setText(locale.toString(mTorrent->data().activeSeedersCount)); - activeWebSeedersLabel->setText(locale.toString(mTorrent->data().activeWebSeedersCount)); - leechersLabel->setText(locale.toString(mTorrent->data().activeLeechersCount)); + const QLocale locale{}; + seedersLabel->setText(locale.toString(mTorrent->data().totalSeedersFromTrackersCount)); + leechersLabel->setText(locale.toString(mTorrent->data().totalLeechersFromTrackersCount)); + peersSendingToUsLabel->setText(locale.toString(mTorrent->data().peersSendingToUsCount)); + webSeedersSendingToUsLabel->setText(locale.toString(mTorrent->data().webSeedersSendingToUsCount)); + peersGettingFromUsLabel->setText(locale.toString(mTorrent->data().peersGettingFromUsCount)); lastActivityLabel->setText(mTorrent->data().activityDate.toLocalTime().toString());