Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-07 22:02:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ported v0.5.0 commits 2561,2562 and 2574 to trunk

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-17 15:34:36 +00:00
parent 12a0f45625
commit f8d6590952
10 changed files with 134 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/TransfersDialog.cpp
View file

@ -383,7 +383,7 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
if(all_downloading)
contextMnu.addMenu( chunkMenu);
if(single)
{
if(info.downloadStatus == FT_STATE_PAUSED)
@ -400,16 +400,15 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
if(single)
{
if (addOpenFileOption)
contextMnu.addAction( openfileAct);
if (addOpenFileOption)
contextMnu.addAction( openfileAct);
#ifndef RS_RELEASE_VERSION
contextMnu.addAction( previewfileAct);
#endif
contextMnu.addAction( openfolderAct);
contextMnu.addAction( openfolderAct);
contextMnu.addAction( detailsfileAct);
contextMnu.addSeparator();
}
contextMnu.addAction( clearcompletedAct);
@ -774,6 +773,7 @@ void TransfersDialog::insertTransfers()
std::set<int> used_rows ;
if(info.downloadStatus != FT_STATE_COMPLETE)
for (pit = info.peers.begin(); pit != info.peers.end(); pit++)
{
QString peerName = getPeerName(pit->peerId);
@ -794,7 +794,7 @@ void TransfersDialog::insertTransfers()
default: status = tr(""); break;
}
double peerDlspeed = 0;
if ((uint32_t)pit->status == FT_STATE_DOWNLOADING && info.downloadStatus != FT_STATE_PAUSED)
if ((uint32_t)pit->status == FT_STATE_DOWNLOADING && info.downloadStatus != FT_STATE_PAUSED && info.downloadStatus != FT_STATE_COMPLETE)
peerDlspeed = pit->tfRate * 1024.0;
FileProgressInfo peerpinfo ;