Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved total file size and a small bug with a comma in TB string of file size 2 CLEANED CODE

Browse Source
This commit is contained in:
felisucoibi 2016-11-16 11:03:02 +01:00
parent e3d832cfd1
commit ddff9f5358
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
retroshare-gui/src/gui/RemoteDirModel.cpp
View File

@ -391,34 +391,46 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
switch(coln)
{
case 0: {
SharedDirStats stats ;
QString res ;
SharedDirStats stats ;
QString res ;
if(RemoteMode)
{
res = QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
rsFiles->getSharedDirStatistics(details.id,stats) ;
if(RemoteMode)
{
res = QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
}
else
{
res = tr("My files");
}
return res ;
}
else
{
res = tr("My files");
rsFiles->getSharedDirStatistics(rsPeers->getOwnId(),stats) ;
}
case 1: {
SharedDirStats stats ;
QString res ;
if(stats.total_number_of_files > 0)
res += " - " + QString::number(stats.total_number_of_files) + " files, " + misc::friendlyUnit(stats.total_shared_size) ;
if(RemoteMode)
{
//res = QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
rsFiles->getSharedDirStatistics(details.id,stats) ;
}
else
{
//res = tr("My files");
rsFiles->getSharedDirStatistics(rsPeers->getOwnId(),stats) ;
}
return res ;
}
if(stats.total_number_of_files > 0)
res += QString::number(stats.total_number_of_files) + " files, " + misc::friendlyUnit(stats.total_shared_size) ;
case 1:
return QString() ;
case 2: if(!isNewerThanEpoque(details.max_mtime))
return QString();
else
return misc::timeRelativeToNow(details.max_mtime);
return res ;
}
case 2: if(!isNewerThanEpoque(details.max_mtime))
return QString();
default:
else
return misc::timeRelativeToNow(details.max_mtime);
default:
return QString() ;
}
}

2
retroshare-gui/src/util/misc.cpp
View File

@ -37,7 +37,7 @@ QString misc::friendlyUnit(float val)
if(val < 0) {
return tr("Unknown", "Unknown (size)");
}
const QString units[5] = {tr(" B", "bytes"), tr(" KB", "kilobytes (1024 bytes)"), tr(" MB", "megabytes (1024 kilobytes)"), tr(" GB", "gigabytes (1024 megabytes)"), tr(" TB,", "terabytes (1024 gigabytes)") };
const QString units[5] = {tr(" B", "bytes"), tr(" KB", "kilobytes (1024 bytes)"), tr(" MB", "megabytes (1024 kilobytes)"), tr(" GB", "gigabytes (1024 megabytes)"), tr(" TB", "terabytes (1024 gigabytes)") };
for(unsigned int i=0; i<5; ++i) {
if (val < 1024.) {
return QString(QByteArray::number(val, 'f', 1)) + units[i];