1.1 --- a/findresultwidget.cpp	Mon Mar 22 15:37:23 2010 +0000
     1.2 +++ b/findresultwidget.cpp	Tue Mar 30 17:30:39 2010 +0000
     1.3 @@ -39,6 +39,8 @@
     1.4  	// Selection
     1.5  	connect (view->selectionModel(),SIGNAL (selectionChanged (QItemSelection,QItemSelection)),
     1.6  		this, SLOT (updateSelection (QItemSelection,QItemSelection)));
     1.7 +
     1.8 +	connect (resultsModel, SIGNAL(layoutChanged() ), view, SLOT (expandAll() ));	
     1.9  }
    1.10  
    1.11  void FindResultWidget::addItem (TreeItem *ti)
    1.12 @@ -87,14 +89,6 @@
    1.13  	return resultsModel;
    1.14  }
    1.15  
    1.16 -void FindResultWidget::addResult (const QString &category, TreeItem *ti)
    1.17 -{
    1.18 -	if (!category.isEmpty())
    1.19 -		addItem (category);
    1.20 -	else	
    1.21 -		addItem (model->getSelectedItem());
    1.22 -}
    1.23 -
    1.24  void FindResultWidget::popup()
    1.25  {
    1.26  	show();
    1.27 @@ -112,11 +106,15 @@
    1.28  	foreach (ix,newsel.indexes() )
    1.29  	{
    1.30  		FindResultItem *fri= static_cast<FindResultItem*>(ix.internalPointer());
    1.31 -		if (fri->getOrgModel() && fri->getOrgID()>0)
    1.32 +		if (fri->getOrgModel() && fri->getOriginalID()>0)
    1.33  		{
    1.34 -			TreeItem *ti=fri->getOrgModel()->findID(fri->getOrgID() );
    1.35 +			TreeItem *ti=fri->getOrgModel()->findID(fri->getOriginalID() );
    1.36  			if (ti)
    1.37 +			{
    1.38  				fri->getOrgModel()->select (ti);
    1.39 +				int i=fri->getOriginalIndex();
    1.40 +				if (i>=0) emit (noteSelected (resultsModel->getSearchString(),i));
    1.41 +			}	
    1.42  		}
    1.43  	}
    1.44  }