improved applnk and doclnk searching

clean up:
- mainwindow: handling of searchgroups
- searchgroups: introduced load, search and insertItem functions
- flexible actions handling
- doclnksearch inherits applnksearch

1 files changed, 20 insertions, 4 deletions

diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index dce3b14..d062207 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -11,12 +11,16 @@
 //
 //
 #include "searchgroup.h"
+
+#include <qregexp.h>
+
 #include "olistviewitem.h"
 
 SearchGroup::SearchGroup(QListView* parent, QString name)
 : OListViewItem(parent, name)
 {
 	_name = name;
+	loaded = false;
 	expanded = false;
 }
 
@@ -28,14 +32,26 @@ SearchGroup::~SearchGroup()
 
 void SearchGroup::expand()
 {
+	clearList();
+	if (_search.isEmpty()) return;
+	OListViewItem *dummy = new OListViewItem( this, "searching...");
+	setOpen( expanded );
+	if (!loaded) load();
+	int res_count = search();
+	setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
+	delete dummy;
+}
+
+
+void SearchGroup::clearList()
+{
 	QListViewItem *item = firstChild();
 	QListViewItem *toDel;
 
 	while ( item != 0 ) {
-	 toDel = item;
-	 item = item->nextSibling();
-	 //takeItem(toDel);
-	 delete toDel;
+		toDel = item;
+		item = item->nextSibling();
+	 	delete toDel;
 	}
 	expanded = true;
 }