mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

made the code a little cleaner

Browse source
This commit is contained in:
Eran 2014-05-20 16:56:39 +03:00
parent 3777074e84
commit fae3e46a59
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mirall/accountsettings.cpp
View file

@ -616,7 +616,7 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf
QString s1 = Utility::octetsToString( curItemProgress ); QString s1 = Utility::octetsToString( curItemProgress );
QString s2 = Utility::octetsToString( curItem._size ); QString s2 = Utility::octetsToString( curItem._size );
//: Example text: "uploading foobar.png (1MB of 2MB)" //: Example text: "uploading foobar.png (1MB of 2MB)"
fileProgressString = tr("%1 %2 (%3 of %4) time left %5 , at a rate of %6") fileProgressString = tr("%1 %2 (%3 of %4) time left %5 at a rate of %6")
.arg(kindString, itemFileName, s1, s2, .arg(kindString, itemFileName, s1, s2,
Utility::timeToDescriptiveString(progress.getFileEstimate(curItem).getEtaEstimate()), Utility::timeToDescriptiveString(progress.getFileEstimate(curItem).getEtaEstimate()),
Utility::octetsToString(progress.getFileEstimate(curItem).getEstimatedBandwidth()) ); Utility::octetsToString(progress.getFileEstimate(curItem).getEstimatedBandwidth()) );

26
src/mirall/utility.cpp
View file

@ -465,33 +465,33 @@ QString Utility::timeToDescriptiveString(quint64 msecs)
return timeToDescriptiveString(timeMapping, msecs, 1); return timeToDescriptiveString(timeMapping, msecs, 2);
} }
QString Utility::timeToDescriptiveString(QList<QPair<QString,quint32> > &timeMapping, quint64 msecs, quint8 precision) QString Utility::timeToDescriptiveString(QList<QPair<QString,quint32> > &timeMapping, quint64 msecs, quint8 precision)
{ {
quint64 secs = msecs / 1000; quint64 secs = msecs / 1000;
QString retStr = "0 seconds"; // default value in case theres no actual time in msecs. QString retStr = "0 seconds"; // default value in case theres no actual time in msecs.
qint64 values[6]; QList<quint64> values;
int idx = 0; bool timeStartFound = false;
for(QList<QPair<QString,quint32> >::Iterator itr = timeMapping.begin(); itr != timeMapping.end() && idx <= precision; itr++) { for(QList<QPair<QString,quint32> >::Iterator itr = timeMapping.begin(); itr != timeMapping.end() && precision > 0; itr++) {
quint64 result = secs / itr->second; quint64 result = secs / itr->second;
if(idx == 0) { if(!timeStartFound) {
if(result == 0 ) { if(result == 0 ) {
continue; continue;
} else { }
retStr = itr->first; retStr = QString(" ").append(itr->first);
retStr.prepend(" "); timeStartFound= true;
}
} }
secs -= result * itr->second; secs -= result * itr->second;
values[idx++] = result; values.append(result);
precision--;
} }
for(idx--; idx >= 0; idx--) { for(QList<quint64>::Iterator itr = values.end()-1; itr >= values.begin(); itr--) {
retStr = retStr.prepend("%1").arg(values[idx], 2, 10, QChar('0')); retStr = retStr.prepend("%1").arg(itr.i->t(), 2, 10, QChar('0'));
if(0 < idx) { if(itr > values.begin()) {
retStr.prepend(":"); retStr.prepend(":");
} }
} }