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

save/restore selection in shared dir list tree view

Browse source
This commit is contained in:
csoler 2016-10-03 21:44:34 +02:00
parent ed8d78660f
commit ebfc82cc1e
3 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/file_sharing/p3filelists.cc
View file

@ -224,7 +224,7 @@ int p3FileDatabase::tick()
mLastRemoteDirSweepTS = now; mLastRemoteDirSweepTS = now;
// This is a hash to make loaded directories show up in the GUI, because the GUI generally isn't ready at the time they are actually loaded up, // This is a hack to make loaded directories show up in the GUI, because the GUI generally isn't ready at the time they are actually loaded up,
// so the first notify is ignored, and no other notify will happen next. // so the first notify is ignored, and no other notify will happen next.
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_FRIENDS, 0); RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_FRIENDS, 0);

45
retroshare-gui/src/gui/SharedFilesDialog.cpp
View file

@ -256,13 +256,14 @@ void SharedFilesDialog::showEvent(QShowEvent *)
{ {
if(model!=NULL) if(model!=NULL)
{ {
std::set<std::string> expanded_indexes ; std::set<std::string> expanded_indexes,selected_indexes ;
saveExpandedPaths(expanded_indexes);
saveExpandedPathsAndSelection(expanded_indexes,selected_indexes);
model->setVisible(true) ; model->setVisible(true) ;
model->update() ; model->update() ;
restoreExpandedPaths(expanded_indexes); restoreExpandedPathsAndSelection(expanded_indexes,selected_indexes);
} }
} }
RemoteSharedFilesDialog::~RemoteSharedFilesDialog() RemoteSharedFilesDialog::~RemoteSharedFilesDialog()
@ -359,8 +360,9 @@ void SharedFilesDialog::changeCurrentViewModel(int viewTypeIndex)
showProperColumns() ; showProperColumns() ;
std::set<std::string> expanded_indexes ; std::set<std::string> expanded_indexes,selected_indexes ;
saveExpandedPaths(expanded_indexes);
saveExpandedPathsAndSelection(expanded_indexes,selected_indexes);
if(isVisible()) if(isVisible())
{ {
@ -374,7 +376,7 @@ void SharedFilesDialog::changeCurrentViewModel(int viewTypeIndex)
ui.dirTreeView->setModel(proxyModel); ui.dirTreeView->setModel(proxyModel);
ui.dirTreeView->update(); ui.dirTreeView->update();
restoreExpandedPaths(expanded_indexes); restoreExpandedPathsAndSelection(expanded_indexes,selected_indexes);
QHeaderView * header = ui.dirTreeView->header () ; QHeaderView * header = ui.dirTreeView->header () ;
QHeaderView_setSectionResizeModeColumn(header, COLUMN_NAME, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(header, COLUMN_NAME, QHeaderView::Interactive);
@ -851,7 +853,7 @@ void SharedFilesDialog::preModDirectories(bool local)
flat_model->preMods(); flat_model->preMods();
} }
void SharedFilesDialog::saveExpandedPaths(std::set<std::string>& expanded_indexes) void SharedFilesDialog::saveExpandedPathsAndSelection(std::set<std::string>& expanded_indexes, std::set<std::string>& selected_indexes)
{ {
if(ui.dirTreeView->model() == NULL) if(ui.dirTreeView->model() == NULL)
return ; return ;
@ -862,11 +864,12 @@ void SharedFilesDialog::saveExpandedPaths(std::set<std::string>& expanded_indexe
for(int row = 0; row < ui.dirTreeView->model()->rowCount(); ++row) for(int row = 0; row < ui.dirTreeView->model()->rowCount(); ++row)
{ {
std::string path = ui.dirTreeView->model()->index(row,0).data(Qt::DisplayRole).toString().toStdString(); std::string path = ui.dirTreeView->model()->index(row,0).data(Qt::DisplayRole).toString().toStdString();
recursSaveExpandedItems(ui.dirTreeView->model()->index(row,0),path,expanded_indexes);
recursSaveExpandedItems(ui.dirTreeView->model()->index(row,0),path,expanded_indexes,selected_indexes);
} }
} }
void SharedFilesDialog::restoreExpandedPaths(const std::set<std::string>& expanded_indexes) void SharedFilesDialog::restoreExpandedPathsAndSelection(const std::set<std::string>& expanded_indexes, const std::set<std::string>& selected_indexes)
{ {
if(ui.dirTreeView->model() == NULL) if(ui.dirTreeView->model() == NULL)
return ; return ;
@ -881,18 +884,23 @@ void SharedFilesDialog::restoreExpandedPaths(const std::set<std::string>& expand
for(int row = 0; row < ui.dirTreeView->model()->rowCount(); ++row) for(int row = 0; row < ui.dirTreeView->model()->rowCount(); ++row)
{ {
std::string path = ui.dirTreeView->model()->index(row,0).data(Qt::DisplayRole).toString().toStdString(); std::string path = ui.dirTreeView->model()->index(row,0).data(Qt::DisplayRole).toString().toStdString();
recursRestoreExpandedItems(ui.dirTreeView->model()->index(row,0),path,expanded_indexes); recursRestoreExpandedItems(ui.dirTreeView->model()->index(row,0),path,expanded_indexes,selected_indexes);
} }
QItemSelection selection ;
ui.dirTreeView->blockSignals(false) ; ui.dirTreeView->blockSignals(false) ;
} }
void SharedFilesDialog::recursSaveExpandedItems(const QModelIndex& index,const std::string& path,std::set<std::string>& exp) void SharedFilesDialog::recursSaveExpandedItems(const QModelIndex& index,const std::string& path,std::set<std::string>& exp,std::set<std::string>& sel)
{ {
std::string local_path = path+"/"+index.data(Qt::DisplayRole).toString().toStdString(); std::string local_path = path+"/"+index.data(Qt::DisplayRole).toString().toStdString();
#ifdef DEBUG_SHARED_FILES_DIALOG #ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "at index " << index.row() << ". data[1]=" << local_path << std::endl; std::cerr << "at index " << index.row() << ". data[1]=" << local_path << std::endl;
#endif #endif
if(ui.dirTreeView->selectionModel()->selection().contains(index))
sel.insert(local_path) ;
if(ui.dirTreeView->isExpanded(index)) if(ui.dirTreeView->isExpanded(index))
{ {
#ifdef DEBUG_SHARED_FILES_DIALOG #ifdef DEBUG_SHARED_FILES_DIALOG
@ -902,7 +910,7 @@ void SharedFilesDialog::recursSaveExpandedItems(const QModelIndex& index,const s
exp.insert(local_path) ; exp.insert(local_path) ;
for(int row=0;row<ui.dirTreeView->model()->rowCount(index);++row) for(int row=0;row<ui.dirTreeView->model()->rowCount(index);++row)
recursSaveExpandedItems(index.child(row,0),local_path,exp) ; recursSaveExpandedItems(index.child(row,0),local_path,exp,sel) ;
} }
#ifdef DEBUG_SHARED_FILES_DIALOG #ifdef DEBUG_SHARED_FILES_DIALOG
else else
@ -910,12 +918,14 @@ void SharedFilesDialog::recursSaveExpandedItems(const QModelIndex& index,const s
#endif #endif
} }
void SharedFilesDialog::recursRestoreExpandedItems(const QModelIndex& index, const std::string &path, const std::set<std::string>& exp) void SharedFilesDialog::recursRestoreExpandedItems(const QModelIndex& index, const std::string &path, const std::set<std::string>& exp, const std::set<std::string> &sel)
{ {
std::string local_path = path+"/"+index.data(Qt::DisplayRole).toString().toStdString(); std::string local_path = path+"/"+index.data(Qt::DisplayRole).toString().toStdString();
#ifdef DEBUG_SHARED_FILES_DIALOG #ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "at index " << index.row() << ". data[1]=" << local_path << std::endl; std::cerr << "at index " << index.row() << ". data[1]=" << local_path << std::endl;
#endif #endif
if(sel.find(local_path) != sel.end())
ui.dirTreeView->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows);
if(exp.find(local_path) != exp.end()) if(exp.find(local_path) != exp.end())
{ {
@ -925,7 +935,7 @@ void SharedFilesDialog::recursRestoreExpandedItems(const QModelIndex& index, con
ui.dirTreeView->setExpanded(index,true) ; ui.dirTreeView->setExpanded(index,true) ;
for(int row=0;row<ui.dirTreeView->model()->rowCount(index);++row) for(int row=0;row<ui.dirTreeView->model()->rowCount(index);++row)
recursRestoreExpandedItems(index.child(row,0),local_path,exp) ; recursRestoreExpandedItems(index.child(row,0),local_path,exp,sel) ;
} }
} }
@ -935,8 +945,9 @@ void SharedFilesDialog::postModDirectories(bool local)
if (isRemote() == local) { if (isRemote() == local) {
return; return;
} }
std::set<std::string> expanded_indexes; std::set<std::string> expanded_indexes,selected_indexes;
saveExpandedPaths(expanded_indexes) ;
saveExpandedPathsAndSelection(expanded_indexes,selected_indexes) ;
#ifdef DEBUG_SHARED_FILES_DIALOG #ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "Saving expanded items. " << expanded_indexes.size() << " items found" << std::endl; std::cerr << "Saving expanded items. " << expanded_indexes.size() << " items found" << std::endl;
#endif #endif
@ -946,7 +957,7 @@ void SharedFilesDialog::postModDirectories(bool local)
flat_model->postMods(); flat_model->postMods();
ui.dirTreeView->update() ; ui.dirTreeView->update() ;
restoreExpandedPaths(expanded_indexes) ; restoreExpandedPathsAndSelection(expanded_indexes,selected_indexes) ;
if (ui.filterPatternLineEdit->text().isEmpty() == false) if (ui.filterPatternLineEdit->text().isEmpty() == false)
FilterItems(); FilterItems();

8
retroshare-gui/src/gui/SharedFilesDialog.h
View file

@ -94,10 +94,10 @@ protected:
Ui::SharedFilesDialog ui; Ui::SharedFilesDialog ui;
virtual void processSettings(bool bLoad) = 0; virtual void processSettings(bool bLoad) = 0;
void recursRestoreExpandedItems(const QModelIndex& index,const std::string& path,const std::set<std::string>& exp); void recursRestoreExpandedItems(const QModelIndex& index,const std::string& path,const std::set<std::string>& exp,const std::set<std::string>& sel);
void recursSaveExpandedItems(const QModelIndex& index, const std::string &path, std::set<std::string> &exp); void recursSaveExpandedItems(const QModelIndex& index, const std::string &path, std::set<std::string> &exp, std::set<std::string>& sel);
void saveExpandedPaths(std::set<std::string>& paths) ; void saveExpandedPathsAndSelection(std::set<std::string>& paths, std::set<std::string>& selected_indexes) ;
void restoreExpandedPaths(const std::set<std::string>& paths) ; void restoreExpandedPathsAndSelection(const std::set<std::string>& paths, const std::set<std::string>& selected_indexes) ;
protected: protected:
//now context menu are created again every time theu are called ( in some //now context menu are created again every time theu are called ( in some