Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix SharedFilesDialog show old hidden column."

Browse Source 
This reverts commit c141eae828.
This commit is contained in:
Phenom 2018-03-03 12:05:13 +01:00
parent 57f87a680f
commit ab45a972b0
1 changed files with 2 additions and 21 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,12 +229,6 @@ 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()) ;
@ -260,16 +254,11 @@ 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()) ;
@ -425,10 +414,6 @@ 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) ;
@ -454,10 +439,6 @@ 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) ;