diff -r 46553c106c52 -r bec082472471 findresultwidget.cpp --- a/findresultwidget.cpp Mon Mar 22 15:37:23 2010 +0000 +++ b/findresultwidget.cpp Tue Mar 30 17:30:39 2010 +0000 @@ -39,6 +39,8 @@ // Selection connect (view->selectionModel(),SIGNAL (selectionChanged (QItemSelection,QItemSelection)), this, SLOT (updateSelection (QItemSelection,QItemSelection))); + + connect (resultsModel, SIGNAL(layoutChanged() ), view, SLOT (expandAll() )); } void FindResultWidget::addItem (TreeItem *ti) @@ -87,14 +89,6 @@ return resultsModel; } -void FindResultWidget::addResult (const QString &category, TreeItem *ti) -{ - if (!category.isEmpty()) - addItem (category); - else - addItem (model->getSelectedItem()); -} - void FindResultWidget::popup() { show(); @@ -112,11 +106,15 @@ foreach (ix,newsel.indexes() ) { FindResultItem *fri= static_cast(ix.internalPointer()); - if (fri->getOrgModel() && fri->getOrgID()>0) + if (fri->getOrgModel() && fri->getOriginalID()>0) { - TreeItem *ti=fri->getOrgModel()->findID(fri->getOrgID() ); + TreeItem *ti=fri->getOrgModel()->findID(fri->getOriginalID() ); if (ti) + { fri->getOrgModel()->select (ti); + int i=fri->getOriginalIndex(); + if (i>=0) emit (noteSelected (resultsModel->getSearchString(),i)); + } } } }