7 files changed, 126 insertions, 5 deletions

diff --git a/kabc/address.cpp b/kabc/address.cpp
index 5ffe511..6151f9e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -103,2 +103,29 @@ QStringList Address::asList()
 }
+
+bool Address::matchAddress( QRegExp* re ) const
+{
+
+#if QT_VERSION >= 0x030000
+    if (re->search( mPostOfficeBox ) == 0) return true;
+    if (re->search( mExtended     ) == 0) return true;
+    if (re->search( mStreet     ) == 0) return true;
+    if (re->search( mLocality      ) == 0) return true;
+    if (re->search( mRegion      ) == 0) return true;
+    if (re->search( mPostalCode     ) == 0) return true;
+    if (re->search( mCountry     ) == 0) return true;
+    if (re->search( mLabel     ) == 0) return true;
+#else
+        if (re->match( mPostOfficeBox    ) == 0) return true;
+        if (re->match( mExtended     ) == 0) return true;
+        if (re->match( mStreet     ) == 0) return true;
+        if (re->match( mLocality     ) == 0) return true;
+        if (re->match( mRegion     ) == 0) return true;
+        if (re->match( mPostalCode     ) == 0) return true;
+        if (re->match( mCountry     ) == 0) return true;
+        if (re->match( mLabel    ) == 0) return true;
+#endif   
+
+    return false;
+}
+
 void Address::clear()
diff --git a/kabc/address.h b/kabc/address.h
index 37dd851..38ad20b 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -32,2 +32,3 @@ $Id$
 #include <qstring.h>
+#include <qregexp.h>
 #include <qstringlist.h>
@@ -97,2 +98,3 @@ class Address
     Address( int );
+    bool matchAddress( QRegExp* searchExp ) const;
 
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 155ce24..7e1e414 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -308,3 +308,28 @@ void Addressee::computeCsum(const QString &dev)
 }
+bool Addressee::matchAddress( QRegExp* re ) const
+{
+    KABC::Address::List::Iterator addressIter;
+    for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
+          ++addressIter ) {
+        if ( (*addressIter).matchAddress( re ) )
+            return true;
+    }
+   return false;
+}
+bool Addressee::matchPhoneNumber( QRegExp* re ) const
+{
+   KABC::PhoneNumber::List::Iterator phoneIter;
+
+   for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); ++phoneIter ) {
+#if QT_VERSION >= 0x030000
+                if (re->search( (*phoneIter).number() ) == 0)
+#else
+                    if (re->match( (*phoneIter).number() ) == 0)
+#endif   
+                        return true;
 
+   }
+   return false;
+
+}
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
diff --git a/kabc/addressee.h b/kabc/addressee.h
index a2fbcf5..d1c07cb 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -33,2 +33,3 @@ $Id$
 #include <qstring.h>
+#include <qregexp.h>
 #include <qstringlist.h>
@@ -652,2 +653,5 @@ class Addressee
 
+    bool matchPhoneNumber( QRegExp* searchExp ) const;
+    bool matchAddress( QRegExp* searchExp ) const;
+
     /**
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index ca21016..b503652 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -331,2 +331,3 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
                 continue;
+            bool match = false;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
@@ -340,2 +341,19 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
                                               addressBook(), *it, mCardView);
+                            match = true;
+                            break;
+                        }
+            }
+            if ( ! match ) {
+                if ( (*it).matchPhoneNumber( &re ) ) { 
+                    new AddresseeCardViewItem(fields(), mShowEmptyFields,
+                                              addressBook(), *it, mCardView);
+                    match = true;
+                    break;
+                }
+            }
+            if ( ! match ) {
+                if ( (*it).matchAddress( &re ) ) { 
+                    new AddresseeCardViewItem(fields(), mShowEmptyFields,
+                                              addressBook(), *it, mCardView);
+                    match = true;
                             break;
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 4bbdf1d..d6ddec3 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -152,3 +152,3 @@ class AddresseeIconViewItem : public QIconViewItem
         QPixmap icon;
-        QPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop, 128 ) );
+      
         KABC::Picture pic = mAddressee.photo();
@@ -165,9 +165,22 @@ class AddresseeIconViewItem : public QIconViewItem
 #else //KAB_EMBEDDED
+
+        int wid = pic.data().width();
+        int hei = pic.data().height(); 
+        int max = 48; 
+        if ( wid > max || hei > max ) {
+            if ( wid > hei ) {
+                hei = (hei*max)/wid;
+                wid = max;
+            } else {
+                wid = (wid*max)/hei;
+                hei = max;
+            }
+        }
         qDebug("AddresseeIconViewItem::refresh - scale here dependend of the displaysize and the right factor");
-          icon.convertFromImage(img.smoothScale(32, 32));
+        icon.convertFromImage(img.smoothScale(wid, hei));
 #endif //KAB_EMBEDDED
           
-      } else
-        icon = defaultIcon;
-
+        } else {
+            icon = KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop, 128 );
+        }
       setPixmap( icon );
@@ -285,2 +298,3 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
                 continue;
+            bool match = false;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
@@ -293,2 +307,17 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
                             mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
+                            match = true;
+                            break;
+                        }
+            } 
+            if ( ! match ) {
+                if ( (*it).matchPhoneNumber( &re ) ) { 
+                    mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
+                    match = true;
+                    break;
+                }
+            }
+            if ( ! match ) {
+                if ( (*it).matchAddress( &re ) ) { 
+                    mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
+                    match = true;
                             break;
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 348f491..02fc40a 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -172,2 +172,3 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
                 continue;
+            bool match = false;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
@@ -181,2 +182,17 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
                             ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
+                            match = true;
+                            break;
+                        }
+            }
+            if ( ! match ) {
+                if ( (*it).matchPhoneNumber( &re ) ) {
+                    ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
+                    match = true;
+                    break;
+                }
+            } 
+            if ( ! match ) {
+                if ( (*it).matchAddress( &re ) ) {
+                    ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
+                    match = true;
                             break;