Diffstat (limited to 'core/pim/osearch/searchgroup.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 3159984..490deea 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp @@ -15,2 +15,4 @@ #include <qregexp.h> +// #include <qapplication.h> +// #include <opie/owait.h> @@ -23,3 +25,2 @@ SearchGroup::SearchGroup(QListView* parent, QString name) loaded = false; - expanded = false; } @@ -34,2 +35,3 @@ void SearchGroup::expand() { + //expanded = true; clearList(); @@ -37,7 +39,8 @@ void SearchGroup::expand() OListViewItem *dummy = new OListViewItem( this, "searching..."); - setOpen( expanded ); - if (!loaded) load(); - int res_count = search(); + setOpen( true ); + repaint(); + int res_count = realSearch(); setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")"); delete dummy; + repaint(); } @@ -48,5 +51,5 @@ void SearchGroup::doSearch() if (_search.isEmpty()) return; - if (!loaded) load(); - int res_count = search(); + int res_count = realSearch(); setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")"); +// repaint(); } @@ -57,3 +60,2 @@ void SearchGroup::clearList() QListViewItem *toDel; - while ( item != 0 ) { @@ -63,3 +65,2 @@ void SearchGroup::clearList() } - expanded = true; } @@ -70,3 +71,3 @@ void SearchGroup::setSearch(QRegExp re) _search = re; - if (expanded) expand(); + if (isOpen()) expand(); else new OListViewItem( this, "searching..."); @@ -74 +75,13 @@ void SearchGroup::setSearch(QRegExp re) +int SearchGroup::realSearch() +{ + //emit isSearching( tr(" Searching for %s in %s" ).arg( _search.pattern().latin1()).arg( _name ) ); +/* OWait *wait = new OWait( qApp->mainWidget(), "test" ); + wait->show();*/ + if (!loaded) load(); + int count = search(); +/* wait->hide(); + delete wait;*/ + return count; +} + |