Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed showing the filehash in hash column for the parent file only. The combined hash+tunnel id is used to give a unique id to each source, but should not be displayed

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-09-10 18:33:22 +00:00
parent 894c2d965e
commit 1af7d88d56
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View File

@ -991,7 +991,8 @@ int TransfersDialog::addItem(int row, const FileInfo &fileInfo, const std::map<s
DLListModel->setItem(row, COLUMN_PRIORITY, new PriorityItem(NULL)); DLListModel->setItem(row, COLUMN_PRIORITY, new PriorityItem(NULL));
DLListModel->setData(DLListModel->index(row, COLUMN_SIZE), QVariant((qlonglong) fileInfo.size)); DLListModel->setData(DLListModel->index(row, COLUMN_SIZE), QVariant((qlonglong) fileInfo.size));
DLListModel->setData(DLListModel->index(row, COLUMN_ID), fileHash); DLListModel->setData(DLListModel->index(row, COLUMN_ID), fileHash, Qt::DisplayRole);
DLListModel->setData(DLListModel->index(row, COLUMN_ID), fileHash, Qt::UserRole);
} }
QString fileName = QString::fromUtf8(fileInfo.fname.c_str()); QString fileName = QString::fromUtf8(fileInfo.fname.c_str());
@ -1073,7 +1074,7 @@ int TransfersDialog::addPeerToItem(QStandardItem *dlItem, const QString& name, c
QStandardItem *childId = NULL; QStandardItem *childId = NULL;
for (count = 0; (childId = dlItem->child(count, COLUMN_ID)) != NULL; ++count) { for (count = 0; (childId = dlItem->child(count, COLUMN_ID)) != NULL; ++count) {
if (childId->data(Qt::DisplayRole).toString() == coreID) { if (childId->data(Qt::UserRole).toString() == coreID) {
childRow = count; childRow = count;
break; break;
} }
@ -1114,7 +1115,8 @@ int TransfersDialog::addPeerToItem(QStandardItem *dlItem, const QString& name, c
iPriority->setData(QVariant(QString()), Qt::DisplayRole); // blank field for priority iPriority->setData(QVariant(QString()), Qt::DisplayRole); // blank field for priority
iRemaining->setData(QVariant(QString()), Qt::DisplayRole); iRemaining->setData(QVariant(QString()), Qt::DisplayRole);
iDownloadTime->setData(QVariant(QString()), Qt::DisplayRole); iDownloadTime->setData(QVariant(QString()), Qt::DisplayRole);
iID->setData(QVariant(coreID), Qt::DisplayRole); iID->setData(QVariant() , Qt::DisplayRole);
iID->setData(QVariant(coreID), Qt::UserRole);
items.append(iName); items.append(iName);
items.append(iSize); items.append(iSize);
@ -1240,7 +1242,7 @@ void TransfersDialog::insertTransfers()
std::set<std::string>::iterator hashIt; std::set<std::string>::iterator hashIt;
for (row = 0; row < rowCount; ) { for (row = 0; row < rowCount; ) {
std::string hash = DLListModel->item(row, COLUMN_ID)->data(Qt::DisplayRole).toString().toStdString(); std::string hash = DLListModel->item(row, COLUMN_ID)->data(Qt::UserRole).toString().toStdString();
hashIt = hashs.find(hash); hashIt = hashs.find(hash);
if (hashIt == hashs.end()) { if (hashIt == hashs.end()) {
@ -1576,6 +1578,7 @@ void TransfersDialog::getSelectedItems(std::set<std::string> *ids, std::set<int>
if (ids) { if (ids) {
QStandardItem *id = DLListModel->item(i, COLUMN_ID); QStandardItem *id = DLListModel->item(i, COLUMN_ID);
ids->insert(id->data(Qt::DisplayRole).toString().toStdString()); ids->insert(id->data(Qt::DisplayRole).toString().toStdString());
ids->insert(id->data(Qt::UserRole ).toString().toStdString());
} }
if (rows) { if (rows) {
rows->insert(i); rows->insert(i);
@ -1973,7 +1976,7 @@ QString TransfersDialog::getStatus(int row, QStandardItemModel *model)
QString TransfersDialog::getID(int row, QStandardItemModel *model) QString TransfersDialog::getID(int row, QStandardItemModel *model)
{ {
return model->data(model->index(row, COLUMN_ID), Qt::DisplayRole).toString().left(40); // gets only the "hash" part of the name return model->data(model->index(row, COLUMN_ID), Qt::UserRole).toString().left(40); // gets only the "hash" part of the name
} }
QString TransfersDialog::getPriority(int row, QStandardItemModel *model) QString TransfersDialog::getPriority(int row, QStandardItemModel *model)