7 files changed, 128 insertions, 7 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 5ffe511..6151f9e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -1,487 +1,514 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 //US added kglobal.h
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
 #include "address.h"
 using namespace KABC;
 QMap<QString, QString> Address::mISOMap;
 Address::Address() :
  mEmpty( true ), mType( 0 )
 {
  mId = KApplication::randomString( 10 );
 }
 Address::Address( int type ) :
  mEmpty( true ), mType( type )
 {
  mId = KApplication::randomString( 10 );
 }
 bool Address::operator==( const Address &a ) const
 {
  if ( mPostOfficeBox != a.mPostOfficeBox ) return false;
  if ( mExtended != a.mExtended ) return false;
  if ( mStreet != a.mStreet ) return false;
  if ( mLocality != a.mLocality ) return false;
  if ( mRegion != a.mRegion ) return false;
  if ( mPostalCode != a.mPostalCode ) return false;
  if ( mCountry != a.mCountry ) return false;
  if ( mLabel != a.mLabel ) return false;
  
  return true;
 }
 bool Address::operator!=( const Address &a ) const
 {
  return !( a == *this );
 }
 bool Address::isEmpty() const
 {
  if ( mPostOfficeBox.isEmpty() &&
       mExtended.isEmpty() &&
       mStreet.isEmpty() &&
       mLocality.isEmpty() &&
       mRegion.isEmpty() &&
       mPostalCode.isEmpty() &&
       mCountry.isEmpty() &&
       mLabel.isEmpty() ) {
    return true;
  }
  return false;
 }
 QStringList Address::asList()
 {
    QStringList result;
    if ( ! mPostOfficeBox.isEmpty() )result.append(mPostOfficeBox);
    if ( ! mExtended.isEmpty())result.append(mExtended);
    if ( ! mStreet.isEmpty())result.append(mStreet);
    if ( ! mLocality.isEmpty() )result.append(mLocality);
    if ( ! mRegion.isEmpty())result.append(mRegion);
    if ( ! mPostalCode.isEmpty())result.append(mPostalCode);
    if ( ! mCountry.isEmpty())result.append(mCountry);
    if ( ! mLabel.isEmpty() )result.append(mLabel);
    return result;
 }
