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

Merge pull request #13738 from Chocobo1/fix

Browse Source 
Don't use deprecated torrent state "allocating"
This commit is contained in:
Mike Tzou 2020-11-12 18:19:25 +08:00 committed by GitHub
commit e60b91b5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/base/bittorrent/torrenthandle.h
View File

@ -62,7 +62,6 @@ namespace BitTorrent
ForcedDownloading, ForcedDownloading,
Downloading, Downloading,
DownloadingMetadata, DownloadingMetadata,
Allocating,
StalledDownloading, StalledDownloading,
ForcedUploading, ForcedUploading,

3
src/base/bittorrent/torrenthandleimpl.cpp
View File

@ -722,9 +722,6 @@ void TorrentHandleImpl::updateState()
if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) { if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) {
m_state = TorrentState::CheckingResumeData; m_state = TorrentState::CheckingResumeData;
} }
else if (m_nativeStatus.state == lt::torrent_status::allocating) {
m_state = TorrentState::Allocating;
}
else if (isMoveInProgress()) { else if (isMoveInProgress()) {
m_state = TorrentState::Moving; m_state = TorrentState::Moving;
} }

4
src/gui/transferlistmodel.cpp
View File

@ -76,7 +76,6 @@ namespace
{BitTorrent::TorrentState::StalledDownloading, QLatin1String("TransferList.StalledDownloading")}, {BitTorrent::TorrentState::StalledDownloading, QLatin1String("TransferList.StalledDownloading")},
{BitTorrent::TorrentState::DownloadingMetadata, QLatin1String("TransferList.DownloadingMetadata")}, {BitTorrent::TorrentState::DownloadingMetadata, QLatin1String("TransferList.DownloadingMetadata")},
{BitTorrent::TorrentState::ForcedDownloading, QLatin1String("TransferList.ForcedDownloading")}, {BitTorrent::TorrentState::ForcedDownloading, QLatin1String("TransferList.ForcedDownloading")},
{BitTorrent::TorrentState::Allocating, QLatin1String("TransferList.Allocating")},
{BitTorrent::TorrentState::Uploading, QLatin1String("TransferList.Uploading")}, {BitTorrent::TorrentState::Uploading, QLatin1String("TransferList.Uploading")},
{BitTorrent::TorrentState::StalledUploading, QLatin1String("TransferList.StalledUploading")}, {BitTorrent::TorrentState::StalledUploading, QLatin1String("TransferList.StalledUploading")},
{BitTorrent::TorrentState::ForcedUploading, QLatin1String("TransferList.ForcedUploading")}, {BitTorrent::TorrentState::ForcedUploading, QLatin1String("TransferList.ForcedUploading")},
@ -111,7 +110,6 @@ TransferListModel::TransferListModel(QObject *parent)
{BitTorrent::TorrentState::StalledDownloading, tr("Stalled", "Torrent is waiting for download to begin")}, {BitTorrent::TorrentState::StalledDownloading, tr("Stalled", "Torrent is waiting for download to begin")},
{BitTorrent::TorrentState::DownloadingMetadata, tr("Downloading metadata", "Used when loading a magnet link")}, {BitTorrent::TorrentState::DownloadingMetadata, tr("Downloading metadata", "Used when loading a magnet link")},
{BitTorrent::TorrentState::ForcedDownloading, tr("[F] Downloading", "Used when the torrent is forced started. You probably shouldn't translate the F.")}, {BitTorrent::TorrentState::ForcedDownloading, tr("[F] Downloading", "Used when the torrent is forced started. You probably shouldn't translate the F.")},
{BitTorrent::TorrentState::Allocating, tr("Allocating", "qBittorrent is allocating the files on disk")},
{BitTorrent::TorrentState::Uploading, tr("Seeding", "Torrent is complete and in upload-only mode")}, {BitTorrent::TorrentState::Uploading, tr("Seeding", "Torrent is complete and in upload-only mode")},
{BitTorrent::TorrentState::StalledUploading, tr("Seeding", "Torrent is complete and in upload-only mode")}, {BitTorrent::TorrentState::StalledUploading, tr("Seeding", "Torrent is complete and in upload-only mode")},
{BitTorrent::TorrentState::ForcedUploading, tr("[F] Seeding", "Used when the torrent is forced started. You probably shouldn't translate the F.")}, {BitTorrent::TorrentState::ForcedUploading, tr("[F] Seeding", "Used when the torrent is forced started. You probably shouldn't translate the F.")},
@ -641,7 +639,6 @@ QIcon getIconByState(const BitTorrent::TorrentState state)
case BitTorrent::TorrentState::ForcedDownloading: case BitTorrent::TorrentState::ForcedDownloading:
case BitTorrent::TorrentState::DownloadingMetadata: case BitTorrent::TorrentState::DownloadingMetadata:
return getDownloadingIcon(); return getDownloadingIcon();
case BitTorrent::TorrentState::Allocating:
case BitTorrent::TorrentState::StalledDownloading: case BitTorrent::TorrentState::StalledDownloading:
return getStalledDownloadingIcon(); return getStalledDownloadingIcon();
case BitTorrent::TorrentState::StalledUploading: case BitTorrent::TorrentState::StalledUploading:
@ -684,7 +681,6 @@ QColor getDefaultColorByState(const BitTorrent::TorrentState state)
return {34, 139, 34}; // Forest Green return {34, 139, 34}; // Forest Green
else else
return {50, 205, 50}; // Lime Green return {50, 205, 50}; // Lime Green
case BitTorrent::TorrentState::Allocating:
case BitTorrent::TorrentState::StalledDownloading: case BitTorrent::TorrentState::StalledDownloading:
case BitTorrent::TorrentState::StalledUploading: case BitTorrent::TorrentState::StalledUploading:
if (!dark) if (!dark)

2
src/webui/api/serialize/serialize_torrent.cpp
View File

@ -56,8 +56,6 @@ namespace
return QLatin1String("checkingUP"); return QLatin1String("checkingUP");
case BitTorrent::TorrentState::ForcedUploading: case BitTorrent::TorrentState::ForcedUploading:
return QLatin1String("forcedUP"); return QLatin1String("forcedUP");
case BitTorrent::TorrentState::Allocating:
return QLatin1String("allocating");
case BitTorrent::TorrentState::Downloading: case BitTorrent::TorrentState::Downloading:
return QLatin1String("downloading"); return QLatin1String("downloading");
case BitTorrent::TorrentState::DownloadingMetadata: case BitTorrent::TorrentState::DownloadingMetadata:

6
src/webui/www/private/scripts/dynamicTable.js
View File

@ -871,9 +871,6 @@ window.qBittorrent.DynamicTable = (function() {
case "metaDL": case "metaDL":
state = "downloading"; state = "downloading";
break; break;
case "allocating":
state = "stalledDL";
break;
case "forcedUP": case "forcedUP":
state = "uploading"; state = "uploading";
break; break;
@ -939,9 +936,6 @@ window.qBittorrent.DynamicTable = (function() {
case "forcedDL": case "forcedDL":
status = "QBT_TR([F] Downloading)QBT_TR[CONTEXT=TransferListDelegate]"; status = "QBT_TR([F] Downloading)QBT_TR[CONTEXT=TransferListDelegate]";
break; break;
case "allocating":
status = "QBT_TR(Allocating)QBT_TR[CONTEXT=TransferListDelegate]";
break;
case "uploading": case "uploading":
case "stalledUP": case "stalledUP":
status = "QBT_TR(Seeding)QBT_TR[CONTEXT=TransferListDelegate]"; status = "QBT_TR(Seeding)QBT_TR[CONTEXT=TransferListDelegate]";