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

Added two hidden columns in searchresultTableWidget to store the real size and srcId hash, so as to get the download menu work properly. Eventually, we should use a delegate to adapt the display correctly, while still being able to retrieve the usable information from the table

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2008-12-12 21:41:34 +00:00
parent 5a1757c5d9
commit e3514aaa3c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,9 @@
#define SR_HASH_COL 5 #define SR_HASH_COL 5
#define SR_SEARCH_ID_COL 6 #define SR_SEARCH_ID_COL 6
#define SR_UID_COL 7
#define SR_REALSIZE_COL 8
/* indicies for search summary item columns SS_ = Search Summary */ /* indicies for search summary item columns SS_ = Search Summary */
#define SS_TEXT_COL 0 #define SS_TEXT_COL 0
#define SS_COUNT_COL 1 #define SS_COUNT_COL 1
@ -124,6 +127,8 @@ SearchDialog::SearchDialog(QWidget *parent)
/* hide the Tree +/- */ /* hide the Tree +/- */
ui.searchResultWidget -> setRootIsDecorated( false ); ui.searchResultWidget -> setRootIsDecorated( false );
ui.searchResultWidget -> setColumnHidden( SR_UID_COL,true );
ui.searchResultWidget -> setColumnHidden( SR_REALSIZE_COL,true );
ui.searchSummaryWidget -> setRootIsDecorated( false ); ui.searchSummaryWidget -> setRootIsDecorated( false );
/* make it extended selection */ /* make it extended selection */
@ -243,10 +248,16 @@ void SearchDialog::download()
std::cerr << "SearchDialog::download() Calling File Request"; std::cerr << "SearchDialog::download() Calling File Request";
std::cerr << std::endl; std::cerr << std::endl;
std::list<std::string> srcIds; std::list<std::string> srcIds;
srcIds.push_back(item->text(SR_UID_COL).toStdString()) ;
rsFiles -> FileRequest((item->text(SR_NAME_COL)).toStdString(), rsFiles -> FileRequest((item->text(SR_NAME_COL)).toStdString(),
(item->text(SR_HASH_COL)).toStdString(), (item->text(SR_HASH_COL)).toStdString(),
(item->text(SR_SIZE_COL)).toInt(), (item->text(SR_REALSIZE_COL)).toInt(),
"", 0, srcIds); "", 0, srcIds);
std::cout << "isuing file request from search dialog: -" << (item->text(SR_NAME_COL)).toStdString() << "-" << (item->text(SR_HASH_COL)).toStdString() << "-" << (item->text(SR_REALSIZE_COL)).toInt() << "-ids=" ;
for(std::list<std::string>::const_iterator it(srcIds.begin());it!=srcIds.end();++it)
std::cout << *it << "-" << std::endl ;
} }
else else
{ {
@ -560,6 +571,7 @@ void SearchDialog::resultsToTree(std::string txt, std::list<FileDetail> results)
//QVariant * variant = new QVariant((qulonglong)it->size); //QVariant * variant = new QVariant((qulonglong)it->size);
//item->setText(SR_SIZE_COL, QString(variant->toString())); //item->setText(SR_SIZE_COL, QString(variant->toString()));
item->setText(SR_SIZE_COL, misc::friendlyUnit(it->size)); item->setText(SR_SIZE_COL, misc::friendlyUnit(it->size));
item->setText(SR_REALSIZE_COL, QString::number(it->size));
item->setTextAlignment( SR_SIZE_COL, Qt::AlignRight ); item->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
@ -569,11 +581,13 @@ void SearchDialog::resultsToTree(std::string txt, std::list<FileDetail> results)
if (it->id == "Local") if (it->id == "Local")
{ {
item->setText(SR_ID_COL, QString::fromStdString(it->id)); item->setText(SR_ID_COL, QString::fromStdString(it->id));
item->setText(SR_UID_COL, QString::fromStdString(rsPeers->getOwnId()));
item->setBackground(3, QBrush(Qt::red)); /* colour green? */ item->setBackground(3, QBrush(Qt::red)); /* colour green? */
} }
else else
{ {
item->setText(SR_ID_COL, QString::fromStdString( rsPeers->getPeerName(it->id))); item->setText(SR_ID_COL, QString::fromStdString( rsPeers->getPeerName(it->id)));
item->setText(SR_UID_COL, QString::fromStdString( it->id));
if(rsPeers->isOnline(it->id)) if(rsPeers->isOnline(it->id))
item->setBackground(3, QBrush(Qt::green)); item->setBackground(3, QBrush(Qt::green));
else else