From d171ed3b09665db0f511310d6c84a23d75135f50 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 03 Sep 2004 09:23:23 +0000
Subject: Much better search possibility in kapi

---
(limited to 'kaddressbook/kabcore.cpp')

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f0f08f4..4299ebd 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -833,19 +833,32 @@ void KABCore::incrementalSearch( const QString& text )
 
   if ( !text.isEmpty() ) {
     KABC::Field *field = mIncSearchWidget->currentField();
-
-  QString pattern = text.lower();
-
+  QString pattern = text.lower()+"*";
+  QRegExp re;
+  re.setWildcard(true); // most people understand these better.
+  re.setCaseSensitive(false);
+  re.setPattern( pattern );
+  QStringList foundUids;
+ if (!re.isValid())
+     return; 
 #if 1 //KDE_VERSION >= 319
     KABC::AddresseeList list( mAddressBook->allAddressees() );
     if (  field ) {
       list.sortByField( field );
       KABC::AddresseeList::Iterator it;
       for ( it = list.begin(); it != list.end(); ++it ) {
-        if ( field->value( *it ).lower().startsWith( pattern ) ) {
-          mViewManager->setSelected( (*it).uid(), true );
-          return;
-        }
+
+#if QT_VERSION >= 300
+          if (re.search(field->value( *it ).lower()) != -1)
+#else
+              if (re.match(field->value( *it ).lower()) != -1)
+#endif
+                  {
+                      // if ( field->value( *it ).lower().startsWith( pattern ) ) {
+                      //mViewManager->setSelected( (*it).uid(), true );
+                      foundUids.append( (*it).uid()  );
+                      //return;
+                  }
       }
     } else {
       KABC::AddresseeList::Iterator it;
@@ -853,13 +866,22 @@ void KABCore::incrementalSearch( const QString& text )
         KABC::Field::List fieldList = mIncSearchWidget->fields();
         KABC::Field::List::ConstIterator fieldIt;
         for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
-          if ( (*fieldIt)->value( *it ).lower().startsWith( pattern ) ) {
-            mViewManager->setSelected( (*it).uid(), true );
-            return;
+#if QT_VERSION >= 300
+            if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+#else
+                if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+#endif   
+                    {
+                        //      if ( (*fieldIt)->value( *it ).lower().startsWith( pattern ) ) {
+                        //mViewManager->setSelected( (*it).uid(), true );
+                        foundUids.append( (*it).uid()  );
+                        //return;
           }
         }
       }
     }
+    if ( foundUids.count() > 0 )
+       mViewManager->setListSelected( foundUids ); 
 #else
     KABC::AddressBook::Iterator it;
     for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
--
cgit v0.9.0.2