+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()
 {
  *this = Address();
 }
 void Address::setId( const QString &id )
 {
  mEmpty = false;
  mId = id;
 }
 QString Address::id() const
 {
  return mId;
 }
 void Address::setType( int type )
 {
  mEmpty = false;
  mType = type;
 }
 int Address::type() const
 {
  return mType;
 }
 QString Address::typeLabel() const
 {
  QString label;
  bool first = true;
  TypeList list = typeList();
  TypeList::Iterator it;
  for ( it = list.begin(); it != list.end(); ++it ) {
    if ( ( type() & (*it) ) && ( (*it) != Pref ) ) {
      label.append( ( first ? "" : "/" ) + typeLabel( *it ) );
      if ( first )
        first = false;
    }
  }
  return label;
 }
 void Address::setPostOfficeBox( const QString &s )
 {
  mEmpty = false;
  mPostOfficeBox = s;
 }
 QString Address::postOfficeBox() const
 {
  return mPostOfficeBox;
 }
 QString Address::postOfficeBoxLabel()
 {
  return i18n("Post Office Box");
 }
 void Address::setExtended( const QString &s )
 {
  mEmpty = false;
  mExtended = s;
 }
 QString Address::extended() const
 {
  return mExtended;
 }
 QString Address::extendedLabel()
 {
  return i18n("Extended Address Information");
 }
 void Address::setStreet( const QString &s )
 {
  mEmpty = false;
  mStreet = s;
 }
 QString Address::street() const
 {
  return mStreet;
 }
 QString Address::streetLabel()
 {
  return i18n("Street");
 }
 void Address::setLocality( const QString &s )
 {
  mEmpty = false;
  mLocality = s;
 }
 QString Address::locality() const
 {
  return mLocality;
 }
 QString Address::localityLabel()
 {
  return i18n("Locality");
 }
 void Address::setRegion( const QString &s )
 {
  mEmpty = false;
  mRegion = s;
 }
 QString Address::region() const
 {
  return mRegion;
 }
 QString Address::regionLabel()
 {
  return i18n("Region");
 }
 void Address::setPostalCode( const QString &s )
 {
  mEmpty = false;
  mPostalCode = s;
 }
 QString Address::postalCode() const
 {
  return mPostalCode;
 }
 QString Address::postalCodeLabel()
 {
  return i18n("Postal Code");
 }
 void Address::setCountry( const QString &s )
 {
  mEmpty = false;
  mCountry = s;
 }
 QString Address::country() const
 {
  return mCountry;
 }
 QString Address::countryLabel()
 {
  return i18n("Country");
 }
 void Address::setLabel( const QString &s )
 {
  mEmpty = false;
  mLabel = s;
 }
 QString Address::label() const
 {
  return mLabel;
 }
 QString Address::labelLabel()
 {
  return i18n("Delivery Label");
 }
 Address::TypeList Address::typeList()
 {
  TypeList list;
  list << Dom << Intl << Postal << Parcel << Home << Work << Pref;
  return list;
 }
 QString Address::typeLabel( int type )
 {
    QString label;
    if ( type & Dom )
        label +=  i18n("Domestic")+" ";
    if ( type & Intl )
        label +=  i18n("International")+" ";
    if ( type &  Postal )
        label +=  i18n("Postal")+" ";
    if ( type & Parcel  )
        label +=  i18n("Parcel")+" ";
    if ( type & Work )
        label +=  i18n("Work Address", "Work")+" ";
    if ( type & Home )
        label +=  i18n("Home Address", "Home") +" ";
    if ( type & Pref )
        label +=  i18n("Preferred Address", "(p)");
    if ( label.isEmpty() )
        label =  i18n("Other");
    return label;
 #if 0
  switch ( type ) {
    case Dom:
      return i18n("Domestic");
      break;
    case Intl:
      return i18n("International");
      break;
    case Postal:
      return i18n("Postal");
      break;
    case Parcel:
      return i18n("Parcel");
      break;
    case Home:
      return i18n("Home Address", "Home");
      break;
    case Work:
      return i18n("Work Address", "Work");
      break;
    case Pref:
      return i18n("Preferred Address");
      break;
    default:
      return i18n("Other");
      break;
  }
 #endif
 }
 void Address::dump() const
 {
    qDebug("Address::dump() +++++++++++++++++ ");
 #if 0
  kdDebug(5700) << "  Address {" << endl;
  kdDebug(5700) << "    Id: " << id() << endl;
  kdDebug(5700) << "    Extended: " << extended() << endl;
  kdDebug(5700) << "    Street: " << street() << endl;
  kdDebug(5700) << "    Postal Code: " << postalCode() << endl;
  kdDebug(5700) << "    Locality: " << locality() << endl;
  kdDebug(5700) << "  }" << endl;
 #endif
 }
 QString Address::formattedAddress( const QString &realName
                                 , const QString &orgaName ) const
 {
  QString ciso;
  QString addrTemplate;
  QString ret;
  // **************************************************************
  // LR:  currently we have no iso handling - we will format the address manually here
 QString text;
      if ( !street().isEmpty() )
        text += street() + "\n";
      if ( !postOfficeBox().isEmpty() )
        text += postOfficeBox() + "\n";
      text += locality() + QString(" ") + region();
      if ( !postalCode().isEmpty() )
        text += QString(", ") + postalCode();
      text += "\n";
      if ( !country().isEmpty() )
        text += country() + "\n";
      text += extended();
  return text;
  // **************************************************************
  // FIXME: first check for iso-country-field and prefer that one
  if ( !country().isEmpty() ) {
    ciso = countryToISO( country() );
  } else {
    // fall back to our own country
    ciso = KGlobal::locale()->country();
  }
  //qDebug("ciso %s ",ciso.latin1() );
  KSimpleConfig entry( locate( "locale", 
        QString( "l10n/" ) + ciso + QString( "/entry.desktop" ) ) );
  entry.setGroup( "KCM Locale" );
  
  // decide whether this needs special business address formatting
  if ( orgaName.isNull() ) {
    addrTemplate = entry.readEntry( "AddressFormat" );
  } else {
    addrTemplate = entry.readEntry( "BusinessAddressFormat" );
    if ( addrTemplate.isEmpty() )
      addrTemplate = entry.readEntry( "AddressFormat" );
  }
  
  // in the case there's no format found at all, default to what we've always
  // used:
  if ( addrTemplate.isEmpty() ) {
      qDebug("address format database incomplete****************** ");
    kdWarning(5700) << "address format database incomplete "
        << "(no format for locale " << ciso 
        << " found). Using default address formatting." << endl;
    addrTemplate = "%0(%n\\n)%0(%cm\\n)%0(%s\\n)%0(PO BOX %p\\n)%0(%l%w%r)%,%z";
  }
  
  // scan
  parseAddressTemplateSection( addrTemplate, ret, realName, orgaName );
  // now add the country line if needed (formatting this time according to
  // the rules of our own system country )
  if ( !country().isEmpty() ) {
    KSimpleConfig entry( locate( "locale", QString( "l10n/" )
          + KGlobal::locale()->country() + QString( "/entry.desktop" ) ) );
    entry.setGroup( "KCM Locale" );
    QString cpos = entry.readEntry( "AddressCountryPosition" );
    if ( "BELOW" == cpos || cpos.isEmpty() ) {
      ret = ret + "\n\n" + country().upper();
    } else if ( "below" == cpos ) {
      ret = ret + "\n\n" + country();
    } else if ( "ABOVE" == cpos ) {
      ret = country().upper() + "\n\n" + ret;
    } else if ( "above" == cpos ) {
      ret = country() + "\n\n" + ret;
    }
  }
  
  return ret;
 }
 bool Address::parseAddressTemplateSection( const QString &tsection, 
    QString &result, const QString &realName, const QString &orgaName ) const
 {
  // This method first parses and substitutes any bracketed sections and
  // after that replaces any tags with their values. If a bracketed section
  // or a tag evaluate to zero, they are not just removed but replaced
  // with a placeholder. This is because in the last step conditionals are
  // resolved which depend on information about zero-evaluations.
  result = tsection;
  int stpos = 0;
  bool ret = false;
  
  // first check for brackets that have to be evaluated first 
  int fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
  while ( -1 != fpos ) {
    int bpos1 = fpos + KABC_FMTTAG_purgeempty.length();
    int bpos2;
    // expect opening bracket and find next balanced closing bracket. If 
    // next char is no opening bracket, continue parsing (no valid tag)
    if ( '(' == result[bpos1] ) {
      bpos2 = findBalancedBracket( result, bpos1 );
      if ( -1 != bpos2 ) {
        // we have balanced brackets, recursively parse:
        QString rplstr;
        bool purge = !parseAddressTemplateSection( result.mid( bpos1+1,
                                                   bpos2-bpos1-1 ), rplstr,
                                                   realName, orgaName );
        if ( purge ) {
          // purge -> remove all
          // replace with !_P_!, so conditional tags work later
diff --git a/kabc/address.h b/kabc/address.h
index 37dd851..38ad20b 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -1,348 +1,350 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_ADDRESS_H
 #define KABC_ADDRESS_H
 #include <qmap.h>
 #include <qstring.h>
+#include <qregexp.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 // template tags for address formatting localization
 #define KABC_FMTTAG_realname   QString("%n")
 #define KABC_FMTTAG_REALNAME   QString("%N")
 #define KABC_FMTTAG_company    QString("%cm")
 #define KABC_FMTTAG_COMPANY    QString("%CM")
 #define KABC_FMTTAG_pobox      QString("%p")
 #define KABC_FMTTAG_street     QString("%s")
 #define KABC_FMTTAG_STREET     QString("%S")
 #define KABC_FMTTAG_zipcode    QString("%z")
 #define KABC_FMTTAG_location   QString("%l")
 #define KABC_FMTTAG_LOCATION   QString("%L")
 #define KABC_FMTTAG_region     QString("%r")
 #define KABC_FMTTAG_REGION     QString("%R")
 #define KABC_FMTTAG_newline    QString("\\n")
 #define KABC_FMTTAG_condcomma  QString("%,")
 #define KABC_FMTTAG_condwhite  QString("%w")
 #define KABC_FMTTAG_purgeempty QString("%0")
 namespace KABC {
 /**
  @short Postal address information.
  
  This class represents information about a postal address.
 */
 class Address
 {
    friend QDataStream &operator<<( QDataStream &, const Address & );
    friend QDataStream &operator>>( QDataStream &, Address & );
  public:
    /**
      List of addresses.
    */
    typedef QValueList<Address> List;
    typedef QValueList<int> TypeList;
  
    /**
      Address types:
     
      @li @p Dom -    domestic
      @li @p Intl -   international
      @li @p Postal - postal
      @li @p Parcel - parcel
      @li @p Home -   home address
      @li @p Work -   address at work
      @li @p Pref -   preferred address
    */
    enum Type { Dom = 1, Intl = 2, Postal = 4, Parcel = 8, Home = 16, Work = 32,
           Pref = 64 };
    /**
      Constructor that creates an empty Address, which is initialized
      with a unique id (see @ref id()).
    */
    Address();
  
    /**
      This is like @ref Address() just above, with the difference
      that you can specify the type.
    */
    Address( int );
+    bool matchAddress( QRegExp* searchExp ) const;
    bool operator==( const Address & ) const;
    bool operator!=( const Address & ) const;
  
    /**
      Returns true, if the address is empty.
    */
    bool isEmpty() const;
    /**
      Clears all entries of the address.
    */
    void clear();
    QStringList asList();
    /**
      Sets the unique id.
    */
    void setId( const QString & );
    /*
      Returns the unique id.
    */
    QString id() const;
    /**
      Sets the type of address. See enum for definiton of types. 
     
      @param type type, can be a bitwise or of multiple types.
    */
    void setType( int type );
    /**
      Returns the type of address. Can be a bitwise or of multiple types.
    */
    int type() const;
    /**
      Returns a translated string of all types the address has.
    */
    QString typeLabel() const;
    /**
      Sets the post office box.
    */
    void setPostOfficeBox( const QString & );
    /**
      Returns the post office box.
    */
    QString postOfficeBox() const;
    /**
      Returns the translated label for post office box field.
    */
    static QString postOfficeBoxLabel();
    /**
      Sets the extended address information.
    */
    void setExtended( const QString & );
    /**
      Returns the extended address information.
    */
    QString extended() const;
    /**
      Returns the translated label for extended field.
    */
    static QString extendedLabel();
    
    /**
      Sets the street (including number).
    */
    void setStreet( const QString & );
    /**
      Returns the street.
    */
    QString street() const;
    /**
      Returns the translated label for street field.
    */
    static QString streetLabel();
    /**
      Sets the locality, e.g. city.
    */
    void setLocality( const QString & );
    /**
      Returns the locality.
    */
    QString locality() const;
    /**
      Returns the translated label for locality field.
    */
    static QString localityLabel();
    /**
      Sets the region, e.g. state.
    */
    void setRegion( const QString & );
    /**
      Returns the region.
    */
    QString region() const;
    /**
      Returns the translated label for region field.
    */
    static QString regionLabel();
 
    /**
      Sets the postal code.
    */
    void setPostalCode( const QString & );
    /**
      Returns the postal code.
    */
    QString postalCode() const;
    /**
      Returns the translated label for postal code field.
    */
    static QString postalCodeLabel();
    /**
      Sets the country.
    */
    void setCountry( const QString & );
    /**
      Returns the country.
    */
    QString country() const;
    /**
      Returns the translated label for country field.
    */
    static QString countryLabel();
    /**
      Sets the delivery label. This is the literal text to be used as label.
    */
    void setLabel( const QString & );
    /**
      Returns the delivery label.
    */
    QString label() const;
    /**
      Returns the translated label for delivery label field.
    */
    static QString labelLabel();
    /**
      Returns the list of available types.
    */
    static TypeList typeList();
    /**
      Returns the translated label for a special type.
    */
    static QString typeLabel( int type );
    /**
      Used for debug output.
    */
    void dump() const;
    /** 
      Returns this address formatted according to the country-specific
      address formatting rules. The formatting rules applied depend on 
      either the addresses {@link #country country} field, or (if the 
      latter is empty) on the system country setting. If companyName is
      provided, an available business address format will be preferred.
      
      @param realName   the formatted name of the contact
      @param orgaName   the name of the organization or company
      @return           the formatted address (containing newline characters)
    */
    QString formattedAddress( const QString &realName=QString::null
                            , const QString &orgaName=QString::null ) const;
    /**
      Returns ISO code for a localized country name. Only localized country
      names will be understood. This might be replaced by a KLocale method in
      the future.
      @param cname  name of the country
      @return       two digit ISO code
    */
    static QString countryToISO( const QString &cname );
    /**
      Returns a localized country name for a ISO code. 
      This might be replaced by a KLocale method in the future.
      @param ISOname two digit ISO code
      @return        localized name of the country
      @since 3.2
    */
    static QString ISOtoCountry( const QString &ISOname );
  private:
    /** 
      Parses a snippet of an address template
      @param tsection   the template string to be parsed
      @param result     QString reference in which the result will be stored
      @return           true if at least one tag evaluated positively, else false
    */
    bool parseAddressTemplateSection( const QString &tsection
                                    ,       QString &result
                                    , const QString &realName
                                    , const QString &orgaName ) const;
    /** 
      Finds the balanced closing bracket starting from the opening bracket at 
      pos in tsection.
      @return  position of closing bracket, -1 for unbalanced brackets
    */
    int  findBalancedBracket( const QString &tsection, int pos ) const;
    bool mEmpty;
  
    QString mId;
    int mType;
  
    QString mPostOfficeBox;
    QString mExtended;
    QString mStreet;
    QString mLocality;
    QString mRegion;
    QString mPostalCode;
    QString mCountry;
    QString mLabel;
    static QMap<QString, QString> mISOMap;
 };
 QDataStream &operator<<( QDataStream &, const Address & );
 QDataStream &operator>>( QDataStream &, Address & );
 }
 #endif
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 155ce24..7e1e414 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,693 +1,718 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kconfig.h>
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kidmanager.h>
 //US
 #include <kstandarddirs.h>
 #include <libkcal/syncdefines.h>
 //US #include "resource.h"
 #include "addressee.h"
 using namespace KABC;
 static bool matchBinaryPattern( int value, int pattern );
 static bool matchBinaryPatternA( int value, int pattern );
 static bool matchBinaryPatternP( int value, int pattern );
 struct Addressee::AddresseeData : public KShared
 {
  QString uid;
  QString name;
  QString formattedName;
  QString familyName;
  QString givenName;
  QString additionalName;
  QString prefix;
  QString suffix;
  QString nickName;
  QDateTime birthday;
  QString mailer;
  TimeZone timeZone;
  Geo geo;
  QString title;
  QString role;
  QString organization;
  QString note;
  QString productId;
  QDateTime revision;
  QString sortString;
  QString externalUID;
  QString originalExternalUID;
  KURL url;
  Secrecy secrecy;
  Picture logo;
  Picture photo;
  Sound sound;
  Agent agent;
  QString mExternalId;
  PhoneNumber::List phoneNumbers;
  Address::List addresses;
  Key::List keys;
  QStringList emails;
  QStringList categories;
  QStringList custom;
  int mTempSyncStat;
  Resource *resource;
  bool empty    :1;
  bool changed  :1;
  bool tagged   :1;
 };
 Addressee::Addressee()
 {
  mData = new AddresseeData;
  mData->empty = true;
  mData->changed = false;
  mData->resource = 0;
  mData->mExternalId = ":";
  mData->revision = QDateTime ( QDate( 2003,1,1));
  mData->mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 Addressee::~Addressee()
 {
 }
 Addressee::Addressee( const Addressee &a )
 {
  mData = a.mData;
 }
 Addressee &Addressee::operator=( const Addressee &a )
 {
  mData = a.mData;
  return (*this);
 }
 Addressee Addressee::copy()
 {
  Addressee a;
  *(a.mData) = *mData;
  return a;
 }
 void Addressee::detach()
 {
  if ( mData.count() == 1 ) return;
  *this = copy();
 }
 bool Addressee::operator==( const Addressee &a ) const
 {
  if ( uid() != a.uid() ) return false;
  if ( mData->name != a.mData->name ) return false;
  if ( mData->formattedName != a.mData->formattedName ) return false;
  if ( mData->familyName != a.mData->familyName ) return false;
  if ( mData->givenName != a.mData->givenName ) return false;
  if ( mData->additionalName != a.mData->additionalName ) return false;
  if ( mData->prefix != a.mData->prefix ) return false;
  if ( mData->suffix != a.mData->suffix ) return false;
  if ( mData->nickName != a.mData->nickName ) return false;
  if ( mData->birthday != a.mData->birthday ) return false;
  if ( mData->mailer != a.mData->mailer ) return false;
  if ( mData->timeZone != a.mData->timeZone ) return false;
  if ( mData->geo != a.mData->geo ) return false;
  if ( mData->title != a.mData->title ) return false;
  if ( mData->role != a.mData->role ) return false;
  if ( mData->organization != a.mData->organization ) return false;
  if ( mData->note != a.mData->note ) return false;
  if ( mData->productId != a.mData->productId ) return false;
  //if ( mData->revision != a.mData->revision ) return false;
  if ( mData->sortString != a.mData->sortString ) return false;
  if ( mData->secrecy != a.mData->secrecy ) return false;
  if ( mData->logo != a.mData->logo ) return false;
  if ( mData->photo != a.mData->photo ) return false;
  if ( mData->sound != a.mData->sound ) return false;
  if ( mData->agent != a.mData->agent ) return false;
  if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
       ( mData->url != a.mData->url ) ) return false;
  if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false;
  if ( mData->addresses != a.mData->addresses ) return false;
  if ( mData->keys != a.mData->keys ) return false;
  if ( mData->emails != a.mData->emails ) return false;
  if ( mData->categories != a.mData->categories ) return false;
  if ( mData->custom != a.mData->custom ) return false;
  return true;
 }
 bool Addressee::operator!=( const Addressee &a ) const
 {
  return !( a == *this );
 }
 bool Addressee::isEmpty() const
 {
  return mData->empty;
 }
 ulong  Addressee::getCsum4List( const QStringList &  attList)
 {
    int max = attList.count();
    ulong cSum = 0;
    int j,k,i;
    int add;
    for ( i = 0; i < max ; ++i ) {
        QString s = attList[i];
        if ( ! s.isEmpty() ){
            j = s.length();
            for ( k = 0; k < j; ++k ) {
                int mul = k +1;
                add = s[k].unicode ();
                if ( k < 16 )
                    mul = mul * mul;
                int ii = i+1;
                add = add * mul *ii*ii*ii;
                cSum += add;
                //qDebug("csum: %d %d %d", i,k,cSum); 
            }
        }
            
    }
    //QString dump = attList.join(",");
    //qDebug("csum: %d %s", cSum,dump.latin1()); 
    
    return cSum;
 }
 void Addressee::computeCsum(const QString &dev)
 {
    QStringList l;
    //if ( !mData->name.isEmpty() ) l.append(mData->name);
    //if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
    if ( !mData->familyName.isEmpty()  ) l.append( mData->familyName );
    if ( !mData->givenName.isEmpty() ) l.append(mData->givenName  );
    if ( !mData->additionalName.isEmpty()  ) l.append( mData->additionalName );
    if ( !mData->prefix.isEmpty()  ) l.append( mData->prefix );
    if ( !mData->suffix.isEmpty()  ) l.append( mData->suffix );
    if ( !mData->nickName.isEmpty()  ) l.append( mData->nickName );
    if ( mData->birthday.isValid()  ) l.append( mData->birthday.toString() );
    if ( !mData->mailer.isEmpty() ) l.append( mData->mailer );
    if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() );
    if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
    if ( !mData->title .isEmpty() ) l.append( mData->title );
    if ( !mData->role.isEmpty() ) l.append( mData->role );
    if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
    if ( !mData->note.isEmpty() ) l.append( mData->note ); 
    if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
    if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
    if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
    if ( !mData->logo.undefined() ) { 
        if ( !mData->logo.isIntern() )
            l.append( mData->logo.url() );
        else
            l.append( QString::number(mData->logo.data().width()* mData->logo.data().height()));
    } else {
        l.append( "nologo");
    }
    if ( !mData->photo.undefined() ) { 
        if ( !mData->photo.isIntern() )
            l.append( mData->photo.url() );
        else
            l.append( QString::number(mData->photo.data().width()* mData->photo.data().height()));
    } else {
        l.append( "nophoto");
    }
 #if 0
    if ( !mData->sound.undefined() ) { 
        if ( !mData->sound.isIntern() )
            l.append( mData->sound.url() );
        else
            l.append( QString(mData->sound.data().with()* mData->sound.data().height()));
    } else {
        l.append( "nosound");
    }
 #endif
    //if ( !mData->agent.isEmpty() ) l.append(  ); 
    if (  mData->url.isValid() )
        if ( ! mData->url.path().isEmpty()) l.append( mData->url.path()  ); 
    KABC::PhoneNumber::List phoneNumbers;
    KABC::PhoneNumber::List::Iterator phoneIter;
    QStringList t;
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter )
        t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) );
    t.sort();
    uint iii;
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->emails;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->categories;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->custom;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii) 
        if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) {
            int find = t[iii].find (':')+1;
            //qDebug("lennnn %d %d  ", find, t[iii].length());
            if ( find < t[iii].length())
                l.append( t[iii]  );
            
        }
    KABC::Address::List::Iterator addressIter;
    for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
          ++addressIter ) {
        t = (*addressIter).asList();
        t.sort();
        for ( iii = 0; iii < t.count(); ++iii)
            l.append( t[iii]  );
    }
    uint cs = getCsum4List(l);
 #if 0
    for ( iii = 0; iii < l.count(); ++iii)
        qDebug("%d***%s***",iii,l[iii].latin1());
    qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
 #endif
    
    setCsum( dev, QString::number (cs ));
 }
