d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-10 23:07:59 +00:00
Code Issues Projects Releases Wiki Activity

- Fixed ETA display

Browse Source
This commit is contained in:
Christophe Dumez 2007-10-19 20:38:00 +00:00
parent 138af31ef9
commit 265a8cada8
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -64,4 +64,5 @@ rc5->rc6 changelog:
- BUGFIX: Fixed folders progress calculation in torrent properties - BUGFIX: Fixed folders progress calculation in torrent properties
- BUGFIX: Fixed deletion of subfolders when deleting torrents from hard drive - BUGFIX: Fixed deletion of subfolders when deleting torrents from hard drive
- BUGFIX: Remember scan directory in program preferences now - BUGFIX: Remember scan directory in program preferences now
- BUGFIX: Fixed ETA display (sometimes displayed < 1min for no reason)
- I18N: Fixed swedish, French, Spanish translations - I18N: Fixed swedish, French, Spanish translations

47
src/misc.h
View File

@ -298,37 +298,28 @@ class misc : public QObject{
// Take a number of seconds and return an user-friendly // Take a number of seconds and return an user-friendly
// time duration like "1d 2h 10m". // time duration like "1d 2h 10m".
static QString userFriendlyDuration(qlonglong seconds) { static QString userFriendlyDuration(const long int seconds) {
if(seconds < 0 or seconds > 8640000) { if(seconds < 0) {
// We display unkown if seconds > 100 days
return tr("Unknown"); return tr("Unknown");
} }
int level = 0; if(seconds < 60) {
int days = int(seconds / 86400.); return tr("< 1m", "< 1 minute");
if(!days)
level = 1;
else
seconds -= days * 86400;
int hours = int(seconds / 3600.);
if(!hours)
level = 2;
else
seconds -= hours * 3600;
int minutes = int(seconds / 60.0);
if(!minutes)
level = 3;
else
seconds -= minutes * 60;
switch(level){
case 3:
return tr("< 1m", "< 1 minute");
case 2:
return tr("%1m","e.g: 10minutes").arg(QString::QString::fromUtf8(misc::toString(minutes).c_str()));
case 1:
return tr("%1h%2m", "e.g: 3hours 5minutes").arg(QString::fromUtf8(misc::toString(hours).c_str())).arg(QString::fromUtf8(misc::toString(minutes).c_str()));
default:
return tr("%1d%2h%3m", "e.g: 2days 10hours 2minutes").arg(QString::fromUtf8(misc::toString(days).c_str())).arg(QString::fromUtf8(misc::toString(hours).c_str())).arg(QString::fromUtf8(misc::toString(minutes).c_str()));
} }
int minutes = seconds / 60;
if(minutes < 60) {
return tr("%1m","e.g: 10minutes").arg(QString::QString::fromUtf8(misc::toString(minutes).c_str()));
}
int hours = minutes / 60;
minutes = minutes - hours*60;
if(hours < 24) {
return tr("%1h%2m", "e.g: 3hours 5minutes").arg(QString::fromUtf8(misc::toString(hours).c_str())).arg(QString::fromUtf8(misc::toString(minutes).c_str()));
}
int days = hours / 24;
hours = hours - days * 24;
if(days < 100) {
return tr("%1d%2h%3m", "e.g: 2days 10hours 2minutes").arg(QString::fromUtf8(misc::toString(days).c_str())).arg(QString::fromUtf8(misc::toString(hours).c_str())).arg(QString::fromUtf8(misc::toString(minutes).c_str()));
}
return tr("Unknown");
} }
}; };