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

trunk/branch uniformisation

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-15 16:26:41 +00:00
parent fc7661f25d
commit 928a06c17e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/turtle/p3turtle.cc
View File

@ -1687,7 +1687,7 @@ void p3turtle::monitorFileTunnels(const std::string& name,const std::string& fil
// First, check if the hash is tagged for removal (there's a delay) // First, check if the hash is tagged for removal (there's a delay)
for(uint i=0;i<_hashes_to_remove.size();++i) for(uint32_t i=0;i<_hashes_to_remove.size();++i)
if(_hashes_to_remove[i] == file_hash) if(_hashes_to_remove[i] == file_hash)
{ {
_hashes_to_remove[i] = _hashes_to_remove.back() ; _hashes_to_remove[i] = _hashes_to_remove.back() ;

1
retroshare-gui/src/gui/SearchDialog.cpp
View File

@ -1210,7 +1210,6 @@ void SearchDialog::copysearchLink()
RetroShareLink link(fname, fsize, fhash); RetroShareLink link(fname, fsize, fhash);
std::cerr << "new link added to clipboard: " << link.toString().toStdString() << std::endl ;
if(link.valid()) if(link.valid())
urls.push_back(link) ; urls.push_back(link) ;
} }

14
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -362,7 +362,7 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
for (int i = 0; i < lst.count (); i++) for (int i = 0; i < lst.count (); i++)
{ {
if ( lst[i].column() == 0 && info.downloadStatus == FT_STATE_WAITING ) if ( lst[i].column() == 0 && info.downloadStatus == FT_STATE_PAUSED )
all_downld = false ; all_downld = false ;
if ( lst[i].column() == 0 && info.downloadStatus == FT_STATE_DOWNLOADING ) if ( lst[i].column() == 0 && info.downloadStatus == FT_STATE_DOWNLOADING )
all_paused = false ; all_paused = false ;
@ -406,6 +406,11 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
contextMnu.addAction( openfolderAct); contextMnu.addAction( openfolderAct);
contextMnu.addAction( detailsfileAct); contextMnu.addAction( detailsfileAct);
contextMnu.addSeparator(); contextMnu.addSeparator();
if(info.downloadStatus == FT_STATE_PAUSED)
contextMnu.addAction( resumeAct);
else if(info.downloadStatus != FT_STATE_COMPLETE)
contextMnu.addAction( pauseAct);
} }
contextMnu.addAction( clearcompletedAct); contextMnu.addAction( clearcompletedAct);
@ -672,7 +677,7 @@ void TransfersDialog::insertTransfers()
QString fileName = QString::fromUtf8(info.fname.c_str()); QString fileName = QString::fromUtf8(info.fname.c_str());
QString fileHash = QString::fromStdString(info.hash); QString fileHash = QString::fromStdString(info.hash);
qlonglong fileSize = info.size; qlonglong fileSize = info.size;
double fileDlspeed = info.tfRate * 1024.0; double fileDlspeed = (info.downloadStatus==FT_STATE_PAUSED)?0.0:(info.tfRate * 1024.0);
/* get the sources (number of online peers) */ /* get the sources (number of online peers) */
int online = 0; int online = 0;
@ -692,6 +697,7 @@ void TransfersDialog::insertTransfers()
case FT_STATE_DOWNLOADING: status = tr("Downloading"); break; case FT_STATE_DOWNLOADING: status = tr("Downloading"); break;
case FT_STATE_COMPLETE: status = tr("Complete"); break; case FT_STATE_COMPLETE: status = tr("Complete"); break;
case FT_STATE_QUEUED: status = tr("Queued"); break; case FT_STATE_QUEUED: status = tr("Queued"); break;
case FT_STATE_PAUSED: status = tr("Paused"); break;
default: status = tr("Unknown"); break; default: status = tr("Unknown"); break;
} }
@ -753,10 +759,8 @@ void TransfersDialog::insertTransfers()
default: status = tr(""); break; default: status = tr(""); break;
} }
double peerDlspeed = 0; double peerDlspeed = 0;
if ((uint32_t)pit->status == FT_STATE_DOWNLOADING) if ((uint32_t)pit->status == FT_STATE_DOWNLOADING && info.downloadStatus != FT_STATE_PAUSED)
{
peerDlspeed = pit->tfRate * 1024.0; peerDlspeed = pit->tfRate * 1024.0;
}
FileProgressInfo peerpinfo ; FileProgressInfo peerpinfo ;
peerpinfo.cmap = fcinfo.compressed_peer_availability_maps[pit->peerId]; peerpinfo.cmap = fcinfo.compressed_peer_availability_maps[pit->peerId];