+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)
 {
    // merge all standard non-outlook fields. 
    //if isSubSet (e.g. mobile phone sync) merge all fields
    detach();
    if ( isSubSet ) {
        if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
        if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
        if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
        if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
        if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
        if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
        if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
        if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
        if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
        if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
        if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
        if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
        if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
        if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
        if ( !mData->birthday.isValid() ) 
            if ( ad.mData->birthday.isValid()) 
                mData->birthday =  ad.mData->birthday;
    }
    if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer;
    if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone;
    if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo;
    if ( mData->productId.isEmpty() ) mData->productId  = ad.mData->productId; 
    if ( mData->sortString.isEmpty() )  mData->sortString  = ad.mData->sortString; 
    QStringList t;
    QStringList tAD;
    uint iii;
    // ********** phone numbers
    if ( isSubSet ) {
        PhoneNumber::List phoneAD = ad.phoneNumbers();
        PhoneNumber::List::Iterator phoneItAD;
        for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
            bool found = false;
            PhoneNumber::List::Iterator it;
            for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
                if ( ( *phoneItAD ).contains( (*it)  ) ) {
                    found = true;
                    (*it).setType( ( *phoneItAD ).type() );
                    (*it).setNumber( ( *phoneItAD ).number() );
                    break;
                }
            }
            // if ( isSubSet && ! found ) 
            if (  ! found ) // LR try this one...
                mData->phoneNumbers.append( *phoneItAD );                
        }
    } else {
        PhoneNumber::List phoneAD = ad.phoneNumbers();
        PhoneNumber::List::Iterator phoneItAD;
        for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
            bool found = false;
            PhoneNumber::List::Iterator it;
            for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
                if ( ( *phoneItAD ).contains( (*it)  ) ) {
                    found = true;
                    (*it).setType( ( *phoneItAD ).type() );
                    (*it).setNumber( ( *phoneItAD ).number() );
                    break;
                }
            }
            if (  ! found ) { // append numbers which do not have work or home type
                if ( ! ( ( *phoneItAD ).type() &  (PhoneNumber::Work | PhoneNumber::Home) ) )
                    mData->phoneNumbers.append( *phoneItAD );   
            }             
        }
    }
    if ( isSubSet ) {
        // ************* emails;
        t = mData->emails;
        tAD = ad.mData->emails;
        for ( iii = 0; iii < tAD.count(); ++iii)
            if ( !t.contains(tAD[iii] ) )
                mData->emails.append( tAD[iii] );
    }
    // ************* categories;
    if ( isSubSet ) {
        t = mData->categories;
        tAD = ad.mData->categories;
        for ( iii = 0; iii < tAD.count(); ++iii)
            if ( !t.contains(tAD[iii] ) )
                mData->categories.append( tAD[iii] );
    }
    QStringList::ConstIterator it;
    for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) {
        QString qualifiedName = (*it).left( (*it).find( ":" )); 
        bool found = false;
        QStringList::ConstIterator itL;
        for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) {
            if ( (*itL).startsWith( qualifiedName ) ) {
                found = true;
                break;
            }
        }
        if ( ! found ) {
            mData->custom.append( *it );
        }
    }
    if ( mData->logo.undefined() && !ad.mData->logo.undefined() ) mData->logo = ad.mData->logo;
    if ( mData->photo.undefined() && !ad.mData->photo.undefined() ) mData->photo = ad.mData->photo;
    if ( !mData->sound.isIntern() ) {
        if ( mData->sound.url().isEmpty() ) {
            mData->sound = ad.mData->sound;
        }
    }
    if ( !mData->agent.isIntern() ) {
        if ( mData->agent.url().isEmpty() ) {
            mData->agent = ad.mData->agent;
        }
    }
    { 
        Key::List::Iterator itA;
        for( itA = ad.mData->keys.begin(); itA != ad.mData->keys.end(); ++itA ) {
            bool found = false;
            Key::List::Iterator it;
            for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
                if ( (*it) == (*itA)) {
                    found = true;
                    break;
                    
                }
            }
            if ( ! found ) {
                mData->keys.append( *itA );
            }
        }
    }
    if ( isSubSet ) {
        KABC::Address::List::Iterator addressIterA;
        for ( addressIterA = ad.mData->addresses.begin(); addressIterA != ad.mData->addresses.end(); ++addressIterA ) {
            bool found = false;
            KABC::Address::List::Iterator addressIter;
            for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
                  ++addressIter ) {
                if ( (*addressIter) == (*addressIterA)) {
                    found = true;
                    (*addressIter).setType( (*addressIterA).type() );
                    break;
                }
            }
            if ( isSubSet && ! found ) {
                mData->addresses.append( *addressIterA );
            }
        }
    }
    //qDebug("merge contact %s ", ad.uid().latin1());
    setUid( ad.uid() );
    setRevision( ad.revision() );
 }
 bool Addressee::removeVoice()
 {
    PhoneNumber::List phoneN = phoneNumbers();
    PhoneNumber::List::Iterator phoneIt;
    bool found = false;
    for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
        if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
            if ((*phoneIt).type() - PhoneNumber::Voice ) {
                (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
                insertPhoneNumber( (*phoneIt) );
                found = true;
            }
        }
        
    }
    return found;
 }
 bool Addressee::containsAdr(const Addressee& ad )
 {
    if ( ! ad.mData->familyName.isEmpty()  )  if ( mData->familyName  != ad.mData->familyName) return false;
    if ( ! ad.mData->givenName.isEmpty() )if (  mData->givenName   != ad.mData->givenName ) return false;
    if (  ad.mData->url.isValid() ) if (mData->url != ad.mData->url) return false ;
    if ( ! ad.mData->role.isEmpty() ) if (mData->role != ad.mData->role) return false ;
    if ( ! ad.mData->organization.isEmpty() ) if (mData->organization != ad.mData->organization) return false ; 
    if ( ! ad.mData->note.isEmpty() ) if (mData->note != ad.mData->note) return false ; 
    if ( ! ad.mData->title .isEmpty() ) if (mData->title != ad.mData->title ) return false ;
    // compare phone numbers
    PhoneNumber::List phoneN = ad.phoneNumbers();
    PhoneNumber::List::Iterator phoneIt;
    bool found = false;
    for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
        bool found = false;
        PhoneNumber::List phoneL = ad.phoneNumbers();
        PhoneNumber::List::Iterator phoneItL;
        for ( phoneItL = phoneL.begin(); phoneItL != phoneL.end(); ++phoneItL ) {
            if ( ( *phoneItL ).number() == ( *phoneIt ).number()  ) {
                found = true;
                break;
            }
        }
        if ( ! found )
            return false;
    }
    return true;
   
 }
 void Addressee::simplifyAddresses()
 {
    Address::List list;
    Address::List::Iterator it;
    Address::List::Iterator it2;
    for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
        it2 = it;
        ++it2;
        for( ; it2 != mData->addresses.end(); ++it2 ) {
            if ( (*it) == (*it2) ) {
                list.append( *it );
                break;
            }
        }
    }
    for( it = list.begin(); it != list.end(); ++it ) {
        removeAddress( (*it) );
    }
    list.clear();
    int max = 2;
    if (  mData->url.isValid() )
        max = 1; 
    if ( mData->addresses.count() <= max ) return ;
    int count = 0;
    for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
        if ( count >= max )
            list.append( *it );
        ++count;
    }
    for( it = list.begin(); it != list.end(); ++it ) {
        removeAddress( (*it) );
    }
 }
 // removes all emails but the first 
 // needed by phone sync
 void Addressee::simplifyEmails()
 { 
    if ( mData->emails.count() == 0 ) return ;
    QString email = mData->emails.first();
    detach();
    mData->emails.clear();
    mData->emails.append( email );
 }
 void Addressee::simplifyPhoneNumbers()
 {
    int max = 4;
    int inList = mData->phoneNumbers.count();
    KABC::PhoneNumber::List removeNumbers;
    KABC::PhoneNumber::List::Iterator phoneIter;
    if ( inList > max ) {
        // delete non-preferred numbers
        for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
              ++phoneIter ) {
            if ( inList > max ) {
                if ( ! (( *phoneIter ).type() &  PhoneNumber::Pref )) {
                    removeNumbers.append( ( *phoneIter ) );
                    --inList;
                }
            } else
                break;
        }
        for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
              ++phoneIter ) {
            removePhoneNumber(( *phoneIter ));
        }
        // delete preferred numbers
        if ( inList > max ) {
            for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
                  ++phoneIter ) {
                if ( inList > max ) {
                        removeNumbers.append( ( *phoneIter ) );
                        --inList;
                } else
                    break;
            }
            for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
                  ++phoneIter ) {
                removePhoneNumber(( *phoneIter ));
            }
        }
    }
    // remove non-numeric characters
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter ) {
        if ( ! ( *phoneIter ).simplifyNumber() )
            removeNumbers.append( ( *phoneIter ) );
    }
    for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
          ++phoneIter ) {
        removePhoneNumber(( *phoneIter ));
    }
 }
 void Addressee::simplifyPhoneNumberTypes()
 {
    KABC::PhoneNumber::List::Iterator phoneIter;
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter )
        ( *phoneIter ).simplifyType();
 }
 void Addressee::removeID(const QString &prof)
 {
    detach();
    if ( prof.isEmpty() )
        mData->mExternalId = ":";
    else
        mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
    
 }
 void Addressee::setID( const QString & prof , const QString & id )
 {
    detach();
    mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
    //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
 }
 void Addressee::setTempSyncStat( int id )
 {
    if ( mData->mTempSyncStat == id ) return;
    detach();
    mData->mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
    return mData->mTempSyncStat;
 }
 const QString Addressee::getID( const QString &  prof) const
 {
    return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
    detach();
    //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
    mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
    //qDebug("setcsum2 %s ",mData->mExternalId.latin1() );
 }
 const QString Addressee::getCsum( const QString &  prof) const 
 {
    return KIdManager::getCsum ( mData->mExternalId, prof ); 
 }
 void Addressee::setIDStr( const QString & s )
 { 
    detach();
    mData->mExternalId = s;
 }
 const QString Addressee::IDStr() const
 {
    return mData->mExternalId;
 }
 void Addressee::setExternalUID( const QString &id )
 {
  if ( id == mData->externalUID ) return;
  detach();
  mData->empty = false;
  mData->externalUID = id;
 }
 const QString Addressee::externalUID() const
 {
  return mData->externalUID;
 }
 void Addressee::setOriginalExternalUID( const QString &id )
 {
  if ( id == mData->originalExternalUID ) return;
  detach();
  mData->empty = false;
  //qDebug("*******Set orig uid %s ", id.latin1());
diff --git a/kabc/addressee.h b/kabc/addressee.h
index a2fbcf5..d1c07cb 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -1,855 +1,859 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_ADDRESSEE_H
 #define KABC_ADDRESSEE_H
 #include <qdatetime.h>
 #include <qstring.h>
+#include <qregexp.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 #include <ksharedptr.h>
 #include <kurl.h>
 #include "address.h"
 #include "agent.h"
 #include "geo.h"
 #include "key.h"
 #include "phonenumber.h"
 #include "picture.h"
 #include "secrecy.h"
 #include "sound.h"
 #include "timezone.h"
 namespace KABC {
 class Resource;
 /**
  @short address book entry
  This class represents an entry in the address book.
  The data of this class is implicitly shared. You can pass this class by value.
  If you need the name of a field for presenting it to the user you should use
  the functions ending in Label(). They return a translated string which can be
  used as label for the corresponding field.
  About the name fields:
  givenName() is the first name and familyName() the last name. In some
  countries the family name comes first, that's the reason for the
  naming. formattedName() is the full name with the correct formatting.
  It is used as an override, when the correct formatting can't be generated
  from the other name fields automatically.
  realName() returns a fully formatted name(). It uses formattedName, if set,
  otherwise it constucts the name from the name fields. As fallback, if
  nothing else is set it uses name().
  name() is the NAME type of RFC2426. It can be used as internal name for the
  data enty, but shouldn't be used for displaying the data to the user.
 */
 class Addressee
 {
    friend QDataStream &operator<<( QDataStream &, const Addressee & );
    friend QDataStream &operator>>( QDataStream &, Addressee & );
  public:
    typedef QValueList<Addressee> List;
    /**
      Construct an empty address book entry.
     */
    Addressee();
    ~Addressee();
    Addressee( const Addressee & );
    Addressee &operator=( const Addressee & );
    bool operator==( const Addressee & ) const;
    bool operator!=( const Addressee & ) const;
    // sync stuff
    void setTempSyncStat(int id);
    int tempSyncStat() const;
    void setIDStr( const QString & );
    const QString IDStr() const;
    void setID( const QString &, const QString & );
    const QString  getID( const QString & ) const;
    void setCsum( const QString &, const QString & );
    const QString getCsum( const QString & ) const ;
    void removeID(const QString &);
    void computeCsum(const QString &dev);
    ulong getCsum4List( const QStringList &  attList);
    /**
      Return, if the address book entry is empty.
     */
    bool isEmpty() const;
    void setExternalUID( const QString &id );
    const QString externalUID() const;
    void setOriginalExternalUID( const QString &id );
    QString originalExternalUID() const;
    void mergeContact(  const Addressee& ad, bool isSubSet ); 
    void simplifyEmails();
    void simplifyAddresses();
    void simplifyPhoneNumbers();
    void simplifyPhoneNumberTypes();
    bool removeVoice();
    bool containsAdr(const Addressee& addr );
    
    /**
      Set unique identifier.
     */
    void setUid( const QString &uid );
    /**
      Return unique identifier.
     */
    const QString uid() const;
    /**
      Return translated label for uid field.
     */
    static QString uidLabel();
    /**
      Set name.
     */
    void setName( const QString &name );
    /**
      Return name.
     */
    QString name() const;
    /**
      Return translated label for name field.
     */
    static QString nameLabel();
    /**
      Set formatted name.
     */
    void setFormattedName( const QString &formattedName );
    /**
      Return formatted name.
     */
    QString formattedName() const;
    /**
      Return translated label for formattedName field.
     */
    static QString formattedNameLabel();
    /**
      Set family name.
     */
    void setFamilyName( const QString &familyName );
    /**
      Return family name.
     */
    QString familyName() const;
    /**
      Return translated label for familyName field.
     */
    static QString familyNameLabel();
    /**
      Set given name.
     */
    void setGivenName( const QString &givenName );
    /**
      Return given name.
     */
    QString givenName() const;
    /**
      Return translated label for givenName field.
     */
    static QString givenNameLabel();
    /**
      Set additional names.
     */
    void setAdditionalName( const QString &additionalName );
    /**
      Return additional names.
     */
    QString additionalName() const;
    /**
      Return translated label for additionalName field.
     */
    static QString additionalNameLabel();
    /**
      Set honorific prefixes.
     */
    void setPrefix( const QString &prefix );
    /**
      Return honorific prefixes.
     */
    QString prefix() const;
    /**
      Return translated label for prefix field.
     */
    static QString prefixLabel();
    /**
      Set honorific suffixes.
     */
    void setSuffix( const QString &suffix );
    /**
      Return honorific suffixes.
     */
    QString suffix() const;
    /**
      Return translated label for suffix field.
     */
    static QString suffixLabel();
    /**
      Set nick name.
     */
    void setNickName( const QString &nickName );
    /**
      Return nick name.
     */
    QString nickName() const;
    /**
      Return translated label for nickName field.
     */
    static QString nickNameLabel();
    /**
      Set birthday.
     */
    void setBirthday( const QDateTime &birthday );
    /**
      Return birthday.
     */
    QDateTime birthday() const;
    /**
      Return translated label for birthday field.
     */
    static QString birthdayLabel();
    /**
      Return translated label for homeAddressStreet field.
     */
    static QString homeAddressStreetLabel();
    /**
      Return translated label for homeAddressLocality field.
     */
    static QString homeAddressLocalityLabel();
    /**
      Return translated label for homeAddressRegion field.
     */
    static QString homeAddressRegionLabel();
    /**
      Return translated label for homeAddressPostalCode field.
     */
    static QString homeAddressPostalCodeLabel();
    /**
      Return translated label for homeAddressCountry field.
     */
    static QString homeAddressCountryLabel();
    /**
      Return translated label for homeAddressLabel field.
     */
    static QString homeAddressLabelLabel();
    /**
      Return translated label for businessAddressStreet field.
     */
    static QString businessAddressStreetLabel();
    /**
      Return translated label for businessAddressLocality field.
     */
    static QString businessAddressLocalityLabel();
    /**
      Return translated label for businessAddressRegion field.
     */
    static QString businessAddressRegionLabel();
    /**
      Return translated label for businessAddressPostalCode field.
     */
    static QString businessAddressPostalCodeLabel();
    /**
      Return translated label for businessAddressCountry field.
     */
    static QString businessAddressCountryLabel();
    /**
      Return translated label for businessAddressLabel field.
     */
    static QString businessAddressLabelLabel();
    /**
      Return translated label for homePhone field.
     */
    static QString homePhoneLabel();
    /**
      Return translated label for businessPhone field.
     */
    static QString businessPhoneLabel();
    /**
      Return translated label for mobilePhone field.
     */
    static QString mobilePhoneLabel();
    static QString mobileWorkPhoneLabel();
    static QString mobileHomePhoneLabel();
    /**
      Return translated label for homeFax field.
     */
    static QString homeFaxLabel();
    /**
      Return translated label for businessFax field.
     */
    static QString businessFaxLabel();
    /**
      Return translated label for carPhone field.
     */
    static QString carPhoneLabel();
    /**
      Return translated label for isdn field.
     */
    static QString isdnLabel();
    /**
      Return translated label for pager field.
     */
    static QString pagerLabel();
    /**
      Return translated label for sip field.
     */
    static QString sipLabel();
    /**
      Return translated label for email field.
     */
    static QString emailLabel();
    /**
      Set mail client.
     */
    void setMailer( const QString &mailer );
    /**
      Return mail client.
     */
    QString mailer() const;
    /**
      Return translated label for mailer field.
     */
    static QString mailerLabel();
    /**
      Set time zone.
     */
    void setTimeZone( const TimeZone &timeZone );
    /**
      Return time zone.
     */
    TimeZone timeZone() const;
    /**
      Return translated label for timeZone field.
     */
    static QString timeZoneLabel();
    /**
      Set geographic position.
     */
    void setGeo( const Geo &geo );
    /**
      Return geographic position.
     */
    Geo geo() const;
    /**
      Return translated label for geo field.
     */
    static QString geoLabel();
    /**
      Set title.
     */
    void setTitle( const QString &title );
    /**
      Return title.
     */
    QString title() const;
    /**
      Return translated label for title field.
     */
    static QString titleLabel();
    /**
      Set role.
     */
    void setRole( const QString &role );
    /**
      Return role.
     */
    QString role() const;
    /**
      Return translated label for role field.
     */
    static QString roleLabel();
    /**
      Set organization.
     */
    void setOrganization( const QString &organization );
    /**
      Return organization.
     */
    QString organization() const;
    /**
      Return translated label for organization field.
     */
    static QString organizationLabel();
    /**
      Set note.
     */
    void setNote( const QString &note );
    /**
      Return note.
     */
    QString note() const;
    /**
      Return translated label for note field.
     */
    static QString noteLabel();
    /**
      Set product identifier.
     */
    void setProductId( const QString &productId );
    /**
      Return product identifier.
     */
    QString productId() const;
    /**
      Return translated label for productId field.
     */
    static QString productIdLabel();
    /**
      Set revision date.
     */
    void setRevision( const QDateTime &revision );
    /**
      Return revision date.
     */
    QDateTime revision() const;
    /**
      Return translated label for revision field.
     */
    static QString revisionLabel();
    /**
      Set sort string.
     */
    void setSortString( const QString &sortString );
    /**
      Return sort string.
     */
    QString sortString() const;
    /**
      Return translated label for sortString field.
     */
    static QString sortStringLabel();
    /**
      Set URL.
     */
    void setUrl( const KURL &url );
    /**
      Return URL.
     */
    KURL url() const;
    /**
      Return translated label for url field.
     */
    static QString urlLabel();
    /**
      Set security class.
     */
    void setSecrecy( const Secrecy &secrecy );
    /**
      Return security class.
     */
    Secrecy secrecy() const;
    /**
      Return translated label for secrecy field.
     */
    static QString secrecyLabel();
    /**
      Set logo.
     */
    void setLogo( const Picture &logo );
    /**
      Return logo.
     */
    Picture logo() const;
    /**
      Return translated label for logo field.
     */
    static QString logoLabel();
    /**
      Set photo.
     */
    void setPhoto( const Picture &photo );
    /**
      Return photo.
     */
    Picture photo() const;
    /**
      Return translated label for photo field.
     */
    static QString photoLabel();
    /**
      Set sound.
     */
    void setSound( const Sound &sound );
    /**
      Return sound.
     */
    Sound sound() const;
    /**
      Return translated label for sound field.
     */
    static QString soundLabel();
    /**
      Set agent.
     */
    void setAgent( const Agent &agent );
    /**
      Return agent.
     */
    Agent agent() const;
    /**
      Return translated label for agent field.
     */
    static QString agentLabel();
    /**
      Set name fields by parsing the given string and trying to associate the
      parts of the string with according fields. This function should probably
      be a bit more clever.
     */
    void setNameFromString( const QString & );
    /**
      Return the name of the addressee. This is calculated from all the name
      fields.
     */
    QString realName() const;
    /**
      Return the name that consists of all name parts.
     */
    QString assembledName() const;
    /**
      Return email address including real name.
      @param email Email address to be used to construct the full email string.
                   If this is QString::null the preferred email address is used.
     */
    QString fullEmail( const QString &email=QString::null ) const;
    /**
      Insert an email address. If the email address already exists in this
      addressee it is not duplicated.
      @param email Email address
      @param preferred Set to true, if this is the preferred email address of
                       the addressee.
     */
    void insertEmail( const QString &email, bool preferred=false );
    /**
      Remove email address. If the email address doesn't exist, nothing happens.
     */
    void removeEmail( const QString &email );
    /**
      Return preferred email address. This is the first email address or the
      last one added with @ref insertEmail() with a set preferred parameter.
     */
    QString preferredEmail() const;
    /**
      Return list of all email addresses.
     */
    QStringList emails() const;
    /**
       Set the emails to @param.
       The first email address gets the preferred one!
       @param list The list of email addresses.
     */
    void setEmails( const QStringList& list);
    /**
      Insert a phone number. If a phone number with the same id already exists
      in this addressee it is not duplicated.
     */
    void insertPhoneNumber( const PhoneNumber &phoneNumber );
    /**
      Remove phone number. If no phone number with the given id exists for this
      addresse nothing happens.
     */
    void removePhoneNumber( const PhoneNumber &phoneNumber );
    /**
      Return phone number, which matches the given type.
     */
    PhoneNumber phoneNumber( int type ) const;
+    bool matchPhoneNumber( QRegExp* searchExp ) const;
+    bool matchAddress( QRegExp* searchExp ) const;
    /**
      Return list of all phone numbers.
     */
    PhoneNumber::List phoneNumbers() const;
    /**
      Return list of phone numbers with a special type.
     */
    PhoneNumber::List phoneNumbers( int type ) const;
    /**
      Return phone number with the given id.
     */
    PhoneNumber findPhoneNumber( const QString &id ) const;
    /**
      Insert a key. If a key with the same id already exists
      in this addressee it is not duplicated.
     */
    void insertKey( const Key &key );
    /**
      Remove a key. If no key with the given id exists for this
      addresse nothing happens.
     */
    void removeKey( const Key &key );
    /**
      Return key, which matches the given type.
      If @p type == Key::Custom you can specify a string
      that should match. If you leave the string empty, the first
      key with a custom value is returned.
     */
    Key key( int type, QString customTypeString = QString::null ) const;
    /**
      Return list of all keys.
     */
    Key::List keys() const;
    /**
       Set the list of keys
       @param keys The keys to be set.
     */
    void setKeys( const Key::List& keys);
    /**
      Return list of keys with a special type.
      If @p type == Key::Custom you can specify a string
      that should match. If you leave the string empty, all custom
      keys will be returned.
     */
    Key::List keys( int type, QString customTypeString = QString::null  ) const;
    /**
      Return key with the given id.
     */
    Key findKey( const QString &id ) const;
    /**
      Insert an address. If an address with the same id already exists
      in this addressee it is not duplicated.
     */
    void insertAddress( const Address &address );
    /**
      Remove address. If no address with the given id exists for this
      addresse nothing happens.
     */
    void removeAddress( const Address &address );
    /**
      Return address, which matches the given type.
     */
    Address address( int type ) const;
    /**
      Return list of all addresses.
     */
    Address::List addresses() const;
    /**
      Return list of addresses with a special type.
     */
    Address::List addresses( int type ) const;
    /**
      Return address with the given id.
     */
    Address findAddress( const QString &id ) const;
    /**
      Insert category. If the category already exists it is not duplicated.
     */
    void insertCategory( const QString & );
    /**
      Remove category.
     */
    void removeCategory( const QString & );
    /**
      Return, if addressee has the given category.
     */
    bool hasCategory( const QString & ) const;
    /**
      Set categories to given value.
     */
    void setCategories( const QStringList & );
    /**
      Return list of all set categories.
     */
    QStringList categories() const;
    /**
      Insert custom entry. The entry is identified by the name of the inserting
      application and a unique name. If an entry with the given app and name
      already exists its value is replaced with the new given value.
     */
    void insertCustom( const QString &app, const QString &name,
                       const QString &value );
    /**
      Remove custom entry.
     */
    void removeCustom( const QString &app, const QString &name );
    /**
      Return value of custom entry, identified by app and entry name.
     */
    QString custom( const QString &app, const QString &name ) const;
    /**
      Set all custom entries.
     */
    void setCustoms( const QStringList & );
    /**
      Return list of all custom entries.
     */
    QStringList customs() const;
    /**
      Parse full email address. The result is given back in fullName and email.
     */
    static void parseEmailAddress( const QString &rawEmail, QString &fullName,
                                   QString &email );
    /**
      Debug output.
     */
    void dump() const;
    /**
      Returns string representation of the addressee.
     */
    QString asString() const;
    /**
      Set resource where the addressee is from.
     */
    void setResource( Resource *resource );
    /**
      Return pointer to resource.
     */
    Resource *resource() const;
    /**
      Return resourcelabel.
     */
    //US
    static QString resourceLabel();
    static QString categoryLabel();
    /**
            Mark addressee as changed.
           */
    void setChanged( bool value );
          /**
            Return whether the addressee is changed.
           */
    bool changed() const;
    void setTagged( bool value );
    bool tagged() const;
  private:
    Addressee copy();
    void detach();
    struct AddresseeData;
    mutable KSharedPtr<AddresseeData> mData;
 };
 QDataStream &operator<<( QDataStream &, const Addressee & );
 QDataStream &operator>>( QDataStream &, Addressee & );
 }
 #endif
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
@@ -1,507 +1,525 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qiconview.h>
 #include <qlayout.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qapplication.h>
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookcardview.h"
 #ifndef KAB_EMBEDDED
 extern "C" {
  void *init_libkaddrbk_cardview()
  {
    return ( new CardViewFactory );
  }
 }
 #endif //KAB_EMBEDDED
 ////////////////////////////////
 // AddresseeCardViewItem  (internal class)
 class AddresseeCardViewItem : public CardViewItem
 {
  public:
    AddresseeCardViewItem(const KABC::Field::List &fields,
                          bool showEmptyFields,
                          KABC::AddressBook *doc, const KABC::Addressee &a,
                          CardView *parent)
      : CardViewItem(parent, a.realName() ),
        mFields( fields ), mShowEmptyFields(showEmptyFields),
        mDocument(doc), mAddressee(a)
      {
          if ( mFields.isEmpty() ) {
            mFields = KABC::Field::defaultFields();
          }
          refresh();
      }
    const KABC::Addressee &addressee() const { return mAddressee; }
    void refresh()
    {
        // Update our addressee, since it may have changed elsewhere
        mAddressee = mDocument->findByUid(mAddressee.uid());
        if (!mAddressee.isEmpty())
        {
          clearFields();
          // Try all the selected fields until we find one with text.
          // This will limit the number of unlabeled icons in the view
          KABC::Field::List::Iterator iter;
          for (iter = mFields.begin(); iter != mFields.end(); ++iter)
          {
            // insert empty fields or not? not doing so saves a bit of memory and CPU
            // (during geometry calculations), but prevents having equally
            // wide label columns in all cards, unless CardViewItem/CardView search
            // globally for the widest label. (anders)
            //if (mShowEmptyFields || !(*iter)->value( mAddressee ).isEmpty())
              insertField((*iter)->label(), (*iter)->value( mAddressee ));
          }
          // We might want to make this the first field. hmm... -mpilone
          setCaption( mAddressee.realName() );
        }
    }
  private:
    KABC::Field::List mFields;
    bool mShowEmptyFields;
    KABC::AddressBook *mDocument;
    KABC::Addressee mAddressee;
 };
 ///////////////////////////////
 // AddresseeCardView
 AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
  : CardView(parent, name)
 {
  setAcceptDrops(true);
 }
 AddresseeCardView::~AddresseeCardView()
 {
 }
 void AddresseeCardView::printMe()
 {
 #ifdef DESKTOP_VERSION 
    QPrinter printer;
    if (!printer.setup() )
        return;
    QPainter p;
    p.begin ( &printer  );
    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
    float dx, dy;
    int wid = (m.width() * 9)/10;
    dx = (float) wid/(float)contentsWidth ();
    dy  = (float)(m.height()) / (float)contentsHeight ();
    float scale;
    // scale to fit the width or height of the paper
    if ( dx < dy )
        scale = dx;
    else
        scale = dy;
    p.translate( m.width()/10,0 );
    p.scale( scale, scale );
    drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
    p.end();
    repaint();
 #endif  
 }
 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)
 {
  emit addresseeDropped(e);
 }
 void AddresseeCardView::startDrag()
 {
  emit startAddresseeDrag();
 }
 ///////////////////////////////
 // KAddressBookCardView
 KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
                                            QWidget *parent, const char *name )
    : KAddressBookView( ab, parent, name )
 {
    mShowEmptyFields = false;
    // Init the GUI
    QVBoxLayout *layout = new QVBoxLayout(viewWidget());
    mCardView = new AddresseeCardView(viewWidget(), "mCardView");
    mCardView->setSelectionMode(CardView::Extended);
    layout->addWidget(mCardView);
    // Connect up the signals
    connect(mCardView, SIGNAL(executed(CardViewItem *)),
            this, SLOT(addresseeExecuted(CardViewItem *)));
    connect(mCardView, SIGNAL(selectionChanged()),
            this, SLOT(addresseeSelected()));
    connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)),
            this, SIGNAL(dropped(QDropEvent*)));
    connect(mCardView, SIGNAL(startAddresseeDrag()),
            this, SIGNAL(startDrag()));
    connect(this, SIGNAL(printView()),
            mCardView , SLOT(printMe()));
 }
 KAddressBookCardView::~KAddressBookCardView()
 {
 }
 void KAddressBookCardView::setFocusAV()
 {
    if ( mCardView )
        mCardView->setFocus();
 }
 void KAddressBookCardView::scrollUP()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mCardView, ev ); 
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mCardView, ev ); 
 }
 void KAddressBookCardView::scrollDOWN()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mCardView, ev ); 
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mCardView, ev ); 
 }
 void KAddressBookCardView::readConfig(KConfig *config)
 {
  KAddressBookView::readConfig(config);
  
  // costum colors?
  if ( config->readBoolEntry( "EnableCustomColors", false ) )
  {
    QPalette p( mCardView->palette() );
    QColor c = p.color(QPalette::Normal, QColorGroup::Base );
    p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::Text );
    p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::Button );
    p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::ButtonText );
    p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::Highlight );
    p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
    p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
    mCardView->viewport()->setPalette( p );
  }
  else
  {
    // needed if turned off during a session.
    mCardView->viewport()->setPalette( mCardView->palette() );
  }
  
  //custom fonts?
  QFont f( font() );
  if ( config->readBoolEntry( "EnableCustomFonts", false ) )
  {
    mCardView->setFont( config->readFontEntry( "TextFont", &f) );
    f.setBold( true );
    mCardView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
  }
  else
  {
    mCardView->setFont( f );
    f.setBold( true );
    mCardView->setHeaderFont( f );
  }  
  
  mCardView->setDrawCardBorder(config->readBoolEntry("DrawBorder", true));
  mCardView->setDrawColSeparators(config->readBoolEntry("DrawSeparators",
                                                        true));
  mCardView->setDrawFieldLabels(config->readBoolEntry("DrawFieldLabels",false));
  mShowEmptyFields = config->readBoolEntry("ShowEmptyFields", false);
  
  mCardView->setShowEmptyFields( mShowEmptyFields );
  
  mCardView->setItemWidth( config->readNumEntry( "ItemWidth", 200 ) );
  mCardView->setItemMargin( config->readNumEntry( "ItemMargin", 0 ) );
  mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) );
  mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) );
  
 #if 0 
  // LR KABPrefs::instance()->mHonorSingleClick is handled and fixed in cardviews contentsMouseDoubleClickEven
  disconnect(mCardView, SIGNAL(executed(CardViewItem *)),
            this, SLOT(addresseeExecuted(CardViewItem *)));
  if (KABPrefs::instance()->mHonorSingleClick)
    connect(mCardView, SIGNAL(executed(CardViewItem *)),
            this, SLOT(addresseeExecuted(CardViewItem *)));
  else
    connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
            this, SLOT(addresseeExecuted(CardViewItem *)));
 #endif
  
    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;
    }  
    QRegExp re = getRegExp( s );
    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 ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
            if (re.search(field->value( *it ).lower()) == 0)
 #else
                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                  new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                              addressBook(), *it, mCardView);
        }
    } else {
        KABC::Field::List fieldList = allFields();
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
+            bool match = false;
            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 0x030000
                if (re.search((*fieldIt)->value( *it ).lower()) == 0)
 #else
                    if (re.match((*fieldIt)->value( *it ).lower()) == 0)
 #endif   
                        { 
-                           new AddresseeCardViewItem(fields(), mShowEmptyFields,
+                            new AddresseeCardViewItem(fields(), mShowEmptyFields,
-                                              addressBook(), *it, mCardView);
+                                                      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;
+                }
+            }
        }
    }
    mCardView->viewport()->setUpdatesEnabled( true );
    mCardView->viewport()->update();
    if ( mCardView->firstItem() ) {
        mCardView->setCurrentItem ( mCardView->firstItem() );
        mCardView->setSelected ( mCardView->firstItem() , true );
    }
    else
        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);
 #else //KAB_EMBEDDED
            aItem = (AddresseeCardViewItem*)(item);
 #endif //KAB_EMBEDDED
            if (aItem)
                uidList << aItem->addressee().uid();
        }
    }
    return uidList;
 }
 void KAddressBookCardView::refresh(QString uid)
 {
    CardViewItem *item;
    AddresseeCardViewItem *aItem;
    if (uid.isNull())
    {
        // Rebuild the view
        mCardView->viewport()->setUpdatesEnabled( false );
        mCardView->clear();
        KABC::Addressee::List addresseeList = addressees();
        KABC::Addressee::List::Iterator iter;
        for (iter = addresseeList.begin(); iter != addresseeList.end(); ++iter)
        {
            if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") )
                continue;
            aItem = new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                              addressBook(), *iter, mCardView);
        }
        mCardView->viewport()->setUpdatesEnabled( true );
        mCardView->viewport()->update();
        // by default nothing is selected
        emit selected(QString::null);
    }
    else
    {
        // Try to find the one to refresh
        bool found = false;
        for (item = mCardView->firstItem(); item && !found;
             item = item->nextItem())
        {
 #ifndef KAB_EMBEDDED
            aItem = dynamic_cast<AddresseeCardViewItem*>(item);
 #else //KAB_EMBEDDED
            aItem = (AddresseeCardViewItem*)(item);
 #endif //KAB_EMBEDDED
            
            if ((aItem) && (aItem->addressee().uid() == uid))
            {
                aItem->refresh();
                found = true;
            }
        }
    }
 }
 void KAddressBookCardView::setSelected(QString uid, bool selected)
 {
    CardViewItem *item;
    AddresseeCardViewItem *aItem;
    if (uid.isNull())
    {
        mCardView->selectAll(selected);
    }
    else
    {
        bool found = false;
        for (item = mCardView->firstItem(); item && !found;
             item = item->nextItem())
         {
 #ifndef KAB_EMBEDDED
             aItem = dynamic_cast<AddresseeCardViewItem*>(item);
 #else //KAB_EMBEDDED
            aItem = (AddresseeCardViewItem*)(item);
 #endif //KAB_EMBEDDED
             if ((aItem) && (aItem->addressee().uid() == uid))
             {
                 mCardView->setSelected(aItem, selected);
                 mCardView->ensureItemVisible(item);
                 found = true;
             }
         }
    }
 }
 //US added an additional method without parameter 
 void KAddressBookCardView::setSelected()
 {
  setSelected(QString::null, true);
 }
 void KAddressBookCardView::addresseeExecuted(CardViewItem *item)
 {
 #ifndef KAB_EMBEDDED
    AddresseeCardViewItem *aItem = dynamic_cast<AddresseeCardViewItem*>(item);
 #else //KAB_EMBEDDED
    AddresseeCardViewItem *aItem = (AddresseeCardViewItem*)(item);
 #endif //KAB_EMBEDDED
    if (aItem)
    {
      //kdDebug()<<"... even has a valid item:)"<<endl;
      emit executed(aItem->addressee().uid());
    }
 }
 void KAddressBookCardView::addresseeSelected()
 {
    CardViewItem *item;
    AddresseeCardViewItem *aItem;
    bool found = false;
    for (item = mCardView->firstItem(); item && !found;
         item = item->nextItem())
    {
        if (item->isSelected())
        {
 #ifndef KAB_EMBEDDED
            aItem = dynamic_cast<AddresseeCardViewItem*>(item);
 #else //KAB_EMBEDDED
            aItem = (AddresseeCardViewItem*)(item);
 #endif //KAB_EMBEDDED
            if ( aItem )
            {
                emit selected(aItem->addressee().uid());
                found = true;
            }
        }
    }
    if (!found)
        emit selected(QString::null);
 }
 #ifndef KAB_EMBEDDED
 #include "kaddressbookcardview.moc"
 #endif //KAB_EMBEDDED
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
@@ -1,452 +1,481 @@
 /*
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef KAB_EMBEDDED
 #include <qiconview.h>
 #include <qstringlist.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #else //KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 #include <kabc/addressbook.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookiconview.h"
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qapplication.h>
 #include <kglobal.h>
 /*US transfered to the headerfile
 class IconViewFactory : public ViewFactory
 {
  public:
    KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
    {
      return new KAddressBookIconView( ab, parent, name );
    }
    QString type() const { return "Icon"; }
    
    QString description() const { return i18n( "Icons represent contacts. Very simple view." ); }
 };
 */
 extern "C" {
  void *init_libkaddrbk_iconview()
  {
    return ( new IconViewFactory );
  }
 }
 ////////////////////////////////
 // AddresseeIconView (internal class)
 #ifndef KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
  : KIconView(parent, name)
 #else //KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
  : QIconView(parent, name)
 #endif //KAB_EMBEDDED
 {
  setSelectionMode( QIconView::Extended );
  setResizeMode( QIconView::Adjust );
  setWordWrapIconText( true );
  setGridX( 100 );
  setItemsMovable(false);
  setSorting(true, true);
  
 //US ???  setMode( KIconView::Select );
  
 #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;
 }
 ////////////////////////////////
 // AddresseeIconViewItem  (internal class)
 #ifndef KAB_EMBEDDED
 class AddresseeIconViewItem : public KIconViewItem
 #else //KAB_EMBEDDED
 class AddresseeIconViewItem : public QIconViewItem
 #endif //KAB_EMBEDDED
 {
  public:
 #ifndef KAB_EMBEDDED
    AddresseeIconViewItem(const KABC::Field::List &fields,
                          KABC::AddressBook *doc, const KABC::Addressee &a, 
                          QIconView *parent)
      : KIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #else //KAB_EMBEDDED
    AddresseeIconViewItem(const KABC::Field::List &fields,
                          KABC::AddressBook *doc, const KABC::Addressee &a,
                          QIconView *parent)
      : QIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #endif //KAB_EMBEDDED
      {
          if ( mFields.isEmpty() ) {
            mFields = KABC::Field::defaultFields();
          }
          refresh();
      }
      
    const KABC::Addressee &addressee() const { return mAddressee; }
    
    void refresh()
    {
        // Update our addressee, since it may have changed elsewhere
        mAddressee = mDocument->findByUid(mAddressee.uid());
        
        if (!mAddressee.isEmpty())
          setText( mAddressee.givenName() + " " + mAddressee.familyName() );
        QPixmap icon;
-        QPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop, 128 ) );
+      
        KABC::Picture pic = mAddressee.photo();
        if ( pic.data().isNull() )
          pic = mAddressee.logo();
        if ( pic.isIntern() && !pic.data().isNull() ) {
          QImage img = pic.data();
 #ifndef KAB_EMBEDDED
        if ( img.width() > img.height() )
          icon = img.scaleWidth( 32 );
        else
          icon = img.scaleHeight( 32 );
 #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
+        } else {
-        icon = defaultIcon;
+            icon = KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop, 128 );
+        }
      setPixmap( icon );
    }
    
  private:
    KABC::Field::List mFields;
    KABC::AddressBook *mDocument;
    KABC::Addressee mAddressee;
 };
 ///////////////////////////////
 // KAddressBookView
 KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab,
                                            QWidget *parent, const char *name)
    : KAddressBookView( ab, parent, name )
 {
    // Init the GUI
    QVBoxLayout *layout = new QVBoxLayout(viewWidget());
    
    mIconView = new AddresseeIconView(viewWidget(), "mIconView");
    layout->addWidget(mIconView);
    
    // Connect up the signals
    
 //US method executed is part of KIconView
 //US    connect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US            this, SLOT(addresseeExecuted(QIconViewItem *)));
    connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
            this, SLOT(addresseeExecuted(QIconViewItem *)));
    
    connect(mIconView, SIGNAL(selectionChanged()),
            this, SLOT(addresseeSelected()));
    connect(mIconView, SIGNAL(addresseeDropped(QDropEvent*)),
            this, SIGNAL(dropped(QDropEvent*)));
    connect(mIconView, SIGNAL(startAddresseeDrag()),
            this, SIGNAL(startDrag()));
 }
 KAddressBookIconView::~KAddressBookIconView()
 {
 }
 void KAddressBookIconView::setFocusAV()
 {
    if ( mIconView )
        mIconView->setFocus();
 }
 void KAddressBookIconView::scrollUP()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mIconView, ev ); 
 }
 void KAddressBookIconView::scrollDOWN()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mIconView, ev );
 }
 void KAddressBookIconView::readConfig(KConfig *config)
 {
  KAddressBookView::readConfig(config);
    
 //US method executed is part of KIconView
 //US  disconnect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US             this, SLOT(addresseeExecuted(QIconViewItem *)));
  disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
 //US method executed is part of KIconView. Use selectionChanged instead
 /*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;
    }  
    QRegExp re = getRegExp( s );
    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 ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
            if (re.search(field->value( *it ).lower()) == 0)
 #else
                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                    mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                 
        }
    } else {
        KABC::Field::List fieldList = allFields();
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
+            bool match = false;
            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 0x030000
                if (re.search((*fieldIt)->value( *it ).lower()) == 0)
 #else
                    if (re.match((*fieldIt)->value( *it ).lower()) == 0)
 #endif   
                        { 
                            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;
+                }
            }
        }
    }
    mIconView->arrangeItemsInGrid( true ); 
    if ( mIconView->firstItem() ) {
        mIconView->setCurrentItem ( mIconView->firstItem() );
        mIconView->setSelected ( mIconView->firstItem() , true );
    }
    else
        emit selected(QString::null);
 }
 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);
 #else //KAB_EMBEDDED
            aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
            if (aItem)
                uidList << aItem->addressee().uid();
        }
    }
    
    return uidList;
 }
    
 void KAddressBookIconView::refresh(QString uid)
 {
  QIconViewItem *item;
  AddresseeIconViewItem *aItem;
    
  if ( uid.isNull() ) {
    // Rebuild the view
    mIconView->clear();
    mIconList.clear();
        
    KABC::Addressee::List addresseeList = addressees();
    KABC::Addressee::List::Iterator iter;
    for ( iter = addresseeList.begin(); iter != addresseeList.end(); ++iter ) {
        if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") )
                continue;
        aItem = new AddresseeIconViewItem( fields(), addressBook(), *iter, mIconView );
    }
    mIconView->arrangeItemsInGrid( true );
    for ( item = mIconView->firstItem(); item; item = item->nextItem() )
        {
 #ifndef KAB_EMBEDDED
          AddresseeIconViewItem* aivi = dynamic_cast<AddresseeIconViewItem*>( item );
 #else //KAB_EMBEDDED
          AddresseeIconViewItem* aivi = (AddresseeIconViewItem*)( item );
 #endif //KAB_EMBEDDED
      mIconList.append( aivi );
        }
  } else {
    // Try to find the one to refresh
    for ( item = mIconView->firstItem(); item; item = item->nextItem() ) {
 #ifndef KAB_EMBEDDED
      aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
      aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
      if ((aItem) && (aItem->addressee().uid() == uid)) {
        aItem->refresh();
        mIconView->arrangeItemsInGrid( true );
        return;
      }
    }
    refresh( QString::null );
  }
 }
 void KAddressBookIconView::setSelected(QString uid, bool selected)
 {
    QIconViewItem *item;
    AddresseeIconViewItem *aItem;
    
    if (uid.isNull())
    {
        mIconView->selectAll(selected);
    }
    else
    {
        bool found = false;
        for (item = mIconView->firstItem(); item && !found; 
             item = item->nextItem())
         {
 #ifndef KAB_EMBEDDED
             aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
             aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
             if ((aItem) && (aItem->addressee().uid() == uid))
             {
                 mIconView->setSelected(aItem, selected);
                 mIconView->ensureItemVisible( aItem );
                 found = true;
             }
         }
    }
 }
   
 void KAddressBookIconView::addresseeExecuted(QIconViewItem *item)
 {
 #ifndef KAB_EMBEDDED
    AddresseeIconViewItem *aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
    AddresseeIconViewItem *aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
    if (aItem) {
        emit executed(aItem->addressee().uid());
    }
 }
 void KAddressBookIconView::addresseeSelected()
 {
    QIconViewItem *item;
    AddresseeIconViewItem *aItem;
    
    bool found = false;
    for (item = mIconView->firstItem(); item && !found; 
         item = item->nextItem())
    {
      if (item->isSelected())
      {
 #ifndef KAB_EMBEDDED
        aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
        aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
        if (aItem)
        {
          emit selected(aItem->addressee().uid());
          found = true;
        }
      }
    }
    
    if (!found)
        emit selected(QString::null);
 }
 #ifndef KAB_EMBEDDED
 #include "kaddressbookiconview.moc"
 #endif //KAB_EMBEDDED
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
@@ -1,474 +1,490 @@
 // $Id$
 #include <qvbox.h>
 #include <qlistbox.h>
 #include <qwidget.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qcombobox.h>
 #include <qapplication.h>
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qurl.h>
 #include <qpixmap.h>
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 //US#include "configuretableviewdialog.h"
 #include "contactlistview.h"
 #include "kabprefs.h"
 #include "undocmds.h"
 #include "viewmanager.h"
 #include <qlayout.h>
 #include <qheader.h>
 #include <qregexp.h>
 #include "kaddressbooktableview.h"
 KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
                                              QWidget *parent, const char *name )
  : KAddressBookView( ab, parent, name )
 {
  mainLayout = new QVBoxLayout( viewWidget(), 2 );
  // The list view will be created when the config is read.
  mListView = 0;
 }
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
 void KAddressBookTableView::setFocusAV()
 {
    if ( mListView )
        mListView->setFocus();
 }
 void KAddressBookTableView::scrollUP()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mListView, ev );  
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mListView, ev ); 
 }
 void KAddressBookTableView::scrollDOWN()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mListView, ev );
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mListView, ev ); 
 }
 void KAddressBookTableView::reconstructListView()
 {
    if (mListView)
    {
        disconnect(mListView, SIGNAL(selectionChanged()),
                   this, SLOT(addresseeSelected()));
        disconnect(mListView, SIGNAL(executed(QListViewItem*)),
                   this, SLOT(addresseeExecuted(QListViewItem*)));
        disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
                   this, SLOT(addresseeExecuted(QListViewItem*)));
        disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                   SIGNAL(startDrag()));
        disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
          this, SLOT(addresseeExecuted(QListViewItem*)));
        disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
                   SIGNAL(dropped(QDropEvent*)));
        delete mListView;
    }
  mListView = new ContactListView( this, addressBook(), viewWidget() );
  
    connect(this, SIGNAL(printView()),
            mListView , SLOT(printMe()));
  //US set singleClick manually, because it is no global configparameter in embedded space 
  mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick);
  // Add the columns
  KABC::Field::List fieldList = fields();
  KABC::Field::List::ConstIterator it;
  int c = 0;
  for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
      mListView->addColumn( (*it)->label() );
      mListView->setColumnWidthMode(c++, QListView::Manual);
 //US
      //  qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
  }
  connect(mListView, SIGNAL(selectionChanged()),
          this, SLOT(addresseeSelected()));
  connect(mListView, SIGNAL(startAddresseeDrag()), this,
          SIGNAL(startDrag()));
  connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
          SIGNAL(dropped(QDropEvent*)));
  if (KABPrefs::instance()->mHonorSingleClick) {
    //    qDebug("KAddressBookTableView::reconstructListView single");
    connect(mListView, SIGNAL(executed(QListViewItem*)),
          this, SLOT(addresseeExecuted(QListViewItem*)));
  } else {
    //    qDebug("KAddressBookTableView::reconstructListView double");
    connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
          this, SLOT(addresseeExecuted(QListViewItem*)));
  }
    connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
          this, SLOT(addresseeExecuted(QListViewItem*)));
    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;
    }  
    QRegExp re = getRegExp( s );
    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 ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
            if (re.search(field->value( *it ).lower()) == 0)
 #else
                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                    ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
        }
    } else {
        KABC::Field::List fieldList = allFields();
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
+            bool match = false;
            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 0x030000
                if (re.search((*fieldIt)->value( *it ).lower()) == 0)
 #else
                    if (re.match((*fieldIt)->value( *it ).lower()) == 0)
 #endif   
                        { 
                            //qDebug("match %s %s %s", pattern.latin1(), (*fieldIt)->value( *it ).latin1(), (*fieldIt)->label().latin1()  );
                            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;
+                }
+            }
        }
    }
    // Sometimes the background pixmap gets messed up when we add lots
    // of items.
    //mListView->repaint();
    if ( mListView->firstChild() ) {
        mListView->setCurrentItem ( mListView->firstChild() );
        mListView->setSelected ( mListView->firstChild(), true );
    }
    else
        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.
  reconstructListView();
  // costum colors?
  if ( config->readBoolEntry( "EnableCustomColors", false ) )
  {
    QPalette p( mListView->palette() );
    QColor c = p.color(QPalette::Normal, QColorGroup::Base );
    p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::Text );
    p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::Button );
    p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::ButtonText );
    p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::Highlight );
    p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
    c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
    p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
 #ifndef KAB_EMBEDDED  
  c = KGlobalSettings::alternateBackgroundColor();
 #else //KAB_EMBEDDED  
  c = QColor(240, 240, 240);
 #endif //KAB_EMBEDDED  
    c = config->readColorEntry ("AlternatingBackgroundColor", &c);
    mListView->setAlternateColor(c);
    //US    mListView->viewport()->setPalette( p );
    mListView->setPalette( p );
  }
  else
  {
    // needed if turned off during a session.
    //US    mListView->viewport()->setPalette( mListView->palette() );
    mListView->setPalette( mListView->palette() );
  }
  
  //custom fonts?
  QFont f( font() );
  if ( config->readBoolEntry( "EnableCustomFonts", false ) )
  {
    mListView->setFont( config->readFontEntry( "TextFont", &f) );
    f.setBold( true );
    //US    mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
    mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) );
  }
  else
  {
    mListView->setFont( f );
    f.setBold( true );
    //US    mListView->setHeaderFont( f );
    mListView->header()->setFont( f );
  }  
  // Set the list view options
  mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
                                                                 true));
  mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));
  mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true));
  if (config->readBoolEntry("Background", false))
    mListView->setBackgroundPixmap(config->readEntry("BackgroundName"));
  // Restore the layout of the listview
  mListView->restoreLayout(config, config->group());
 }
 void KAddressBookTableView::refresh(QString uid)
 {
  // For now just repopulate. In reality this method should
  // check the value of uid, and if valid iterate through
  // the listview to find the entry, then tell it to refresh.
  if (uid.isNull()) {
    // Clear the list view
    QString currentUID, nextUID;
 #ifndef KAB_EMBEDDED
    ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() );
 #else //KAB_EMBEDDED
    ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() );
 #endif //KAB_EMBEDDED
    if ( currentItem ) {
 #ifndef KAB_EMBEDDED
      ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() );
 #else //KAB_EMBEDDED
      ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() );
 #endif //KAB_EMBEDDED
      if ( nextItem )
        nextUID = nextItem->addressee().uid();
      currentUID = currentItem->addressee().uid();
    }
    mListView->clear();
    currentItem = 0;
    KABC::Addressee::List addresseeList = addressees();
    KABC::Addressee::List::Iterator it;
    for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
        if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
            continue;
      ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
      if ( (*it).uid() == currentUID )
        currentItem = item;
      else if ( (*it).uid() == nextUID && !currentItem )
        currentItem = item;
    }
    // Sometimes the background pixmap gets messed up when we add lots
    // of items.
    mListView->repaint();
    if ( currentItem ) {
      mListView->setCurrentItem( currentItem );
      mListView->ensureItemVisible( currentItem );
    }
  } else {
    // Only need to update on entry. Iterate through and try to find it
    ContactListViewItem *ceItem;
    QListViewItemIterator it( mListView );
    while ( it.current() ) {
 #ifndef KAB_EMBEDDED
      ceItem = dynamic_cast<ContactListViewItem*>( it.current() );
 #else //KAB_EMBEDDED
      ceItem = (ContactListViewItem*)( it.current() );
 #endif //KAB_EMBEDDED
      if ( ceItem && ceItem->addressee().uid() == uid ) {
        ceItem->refresh();
        return;
      }
      ++it;
    }
    refresh( QString::null );
  }
 }
 QStringList KAddressBookTableView::selectedUids()
 {
    QStringList uidList;
    QListViewItem *item;
    ContactListViewItem *ceItem;
    for(item = mListView->firstChild(); item; item = item->itemBelow())
    {
        if (mListView->isSelected( item ))
        {
 #ifndef KAB_EMBEDDED
            ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
            if (ceItem != 0L)
                uidList << ceItem->addressee().uid();
        }
    }
    if ( uidList.count() == 0 )
        if ( mListView->currentItem() ) {
            ceItem = (ContactListViewItem*)(mListView->currentItem()) ;
            uidList << ceItem->addressee().uid();
        }
    return uidList;
 }
 void KAddressBookTableView::setSelected(QString uid, bool selected)
 {
    QListViewItem *item;
    ContactListViewItem *ceItem;
    if (uid.isNull())
    {
        mListView->selectAll(selected);
    }
    else
    {
        for(item = mListView->firstChild(); item; item = item->itemBelow())
        {
 #ifndef KAB_EMBEDDED
            ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
            if ((ceItem != 0L) && (ceItem->addressee().uid() == uid))
            {
                mListView->setSelected(item, selected);
                if (selected)
                    mListView->ensureItemVisible(item);
            }
        }
    }
 }
 void KAddressBookTableView::addresseeSelected()
 {
    // We need to try to find the first selected item. This might not be the
    // last selected item, but when QListView is in multiselection mode,
    // there is no way to figure out which one was
    // selected last.
    QListViewItem *item;
    bool found =false;
    for (item = mListView->firstChild(); item && !found;
         item = item->nextSibling())
    {
        if (item->isSelected())
        {
            found = true;
 #ifndef KAB_EMBEDDED
            ContactListViewItem *ceItem
                 = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ContactListViewItem *ceItem
                 = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
            if ( ceItem ) emit selected(ceItem->addressee().uid());
        }
    }
    if (!found)
        emit selected(QString::null);
 }
 void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
 {
    if (item)
    {
 #ifndef KAB_EMBEDDED
        ContactListViewItem *ceItem
               = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ContactListViewItem *ceItem
                 = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
       if (ceItem)
       {
           emit executed(ceItem->addressee().uid());
       }
    }
    else
    {
        emit executed(QString::null);
    }
 }
 void KAddressBookTableView::addresseeDeleted()
 {
         emit deleteRequest();
 }
 #ifndef KAB_EMBEDDED
 #include "kaddressbooktableview.moc"
 #endif //KAB_EMBEDDED