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

Fixed Q_ASSERT in SharedFilesDialog on Windows.

Browse Source 
Load and save the view type (flat or tree) in SharedFilesDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4127 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-04-06 00:19:56 +00:00
parent 85aad4c75b
commit c21e13e68d
1 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
retroshare-gui/src/gui/SharedFilesDialog.cpp
View File

@ -115,7 +115,6 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
this, SLOT( checkForRemoteDirRequest( QTreeWidgetItem * ) ) ); this, SLOT( checkForRemoteDirRequest( QTreeWidgetItem * ) ) );
*/ */
tree_model = new TreeStyle_RDM(true); tree_model = new TreeStyle_RDM(true);
flat_model = new FlatStyle_RDM(true); flat_model = new FlatStyle_RDM(true);
@ -155,13 +154,6 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
connect(ui.filterPatternLineEdit, SIGNAL(returnPressed()), this, SLOT(startFilter())); connect(ui.filterPatternLineEdit, SIGNAL(returnPressed()), this, SLOT(startFilter()));
connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged())); connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged()));
// load settings
processSettings(true);
ui.remoteDirTreeView->setColumnHidden(3,false) ;
ui.remoteDirTreeView->setColumnHidden(4,true) ;
ui.localDirTreeView->setColumnHidden(4,true) ;
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * l_header = ui.localDirTreeView->header () ; QHeaderView * l_header = ui.localDirTreeView->header () ;
// l_header->setResizeMode (0, QHeaderView::Interactive); // l_header->setResizeMode (0, QHeaderView::Interactive);
@ -176,29 +168,32 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
l_header->resizeSection ( 3, 100 ); l_header->resizeSection ( 3, 100 );
// l_header->resizeSection ( 4, 100 ); // l_header->resizeSection ( 4, 100 );
l_header->setStretchLastSection(false);
// l_header->setHighlightSections(false);
// Setup the current view model.
//
changeCurrentViewModel(ui.viewType_CB->currentIndex()) ;
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * r_header = ui.remoteDirTreeView->header () ; QHeaderView * r_header = ui.remoteDirTreeView->header () ;
r_header->setResizeMode (0, QHeaderView::Interactive); r_header->setResizeMode (0, QHeaderView::Interactive);
r_header->setStretchLastSection(false); r_header->setStretchLastSection(false);
l_header->setStretchLastSection(false);
// r_header->setResizeMode (1, QHeaderView::Fixed); // r_header->setResizeMode (1, QHeaderView::Fixed);
// // r_header->setResizeMode (2, QHeaderView::Interactive); // // r_header->setResizeMode (2, QHeaderView::Interactive);
// r_header->setResizeMode (3, QHeaderView::Fixed); // r_header->setResizeMode (3, QHeaderView::Fixed);
// // r_header->setResizeMode (4, QHeaderView::Interactive); // // r_header->setResizeMode (4, QHeaderView::Interactive);
r_header->resizeSection ( 0, 490 ); r_header->resizeSection ( 0, 490 );
r_header->resizeSection ( 1, 70 ); r_header->resizeSection ( 1, 70 );
r_header->resizeSection ( 2, 80 ); r_header->resizeSection ( 2, 80 );
r_header->resizeSection ( 3, 100 ); r_header->resizeSection ( 3, 100 );
r_header->resizeSection ( 4, 80 ); r_header->resizeSection ( 4, 80 );
// l_header->setHighlightSections(false);
// r_header->setHighlightSections(false); // r_header->setHighlightSections(false);
/* Set Multi Selection */ /* Set Multi Selection */
ui.remoteDirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection); ui.remoteDirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
ui.localDirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection); ui.localDirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
@ -208,9 +203,13 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
// ui.filterPatternLineEdit->hide(); // ui.filterPatternLineEdit->hide();
//#endif //#endif
// Setup the current view model. // load settings
// processSettings(true);
changeCurrentViewModel(ui.viewType_CB->currentIndex()) ;
// Hide columns after loading the settings
ui.remoteDirTreeView->setColumnHidden(3,false) ;
ui.remoteDirTreeView->setColumnHidden(4,true) ;
ui.localDirTreeView->setColumnHidden(4,true) ;
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -255,6 +254,9 @@ void SharedFilesDialog::processSettings(bool bLoad)
// state of splitter // state of splitter
ui.splitter->restoreState(Settings->value("Splitter").toByteArray()); ui.splitter->restoreState(Settings->value("Splitter").toByteArray());
// view type
ui.viewType_CB->setCurrentIndex(Settings->value("ViewType").toInt());
} else { } else {
// save settings // save settings
@ -264,6 +266,9 @@ void SharedFilesDialog::processSettings(bool bLoad)
// state of splitter // state of splitter
Settings->setValue("Splitter", ui.splitter->saveState()); Settings->setValue("Splitter", ui.splitter->saveState());
// view type
Settings->setValue("ViewType", ui.viewType_CB->currentIndex());
} }
Settings->endGroup(); Settings->endGroup();