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
@@ -846,86 +846,13 @@ void KABCore::setSearchFields( const KABC::Field::List &fields )
 {
   mIncSearchWidget->setFields( 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() );
 }
 
 void KABCore::setModified()
 {
   setModified( true );
 }
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 7457080..17106e8 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -61,12 +61,13 @@ class KAddressBookView : public QWidget
 
     /**
       Must be overloaded in subclasses. Should return a list of
       all the uids of selected contacts.
      */
     virtual QStringList selectedUids() = 0;
+    virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
 
     /**
       Called whenever this view should read the config. This can be used
       as a sign that the config has changed, therefore the view should
       assume the worst and rebuild itself if necessary. For example,
       in a table view this method may be called when the user adds or
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c93d51a..c6baeac 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -543,13 +543,18 @@ void ViewManager::startDrag()
 
 #else //KAB_EMBEDDED
 qDebug("ViewManager::startDrag() has to be changed!!" );
 #endif //KAB_EMBEDDED
 
 }
+void ViewManager::doSearch( const QString&  s,KABC::Field *field  )
+{
+    if ( mActiveView ) 
+        mActiveView->doSearch( s, field  );
 
+}
 void ViewManager::setActiveFilter( int index )
 {
   Filter currentFilter;
 
   if ( ( index - 1 ) < 0 )
     currentFilter = Filter();
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 97c2275..6def6b6 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -52,12 +52,13 @@ class ViewManager : public QWidget
   public:
     ViewManager( KABCore *core, QWidget *parent, const char *name = 0 );
     ~ViewManager();
 
     void restoreSettings();
     void saveSettings();
+    void doSearch( const QString&  s ,KABC::Field *field );
 
     void unloadViews(); 
     KSelectAction * getFilterAction() { return mActionSelectFilter; }
 
     QStringList selectedUids() const;
     QStringList selectedEmails() const;
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
@@ -112,12 +112,13 @@ AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
 }
 
 AddresseeCardView::~AddresseeCardView()
 {
 }
 
+
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KAB_EMBEDDED
   if (QTextDrag::canDecode(e))
     e->accept();
 #else //KAB_EMBEDDED
@@ -237,13 +238,63 @@ void KAddressBookCardView::readConfig(KConfig *config)
 
 void KAddressBookCardView::writeConfig( KConfig *config )
 {
   config->writeEntry( "ItemWidth", mCardView->itemWidth() );
   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()
 {
     QStringList uidList;
     CardViewItem *item;
     AddresseeCardViewItem *aItem;
 
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
@@ -51,13 +51,13 @@ class KAddressBookCardView : public KAddressBookView
   Q_OBJECT
     
   public:
     KAddressBookCardView( KABC::AddressBook *ab, QWidget *parent,
                           const char *name = 0 );
     virtual ~KAddressBookCardView();
-    
+    void doSearch( const QString&  s,KABC::Field *field  );
     virtual QStringList selectedUids();
     virtual QString type() const { return "Card"; }
     
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *);
     
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
@@ -93,12 +93,13 @@ AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
 }
 
 AddresseeIconView::~AddresseeIconView()
 {
 }
 
+
 void AddresseeIconView::itemDropped(QDropEvent *e, 
                                     const QValueList<QIconDragItem> &)
 {
   emit addresseeDropped(e);
 }
 
@@ -229,13 +230,59 @@ void KAddressBookIconView::readConfig(KConfig *config)
             this, SLOT(addresseeExecuted(QIconViewItem *)));
 */
     connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
             
 }
+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()
 {
     QStringList uidList;
     QIconViewItem *item;
     AddresseeIconViewItem *aItem;
     
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
@@ -55,12 +55,13 @@ class KAddressBookIconView : public KAddressBookView
     KAddressBookIconView( KABC::AddressBook *ab, QWidget *parent,
                           const char *name = 0 );
     virtual ~KAddressBookIconView();
     
     virtual QStringList selectedUids();
     virtual QString type() const { return "Icon"; }
+    void doSearch( const QString&  s ,KABC::Field *field );
     
     virtual void readConfig(KConfig *config);
     
   public slots:
     void refresh(QString uid = QString::null);
 #ifndef KAB_EMBEDDED
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
@@ -109,12 +109,61 @@ void KAddressBookTableView::reconstructListView()
   mListView->setSorting( 0, true );
   mainLayout->addWidget( mListView );
   mainLayout->activate();
   mListView->show();
 }
 
+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)
 {
   KAddressBookView::writeConfig(config);
 
   mListView->saveLayout(config, config->group());
 }
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
@@ -59,12 +59,13 @@ friend class ContactListView;
     virtual void refresh(QString uid = QString::null);
     virtual QStringList selectedUids();
     virtual void setSelected(QString uid = QString::null, bool selected = false);
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *config);
     virtual QString type() const { return "Table"; }
+    void doSearch( const QString&  s ,KABC::Field *field );
 
   public slots:
     virtual void reconstructListView();
 
   protected slots:
     /** Called whenever the user selects an addressee in the list view.