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

Merge pull request #1188 from PhenomRetroShare/Fix_SharedFileDialogShowColumn

Browse Source 
Fix SharedFilesDialog show old hidden column.
This commit is contained in:
csoler 2018-02-22 23:03:48 +01:00 committed by GitHub
commit 385f44bf61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View File

@ -229,6 +229,12 @@ LocalSharedFilesDialog::LocalSharedFilesDialog(QWidget *parent)
// load settings // load settings
processSettings(true); processSettings(true);
// Force to show columns even if hidden in setting
ui.dirTreeView->setColumnHidden(COLUMN_NAME, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_SIZE, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_AGE, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_FRIEND_ACCESS, false) ;
// Setup the current view model. // Setup the current view model.
// //
changeCurrentViewModel(ui.viewType_CB->currentIndex()) ; changeCurrentViewModel(ui.viewType_CB->currentIndex()) ;
@ -254,11 +260,16 @@ RemoteSharedFilesDialog::RemoteSharedFilesDialog(QWidget *parent)
ui.checkButton->hide() ; ui.checkButton->hide() ;
connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(downloadRemoteSelected())); connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(downloadRemoteSelected()));
connect(ui.dirTreeView, SIGNAL( expanded(const QModelIndex & ) ), this, SLOT( expanded(const QModelIndex & ) ) ); connect(ui.dirTreeView, SIGNAL( expanded(const QModelIndex & ) ), this, SLOT( expanded(const QModelIndex & ) ) );
connect(ui.dirTreeView, SIGNAL( doubleClicked(const QModelIndex & ) ), this, SLOT( expanded(const QModelIndex & ) ) ); connect(ui.dirTreeView, SIGNAL( doubleClicked(const QModelIndex & ) ), this, SLOT( expanded(const QModelIndex & ) ) );
// load settings // load settings
processSettings(true); processSettings(true);
// Force to show columns even if hidden in setting
ui.dirTreeView->setColumnHidden(COLUMN_NAME, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_SIZE, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_AGE, false) ;
// Setup the current view model. // Setup the current view model.
// //
changeCurrentViewModel(ui.viewType_CB->currentIndex()) ; changeCurrentViewModel(ui.viewType_CB->currentIndex()) ;
@ -414,6 +425,10 @@ void SharedFilesDialog::changeCurrentViewModel(int viewTypeIndex)
void LocalSharedFilesDialog::showProperColumns() void LocalSharedFilesDialog::showProperColumns()
{ {
ui.dirTreeView->setColumnHidden(COLUMN_NAME, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_SIZE, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_AGE, false) ;
if(model == tree_model) if(model == tree_model)
{ {
ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ; ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;
@ -439,6 +454,10 @@ void LocalSharedFilesDialog::showProperColumns()
} }
void RemoteSharedFilesDialog::showProperColumns() void RemoteSharedFilesDialog::showProperColumns()
{ {
ui.dirTreeView->setColumnHidden(COLUMN_NAME, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_SIZE, false) ;
ui.dirTreeView->setColumnHidden(COLUMN_AGE, false) ;
if(model == tree_model) if(model == tree_model)
{ {
ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ; ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;