mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-25 10:46:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix status string for errored torrents.

Browse source
This commit is contained in:
sledgehammer999 2015-11-11 00:32:49 +02:00
parent 5b232528cc
commit bf0319f7b2
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/bittorrent/torrenthandle.cpp
View file

@ -80,6 +80,8 @@ QString TorrentState::toString() const
switch (m_value) {
case Error:
return QLatin1String("error");
case MissingFiles:
return QLatin1String("missingFiles");
case Uploading:
return QLatin1String("uploading");
case PausedUploading:
@ -625,6 +627,7 @@ bool TorrentHandle::isDownloading() const
|| m_state == TorrentState::PausedDownloading
|| m_state == TorrentState::QueuedDownloading
|| m_state == TorrentState::ForcedDownloading
|| m_state == TorrentState::MissingFiles
|| m_state == TorrentState::Error;
}
@ -723,7 +726,9 @@ TorrentState TorrentHandle::state() const
void TorrentHandle::updateState()
{
if (isPaused()) {
if (hasError() || hasMissingFiles())
if (hasMissingFiles())
m_state = TorrentState::MissingFiles;
else if (hasError())
m_state = TorrentState::Error;
else
m_state = isSeed() ? TorrentState::PausedUploading : TorrentState::PausedDownloading;

1
src/core/bittorrent/torrenthandle.h
View file

@ -139,6 +139,7 @@ namespace BitTorrent
PausedDownloading,
PausedUploading,
MissingFiles,
Error
};

2
src/gui/torrentmodel.cpp
View file

@ -342,6 +342,7 @@ QIcon getIconByState(BitTorrent::TorrentState state)
case BitTorrent::TorrentState::CheckingResumeData:
return getCheckingIcon();
case BitTorrent::TorrentState::Unknown:
case BitTorrent::TorrentState::MissingFiles:
case BitTorrent::TorrentState::Error:
return getErrorIcon();
default:
@ -384,6 +385,7 @@ QColor getColorByState(BitTorrent::TorrentState state)
else
return QColor(79, 148, 205); // Steel Blue 3
case BitTorrent::TorrentState::Error:
case BitTorrent::TorrentState::MissingFiles:
return QColor(255, 0, 0); // red
case BitTorrent::TorrentState::QueuedDownloading:
case BitTorrent::TorrentState::QueuedUploading:

5
src/gui/transferlistdelegate.cpp
View file

@ -135,9 +135,12 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
case BitTorrent::TorrentState::PausedUploading:
display = tr("Completed");
break;
case BitTorrent::TorrentState::Error:
case BitTorrent::TorrentState::MissingFiles:
display = tr("Missing Files");
break;
case BitTorrent::TorrentState::Error:
display = tr("Errored", "torrent status, the torrent has an error");
break;
default:
display = "";
}