Added senseful searching in Kapi

6 files changed, 150 insertions, 1 deletions

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
@@ -106,24 +106,25 @@ class AddresseeCardViewItem : public CardViewItem
 // AddresseeCardView
 
 AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
   : CardView(parent, name)
 {
   setAcceptDrops(true);
 }
 
 AddresseeCardView::~AddresseeCardView()
 {
 }
 
+
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KAB_EMBEDDED
   if (QTextDrag::canDecode(e))
     e->accept();
 #else //KAB_EMBEDDED
 qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented");
 #endif //KAB_EMBEDDED
 }
 
 void AddresseeCardView::dropEvent(QDropEvent *e)
 {
@@ -231,25 +232,75 @@ void KAddressBookCardView::readConfig(KConfig *config)
             this, SLOT(addresseeExecuted(CardViewItem *)));
   else
     connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
             this, SLOT(addresseeExecuted(CardViewItem *)));
   
 }
 
 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;
 
     for (item = mCardView->firstItem(); item; item = item->nextItem())
     {
         if (item->isSelected())
         {
 #ifndef KAB_EMBEDDED
             aItem = dynamic_cast<AddresseeCardViewItem*>(item);
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
@@ -45,25 +45,25 @@ class AddresseeCardView;
   This view uses the CardView class to create a card view. At some
   point in the future I think this will be the default view of
   KAddressBook.
  */
 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 *);
     
   public slots:
     void refresh(QString uid = QString::null);
     void setSelected(QString uid/*US = QString::null*/, bool selected/*US = true*/);
 //US added an additional method without parameter 
     void setSelected();
   
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
@@ -87,24 +87,25 @@ AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
   
 #ifndef KAB_EMBEDDED
 
   connect(this, SIGNAL(dropped(QDropEvent*, const QValueList<QIconDragItem>&)),
           this, SLOT(itemDropped(QDropEvent*, const QValueList<QIconDragItem>&)));
 #endif //KAB_EMBEDDED
 }
 
 AddresseeIconView::~AddresseeIconView()
 {
 }
 
+
 void AddresseeIconView::itemDropped(QDropEvent *e, 
                                     const QValueList<QIconDragItem> &)
 {
   emit addresseeDropped(e);
 }
 
 QDragObject *AddresseeIconView::dragObject()
 {
   emit startAddresseeDrag();
   
   // We never want IconView to start the drag
   return 0;
@@ -223,25 +224,71 @@ void KAddressBookIconView::readConfig(KConfig *config)
 /*US
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mIconView, SIGNAL(executed(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
   else
     connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)),
             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;
     
     for (item = mIconView->firstItem(); item; item = item->nextItem())
     {
         if (item->isSelected())
         {
 #ifndef KAB_EMBEDDED
             aItem = dynamic_cast<AddresseeIconViewItem*>(item);
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
@@ -49,24 +49,25 @@ namespace KABC { class AddressBook; }
 */
 class KAddressBookIconView : public KAddressBookView
 {
   Q_OBJECT
     
   public:
     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
 //MOC_SKIP_BEGIN
     void setSelected(QString uid = QString::null, bool selected = true);
 //MOC_SKIP_END
 #else //KAB_EMBEDDED
 //US my MOC do not like default parameters ???
     void setSelected(QString uid, bool selected);
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
@@ -103,24 +103,73 @@ void KAddressBookTableView::reconstructListView()
     connect(mListView, SIGNAL(signalDelete()),
           this, SLOT(addresseeDeleted()));
 
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
 
   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());
 }
 
 void KAddressBookTableView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig( config );
   // The config could have changed the fields, so we need to reconstruct
   // the listview.
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
@@ -53,24 +53,25 @@ friend class ContactListView;
 
   public:
     KAddressBookTableView( KABC::AddressBook *ab, QWidget *parent,
                            const char *name = 0 );
     virtual ~KAddressBookTableView();
 
     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.
     */
     void addresseeSelected();
     void addresseeDeleted();
 
     /** Called whenever the user executes an addressee. In terms of the
     * list view, this is probably a double click