Merge pull request #1203 from PhenomRetroShare/Fix_SharedFileDialogShowColumn

Fix shared file dialog show column
This commit is contained in:
csoler 2018-03-03 15:58:11 +01:00 committed by GitHub
commit 9bcff0761b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -229,12 +229,6 @@ LocalSharedFilesDialog::LocalSharedFilesDialog(QWidget *parent)
// load settings
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.
//
changeCurrentViewModel(ui.viewType_CB->currentIndex()) ;
@ -265,11 +259,6 @@ RemoteSharedFilesDialog::RemoteSharedFilesDialog(QWidget *parent)
// load settings
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.
//
changeCurrentViewModel(ui.viewType_CB->currentIndex()) ;
@ -346,7 +335,7 @@ void LocalSharedFilesDialog::processSettings(bool bLoad)
}
void RemoteSharedFilesDialog::processSettings(bool bLoad)
{
Settings->beginGroup("SharedFilesDialog");
Settings->beginGroup("RemoteSharedFilesDialog");
if (bLoad) {
// load settings
@ -425,10 +414,6 @@ void SharedFilesDialog::changeCurrentViewModel(int viewTypeIndex)
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)
{
ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;
@ -454,10 +439,6 @@ void LocalSharedFilesDialog::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)
{
ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;