Save / Restore the Tree after organizing by other columns.

This patch saves and restores the state of the TreeView after the user
clicks on another columns that will make the tree disappear. All of the
branche states are saved, this way the expanded nodes will be restored
when the user gets back to tree mode.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-11-08 21:08:14 -02:00 committed by Dirk Hohndel
parent 38287a1c1e
commit d3fe3494fe
2 changed files with 28 additions and 17 deletions

View file

@ -66,15 +66,8 @@ DiveListView::~DiveListView()
void DiveListView::setupUi(){
QSettings settings;
static bool firstRun = true;
QList<int> expandedColumns;
if(!firstRun){
for(int i = 0; i < model()->rowCount(); i++){
if(isExpanded( model()->index(i, 0) )){
expandedColumns.push_back(i);
}
}
}
if(firstRun)
backupExpandedRows();
settings.beginGroup("ListWidget");
/* if no width are set, use the calculated width for each column;
* for that to work we need to temporarily expand all rows */
@ -89,18 +82,27 @@ void DiveListView::setupUi(){
setColumnWidth(i, 100);
}
settings.endGroup();
if(firstRun){
Q_FOREACH(const int &i, expandedColumns){
setExpanded( model()->index(i, 0), true );
}
}else{
if(firstRun)
restoreExpandedRows();
else
collapseAll();
}
firstRun = false;
}
void DiveListView::backupExpandedRows(){
expandedRows.clear();
for(int i = 0; i < model()->rowCount(); i++){
if(isExpanded( model()->index(i, 0) )){
expandedRows.push_back(i);
}
}
}
void DiveListView::restoreExpandedRows(){
Q_FOREACH(const int &i, expandedRows){
setExpanded( model()->index(i, 0), true );
}
}
void DiveListView::fixMessyQtModelBehaviour()
{
QAbstractItemModel *m = model();
@ -184,9 +186,15 @@ void DiveListView::headerClicked(int i)
sortByColumn(i, currentOrder);
} else {
// clear the model, repopulate with new indexes.
if(currentLayout == DiveTripModel::TREE){
backupExpandedRows();
}
reload(newLayout, false);
currentOrder = Qt::DescendingOrder;
sortByColumn(i, currentOrder);
if (newLayout == DiveTripModel::TREE){
restoreExpandedRows();
}
}
// repopulate the selections.

View file

@ -49,6 +49,7 @@ signals:
private:
bool mouseClickSelection;
QList<int> expandedRows;
int sortColumn;
Qt::SortOrder currentOrder;
DiveTripModel::Layout currentLayout;
@ -56,6 +57,8 @@ private:
QModelIndex contextMenuIndex;
void merge_trip(const QModelIndex &a, const int offset);
void setupUi();
void backupExpandedRows();
void restoreExpandedRows();
};
#endif // DIVELISTVIEW_H