From dcb130281e701b027d51ce74e85e48a299e26c74 Mon Sep 17 00:00:00 2001 From: joss17 Date: Thu, 18 Feb 2010 16:29:04 +0000 Subject: [PATCH] put back the source progress bar (availability bar) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2359 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/TransfersDialog.cpp | 16 ++++++++-------- retroshare-gui/src/gui/TransfersDialog.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index c2e2df1bb..74f4b8336 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -522,7 +522,7 @@ int TransfersDialog::addItem(const QString& symbol, const QString& name, const Q return row; } -bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status) +bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status, FileProgressInfo peerInfo) { QStandardItem *dlItem = DLListModel->item(row); if (!dlItem) return false; @@ -547,7 +547,7 @@ bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString& QStandardItem *i2 = new QStandardItem(); i2->setData(QVariant(QString()), Qt::DisplayRole); QStandardItem *i3 = new QStandardItem(); i3->setData(QVariant(QString()), Qt::DisplayRole); QStandardItem *i4 = new QStandardItem(); i4->setData(QVariant((double)dlspeed), Qt::DisplayRole); - QStandardItem *i5 = new QStandardItem(); i5->setData(QVariant(QString()), Qt::DisplayRole); + QStandardItem *i5 = new QStandardItem(); i5->setData(QVariant::fromValue(peerInfo), Qt::DisplayRole); QStandardItem *i6 = new QStandardItem(); i6->setData(QVariant(QString()), Qt::DisplayRole); QStandardItem *i7 = new QStandardItem(); i7->setData(QVariant((QString)status), Qt::DisplayRole); QStandardItem *i8 = new QStandardItem(); i8->setData(QVariant(QString()), Qt::DisplayRole); // blank field for priority @@ -773,13 +773,13 @@ void TransfersDialog::insertTransfers() { peerDlspeed = pit->tfRate * 1024.0; } -// FileProgressInfo peerpinfo ; -// peerpinfo.type = FileProgressInfo::DOWNLOAD_SOURCE ; -// peerpinfo.cmap = fcinfo.compressed_peer_availability_maps[pit->peerId]; -// peerpinfo.progress = 0.0 ; // we don't display completion for sources. -// peerpinfo.nb_chunks = peerpinfo.cmap._map.empty()?0:fcinfo.chunks.size(); + FileProgressInfo peerpinfo ; + peerpinfo.type = FileProgressInfo::DOWNLOAD_SOURCE ; + peerpinfo.cmap = fcinfo.compressed_peer_availability_maps[pit->peerId]; + peerpinfo.progress = 0.0 ; // we don't display completion for sources. + peerpinfo.nb_chunks = peerpinfo.cmap._map.empty()?0:fcinfo.chunks.size(); - addPeerToItem(addedRow, peerName, hashFileAndPeerId, peerDlspeed, status); + addPeerToItem(addedRow, peerName, hashFileAndPeerId, peerDlspeed, status, peerpinfo); } } diff --git a/retroshare-gui/src/gui/TransfersDialog.h b/retroshare-gui/src/gui/TransfersDialog.h index 8fb982668..e183b7e18 100644 --- a/retroshare-gui/src/gui/TransfersDialog.h +++ b/retroshare-gui/src/gui/TransfersDialog.h @@ -173,7 +173,7 @@ private: public slots: int addItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong size, const FileProgressInfo& pinfo, double dlspeed, const QString& sources, const QString& status, const QString& priority, qlonglong completed, qlonglong remaining); - bool addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status); + bool addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status, FileProgressInfo peerInfo); void delItem(int row); int addUploadItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong size, const FileProgressInfo& pinfo, double dlspeed, const QString& sources, const QString& status, qlonglong completed, qlonglong remaining);