Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed preserving order of links copied from search dialog results

Browse source
This commit is contained in:
csoler 2022-12-28 21:02:05 +01:00
parent 0ce6b5f375
commit 96a2f18571
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
View file

@ -1457,7 +1457,8 @@ void SearchDialog::copyResultLink()
QList<QTreeWidgetItem*> itemsForCopy = ui.searchResultWidget->selectedItems(); QList<QTreeWidgetItem*> itemsForCopy = ui.searchResultWidget->selectedItems();
QTreeWidgetItem * item; QTreeWidgetItem * item;
std::map<RsFileHash,RetroShareLink> url_map; std::set<RsFileHash> already_seen_hashes;
QList<RetroShareLink> urls ;
for (auto item:itemsForCopy) for (auto item:itemsForCopy)
{ {
@ -1466,7 +1467,7 @@ void SearchDialog::copyResultLink()
QString fhash = item->text(SR_HASH_COL); QString fhash = item->text(SR_HASH_COL);
RsFileHash hash(fhash.toStdString()); RsFileHash hash(fhash.toStdString());
if(!hash.isNull()) if(!hash.isNull() && (already_seen_hashes.end() == already_seen_hashes.find(hash)))
{ {
std::cerr << "SearchDialog::copyResultLink() Calling set retroshare link"; std::cerr << "SearchDialog::copyResultLink() Calling set retroshare link";
std::cerr << std::endl; std::cerr << std::endl;
@ -1477,16 +1478,13 @@ void SearchDialog::copyResultLink()
RetroShareLink link = RetroShareLink::createFile(fname, fsize, fhash); RetroShareLink link = RetroShareLink::createFile(fname, fsize, fhash);
if (link.valid()) if (link.valid())
url_map[hash] = link; {
std::cerr << "new link added to clipboard: " << link.toString().toStdString() << std::endl ;
urls.push_back(link);
already_seen_hashes.insert(hash);
}
} }
} }
QList<RetroShareLink> urls ;
for(auto link:url_map)
{
std::cerr << "new link added to clipboard: " << link.second.toString().toStdString() << std::endl ;
urls.push_back(link.second);
}
RSLinkClipboard::copyLinks(urls) ; RSLinkClipboard::copyLinks(urls) ;
} }