Added senseful searching in Kapi

10 files changed, 159 insertions, 76 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1a1bcff..2a2f904 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -850,78 +850,5 @@ void KABCore::setSearchFields( const KABC::Field::List &fields )
 void KABCore::incrementalSearch( const QString& text )
 {
-  mViewManager->setSelected( QString::null, false );
-
-  if ( !text.isEmpty() ) {
-    KABC::Field *field = mIncSearchWidget->currentField();
-  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 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;
-      for ( it = list.begin(); it != list.end(); ++it ) {
-        KABC::Field::List fieldList = mIncSearchWidget->fields();
-        KABC::Field::List::ConstIterator fieldIt;
-        for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
-#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 ) {
-      if ( field ) {
-        if ( field->value( *it ).lower().startsWith( pattern ) ) {
-          mViewManager->setSelected( (*it).uid(), true );
-          return;
-        }
-      } else {
-        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;
-          }
-        }
-      }
-    }
-#endif
-  }
+    mViewManager->doSearch( text, mIncSearchWidget->currentField() );
 }
 
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 7457080..17106e8 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -65,4 +65,5 @@ class KAddressBookView : public QWidget
      */
     virtual QStringList selectedUids() = 0;
+    virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
 
     /**
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c93d51a..c6baeac 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -547,5 +547,10 @@ qDebug("ViewManager::startDrag() has to be changed!!" );
 
 }
+void ViewManager::doSearch( const QString&  s,KABC::Field *field  )
+{
+    if ( mActiveView ) 
+        mActiveView->doSearch( s, field  );
 
+}
 void ViewManager::setActiveFilter( int index )
 {
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 97c2275..6def6b6 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -56,4 +56,5 @@ class ViewManager : public QWidget
     void restoreSettings();
     void saveSettings();
+    void doSearch( const QString&  s ,KABC::Field *field );
 
     void unloadViews(); 
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 239429f..49c0691 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -116,4 +116,5 @@ AddresseeCardView::~AddresseeCardView()
 }
 
+
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
@@ -241,5 +242,55 @@ void KAddressBookCardView::writeConfig( KConfig *config )
   KAddressBookView::writeConfig( config );
 }
-  
+void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
+{
+    mCardView->clear();
+    if ( s.isEmpty() || s == "*" ) {
+        refresh();
+        return;
+    }  
+    QString pattern = s.lower()+"*";
+    QRegExp re;
+    re.setWildcard(true); // most people understand these better.
+    re.setCaseSensitive(false);
+    re.setPattern( pattern );
+    if (!re.isValid())
+        return; 
+    mCardView->viewport()->setUpdatesEnabled( false );
+    KABC::Addressee::List addresseeList = addressees();
+    KABC::Addressee::List::Iterator it;  
+    if (  field ) {
+        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+#if QT_VERSION >= 300
+            if (re.search(field->value( *it ).lower()) != -1)
+#else
+                if (re.match(field->value( *it ).lower()) != -1)
+#endif
+                  new AddresseeCardViewItem(fields(), mShowEmptyFields,
+                                              addressBook(), *it, mCardView);
+
+        }
+    } else {
+        KABC::Field::List fieldList = fields();
+        KABC::Field::List::ConstIterator fieldIt;
+        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
+#if QT_VERSION >= 300
+                if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+#else
+                    if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+#endif   
+                        { 
+                           new AddresseeCardViewItem(fields(), mShowEmptyFields,
+                                              addressBook(), *it, mCardView);
+                            continue;
+                        }
+            }
+        }
+    }
+    mCardView->viewport()->setUpdatesEnabled( true );
+    mCardView->viewport()->update();
+    // by default nothing is selected
+    emit selected(QString::null);
+}
 QStringList KAddressBookCardView::selectedUids()
 {
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index cd70371..b8efb01 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -55,5 +55,5 @@ class KAddressBookCardView : public KAddressBookView
                           const char *name = 0 );
     virtual ~KAddressBookCardView();
-    
+    void doSearch( const QString&  s,KABC::Field *field  );
     virtual QStringList selectedUids();
     virtual QString type() const { return "Card"; }
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 50ff285..78d63b0 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -97,4 +97,5 @@ AddresseeIconView::~AddresseeIconView()
 }
 
+
 void AddresseeIconView::itemDropped(QDropEvent *e, 
                                     const QValueList<QIconDragItem> &)
@@ -233,5 +234,51 @@ void KAddressBookIconView::readConfig(KConfig *config)
             
 }
+void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
+{
+    mIconView->clear();
+    mIconList.clear();
+    if ( s.isEmpty() || s == "*" ) {
+        refresh();
+        return;
+    }  
+    QString pattern = s.lower()+"*";
+    QRegExp re;
+    re.setWildcard(true); // most people understand these better.
+    re.setCaseSensitive(false);
+    re.setPattern( pattern );
+    if (!re.isValid())
+        return; 
+    KABC::Addressee::List addresseeList = addressees();
+    KABC::Addressee::List::Iterator it;  
+    if (  field ) {
+        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+#if QT_VERSION >= 300
+            if (re.search(field->value( *it ).lower()) != -1)
+#else
+                if (re.match(field->value( *it ).lower()) != -1)
+#endif
+                    mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
+                 
 
+        }
+    } else {
+        KABC::Field::List fieldList = fields();
+        KABC::Field::List::ConstIterator fieldIt;
+        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
+#if QT_VERSION >= 300
+                if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+#else
+                    if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+#endif   
+                        { 
+                            mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
+                            continue;
+                        }
+            }
+        }
+    }
+    mIconView->arrangeItemsInGrid( true ); 
+}
 QStringList KAddressBookIconView::selectedUids()
 {
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 3afada3..963ee7c 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -59,4 +59,5 @@ class KAddressBookIconView : public KAddressBookView
     virtual QStringList selectedUids();
     virtual QString type() const { return "Icon"; }
+    void doSearch( const QString&  s ,KABC::Field *field );
     
     virtual void readConfig(KConfig *config);
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index ab11e2a..12f7c27 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -113,4 +113,53 @@ void KAddressBookTableView::reconstructListView()
 }
 
+void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
+{
+    mListView->clear();
+    if ( s.isEmpty() || s == "*" ) {
+        refresh();
+        return;
+    }  
+    QString pattern = s.lower()+"*";
+    QRegExp re;
+    re.setWildcard(true); // most people understand these better.
+    re.setCaseSensitive(false);
+    re.setPattern( pattern );
+    if (!re.isValid())
+        return; 
+    KABC::Addressee::List addresseeList = addressees();
+    KABC::Addressee::List::Iterator it; 
+    if (  field ) {
+        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+#if QT_VERSION >= 300
+            if (re.search(field->value( *it ).lower()) != -1)
+#else
+                if (re.match(field->value( *it ).lower()) != -1)
+#endif
+                    ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
+
+        }
+    } else {
+        KABC::Field::List fieldList = fields();
+        KABC::Field::List::ConstIterator fieldIt;
+        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
+#if QT_VERSION >= 300
+                if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+#else
+                    if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+#endif   
+                        { 
+                            ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
+                            continue;
+                        }
+            }
+        }
+    }
+    // Sometimes the background pixmap gets messed up when we add lots
+    // of items.
+    mListView->repaint();
+    emit selected(QString::null);
+   
+}
 void KAddressBookTableView::writeConfig(KConfig *config)
 {
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index bb991bc..ecfe7a1 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -63,4 +63,5 @@ friend class ContactListView;
     virtual void writeConfig(KConfig *config);
     virtual QString type() const { return "Table"; }
+    void doSearch( const QString&  s ,KABC::Field *field );
 
   public slots: