Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-09 03:18:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed saving of expanded items

Browse Source
This commit is contained in:
csoler 2018-02-08 09:07:48 +01:00
parent e7c75b19da
commit 2744bc9750
1 changed files with 17 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1840,99 +1840,46 @@ void TransfersDialog::updateDisplay()
void TransfersDialog::insertTransfers() void TransfersDialog::insertTransfers()
{ {
// Since downloads use an AstractItemModel, we just need to update it, while saving the selected and expanded items.
std::set<QString> expanded_hashes ; std::set<QString> expanded_hashes ;
std::set<QString> selected_hashes ; std::set<QString> selected_hashes ;
ui.downloadList->setSortingEnabled(false); ui.downloadList->setSortingEnabled(false);
ui.downloadList->blockSignals(true) ;
for(int row = 0; row < DLListModel->rowCount(); ++row) std::cerr << "Updating transfers..." << std::endl;
QAbstractItemModel *model = ui.downloadList->model();
for(int row = 0; row < model->rowCount(); ++row)
{ {
QModelIndex index = DLListModel->index(row,0,QModelIndex()); QModelIndex index = model->index(row,0,QModelIndex());
if(ui.downloadList->isExpanded(index)) if(ui.downloadList->isExpanded(index))
expanded_hashes.insert(DLListModel->index(row,COLUMN_ID).data(Qt::DisplayRole).toString()); expanded_hashes.insert(model->index(row,COLUMN_ID).data(Qt::DisplayRole).toString());
if(ui.downloadList->selectionModel()->selection().contains(index)) if(ui.downloadList->selectionModel()->selection().contains(index))
selected_hashes.insert(DLListModel->index(row,COLUMN_ID).data(Qt::DisplayRole).toString()); selected_hashes.insert(model->index(row,COLUMN_ID).data(Qt::DisplayRole).toString());
} }
DLListModel->update_transfers(); DLListModel->update_transfers();
for(int row = 0; row < DLListModel->rowCount(); ++row) for(int row = 0; row < model->rowCount(); ++row)
{ {
QModelIndex index = DLListModel->index(row,0,QModelIndex()); QModelIndex index = model->index(row,0,QModelIndex());
if(expanded_hashes.end() != expanded_hashes.find(DLListModel->index(row,COLUMN_ID).data(Qt::DisplayRole).toString())) if(expanded_hashes.end() != expanded_hashes.find(model->index(row,COLUMN_ID).data(Qt::DisplayRole).toString()))
ui.downloadList->setExpanded(index,true); ui.downloadList->setExpanded(index,true);
if(selected_hashes.end() != selected_hashes.find(DLListModel->index(row,COLUMN_ID).data(Qt::DisplayRole).toString())) if(selected_hashes.end() != selected_hashes.find(model->index(row,COLUMN_ID).data(Qt::DisplayRole).toString()))
ui.downloadList->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows); ui.downloadList->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows);
} }
ui.downloadList->setSortingEnabled(true); ui.downloadList->setSortingEnabled(true);
ui.downloadList->blockSignals(false) ;
// /* disable for performance issues, enable after insert all transfers */ // Now show upload hashes. Here we use the "old" way, since the number of uploads is generally not so large.
//
// /* get the download lists */
// std::list<RsFileHash> downHashes;
// rsFiles->FileDownloads(downHashes);
//
// /* build set for quick search */
// std::set<RsFileHash> hashs;
//
// for (std::list<RsFileHash>::iterator it = downHashes.begin(); it != downHashes.end(); ++it) {
// hashs.insert(*it);
// }
//
// /* add downloads, first iterate all rows in list */
//
// int rowCount = DLListModel->rowCount();
//
// for (int row = 0; row < rowCount; ) {
// RsFileHash hash ( DLListModel->item(row, COLUMN_ID)->data(Qt::UserRole).toString().toStdString());
//
// std::set<RsFileHash>::iterator hashIt = hashs.find(hash);
// if (hashIt == hashs.end()) {
// // remove not existing downloads
// DLListModel->removeRow(row);
// rowCount = DLListModel->rowCount();
// continue;
// }
//
// FileInfo fileInfo;
// if (!rsFiles->FileDetails(hash, RS_FILE_HINTS_DOWNLOAD, fileInfo)) {
// DLListModel->removeRow(row);
// rowCount = DLListModel->rowCount();
// continue;
// }
//
// hashs.erase(hashIt);
//
// if (addDLItem(row, fileInfo) < 0) {
// DLListModel->removeRow(row);
// rowCount = DLListModel->rowCount();
// continue;
// }
//
// ++row;
// }
//
// /* then add new downloads to the list */
//
// for (std::set<RsFileHash>::iterator hashIt = hashs.begin()
// ; hashIt != hashs.end(); ++hashIt)
// {
// FileInfo fileInfo;
// if (!rsFiles->FileDetails(*hashIt, RS_FILE_HINTS_DOWNLOAD, fileInfo)) {
// continue;
// }
//
// addDLItem(-1, fileInfo);
// }
//
// ui.downloadList->setSortingEnabled(true);
// Now show upload hashes
// //
/* disable for performance issues, enable after insert all transfers */ /* disable for performance issues, enable after insert all transfers */