6 files changed, 27 insertions, 21 deletions
diff --git a/gammu/emb/common/service/gsmmisc.c b/gammu/emb/common/service/gsmmisc.c
index 1c6ec8b..486d136 100644
--- a/gammu/emb/common/service/gsmmisc.c
+++ b/gammu/emb/common/service/gsmmisc.c
@@ -96,167 +96,170 @@ GSM_Error GSM_ReadFile(char *FileName, GSM_File *File)
 static void GSM_JADFindLine(GSM_File File, char *Name, char *Value)
 {
                unsigned char Line[2000];
                int     Pos = 0;
        Value[0] = 0;
        while (1) {
                MyGetLine(File.Buffer, &Pos, Line, File.Used);
                if (strlen(Line) == 0) break;
                if (!strncmp(Line,Name,strlen(Name))) {
                        Pos = strlen(Name);
                        while (Line[Pos] == 0x20) Pos++;
                        strcpy(Value,Line+Pos);
                        return;
                        }       
        }
 }
 GSM_Error GSM_JADFindData(GSM_File File, char *Vendor, char *Name, char *JAR, char *Version, int *Size)
 {
        char Size2[200];
        GSM_JADFindLine(File, "MIDlet-Vendor:", Vendor);
        if (Vendor[0] == 0x00) return ERR_FILENOTSUPPORTED;
        dbgprintf("Vendor: \"%s\"\n",Vendor);
        GSM_JADFindLine(File, "MIDlet-Name:", Name);
        if (Name[0] == 0x00) return ERR_FILENOTSUPPORTED;
        dbgprintf("Name: \"%s\"\n",Name);
        GSM_JADFindLine(File, "MIDlet-Jar-URL:", JAR);
        if (JAR[0] == 0x00) return ERR_FILENOTSUPPORTED;
        dbgprintf("JAR file URL: \"%s\"\n",JAR);
        GSM_JADFindLine(File, "MIDlet-Jar-Size:", Size2);
        *Size = -1;
        if (Size2[0] == 0x00) return ERR_FILENOTSUPPORTED;
        dbgprintf("JAR size: \"%s\"\n",Size2);
        (*Size) = atoi(Size2);
        GSM_JADFindLine(File, "MIDlet-Version:", Version);
        dbgprintf("Version: \"%s\"\n",Version);
        return ERR_NONE;
 }
 void GSM_IdentifyFileFormat(GSM_File *File)
 {
        File->Type = GSM_File_Other;
        if (File->Used > 2) {
                if (memcmp(File->Buffer, "BM",2)==0) {
                        File->Type = GSM_File_Image_BMP;
                } else if (memcmp(File->Buffer, "GIF",3)==0) {
                        File->Type = GSM_File_Image_GIF;
                } else if (File->Buffer[0] == 0x00 && File->Buffer[1] == 0x00) {
                        File->Type = GSM_File_Image_WBMP;
                } else if (memcmp(File->Buffer+1, "PNG",3)==0) {
                        File->Type = GSM_File_Image_PNG;
                } else if (File->Buffer[0] == 0xFF && File->Buffer[1] == 0xD8) {
                        File->Type = GSM_File_Image_JPG;
                } else if (memcmp(File->Buffer, "MThd",4)==0) {
                        File->Type = GSM_File_Sound_MIDI;
                } else if (File->Buffer[0] == 0x00 && File->Buffer[1] == 0x02) {
                        File->Type = GSM_File_Sound_NRT;
                }
        }
 }
 void SaveVCALDateTime(char *Buffer, int *Length, GSM_DateTime *Date, char *Start)
 {
        if (Start != NULL) {
                *Length+=sprintf(Buffer+(*Length), "%s:",Start);
        }
        *Length+=sprintf(Buffer+(*Length), "%04d%02d%02dT%02d%02d%02d%c%c",
                        Date->Year, Date->Month, Date->Day,
                        Date->Hour, Date->Minute, Date->Second,13,10);
 }
 void ReadVCALDateTime(char *Buffer, GSM_DateTime *dt)
 {
        char year[5]="", month[3]="", day[3]="", hour[3]="", minute[3]="", second[3]="";
        memset(dt,0,sizeof(dt));
                strncpy(year,   Buffer, 4);
                strncpy(month,          Buffer+4, 2);
                strncpy(day,    Buffer+6, 2);
                strncpy(hour,   Buffer+9,2);
                strncpy(minute, Buffer+11,2);
                strncpy(second, Buffer+13,2);
        /* FIXME: Should check ranges... */
                dt->Year= atoi(year);
                dt->Month= atoi(month);
                dt->Day         = atoi(day);
                dt->Hour= atoi(hour);
                dt->Minute= atoi(minute);
                dt->Second= atoi(second);
        /* FIXME */
                dt->Timezone= 0;
 }
 void SaveVCALText(char *Buffer, int *Length, char *Text, char *Start)
 {
        char buffer[1000];
        if (UnicodeLength(Text) != 0) {
                EncodeUTF8(buffer,Text);
                if (UnicodeLength(Text)==strlen(buffer)) {
                        *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,DecodeUnicodeString(Text),13,10);
                } else {
                        *Length+=sprintf(Buffer+(*Length), "%s:%s%c%c",Start,buffer,13,10);
                }
                }    
 }
 bool ReadVCALText(char *Buffer, char *Start, char *Value)
 {
        unsigned char buff[200];
        Value[0] = 0x00;
        Value[1] = 0x00;
        strcpy(buff,Start);
        strcat(buff,":");
        if (!strncmp(Buffer,buff,strlen(buff))) {
-                EncodeUnicode(Value,Buffer+strlen(Start)+1,strlen(Buffer)-(strlen(Start)+1));
+        
+                // LR original :EncodeUnicode(Value,Buffer+strlen(Start)+1,strlen(Buffer)-(strlen(Start)+1));
+        // LR we have utf8 as default
+        DecodeUTF8(Value,Buffer+strlen(Start)+1,strlen(Buffer)-(strlen(Start)+1));
                dbgprintf("ReadVCalText is \"%s\"\n",DecodeUnicodeConsole(Value));
                return true;
        }
        /* SE T68i */
        strcpy(buff,Start);
        strcat(buff,";ENCODING=QUOTED-PRINTABLE:");
        if (!strncmp(Buffer,buff,strlen(buff))) {
                DecodeUTF8QuotedPrintable(Value,Buffer+strlen(Start)+27,strlen(Buffer)-(strlen(Start)+27));
                dbgprintf("ReadVCalText is \"%s\"\n",DecodeUnicodeConsole(Value));
                return true;
        }
        strcpy(buff,Start);
        strcat(buff,";CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:");
        if (!strncmp(Buffer,buff,strlen(buff))) {
                DecodeUTF8QuotedPrintable(Value,Buffer+strlen(Start)+41,strlen(Buffer)-(strlen(Start)+41));
                dbgprintf("ReadVCalText is \"%s\"\n",DecodeUnicodeConsole(Value));
                return true;
        }
        strcpy(buff,Start);
        strcat(buff,";CHARSET=UTF-8:");
        if (!strncmp(Buffer,buff,strlen(buff))) {
                DecodeUTF8(Value,Buffer+strlen(Start)+15,strlen(Buffer)-(strlen(Start)+15));
                dbgprintf("ReadVCalText is \"%s\"\n",DecodeUnicodeConsole(Value));
                return true;
        }
        strcpy(buff,Start);
        strcat(buff,";CHARSET=UTF-7:");
        if (!strncmp(Buffer,buff,strlen(buff))) {
                DecodeUTF7(Value,Buffer+strlen(Start)+15,strlen(Buffer)-(strlen(Start)+15));
                dbgprintf("ReadVCalText is \"%s\"\n",DecodeUnicodeConsole(Value));
                return true;
        }
        return false;
 }
 /* How should editor hadle tabs in this file? Add editor commands here.
 * vim: noexpandtab sw=8 ts=8 sts=8:
 */
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index c584c35..3641c0c 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -352,289 +352,290 @@ bool AddressBook::load()
      qDebug( i18n("Resource loaded: '%1'").arg( (*it)->resourceName() ) );
    }
  // mark all addressees as unchanged
  Addressee::List::Iterator addrIt;
  for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt ) {
    (*addrIt).setChanged( false );
    QString id = (*addrIt).custom( "KADDRESSBOOK", "X-ExternalID" );
    if ( !id.isEmpty() ) {
        //qDebug("setId aa %s ", id.latin1());
        (*addrIt).setIDStr(id );
    }
  }
  blockLSEchange = true;
  return ok;
 }
 bool AddressBook::save( Ticket *ticket )
 {
  kdDebug(5700) << "AddressBook::save()"<< endl;
  if ( ticket->resource() ) {
    deleteRemovedAddressees();
    return ticket->resource()->save( ticket );
  }
  return false;
 }
 // exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName )
 {
  
  QFile outFile( fileName );
  if ( !outFile.open( IO_WriteOnly ) ) {
    QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
    KMessageBox::error( 0, text.arg( fileName ) );
    return ;
  }
  QTextStream t( &outFile );
  t.setEncoding( QTextStream::UnicodeUTF8 );
  Iterator it;
  KABC::VCardConverter::Version version;
  version = KABC::VCardConverter::v3_0;
  for ( it = begin(); it != end(); ++it ) { 
      if ( (*it).resource() && (*it).resource()->includeInSync() ) {
          if ( !(*it).IDStr().isEmpty() ) {
              (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
          }
          KABC::VCardConverter converter;
          QString vcard; 
          //Resource *resource() const;
          converter.addresseeToVCard( *it, vcard, version );
          t << vcard << "\r\n";
      }
  }
  t <<  "\r\n\r\n";
  outFile.close(); 
 }
 // if QStringList uids is empty, all are exported
 bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
 {
  KABC::VCardConverter converter;
  QString datastream;
  Iterator it; 
  bool all = uids.isEmpty();
  for ( it = begin(); it != end(); ++it ) {
      // for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
      if ( ! all ) {
          if ( ! ( uids.contains((*it).uid() ) ))
              continue;
      } 
      KABC::Addressee a = ( *it );
      if ( a.isEmpty() )
          continue;
      if ( all && a.resource() && !a.resource()->includeInSync() )
          continue;
      a.simplifyEmails();
      a.simplifyPhoneNumbers();
      a.simplifyPhoneNumberTypes();
      a.simplifyAddresses();
      QString vcard;
      QString vcardnew;
      converter.addresseeToVCard( a, vcard );
      int start = 0;
      int next;
      while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
          int semi = vcard.find(";", next);
          int dopp = vcard.find(":", next);
          int sep;
          if ( semi < dopp && semi >= 0 )
              sep = semi ;
          else
              sep = dopp;
          vcardnew +=vcard.mid( start, next - start);
          vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
          start = sep;
      }
      vcardnew += vcard.mid( start,vcard.length() );
      vcard = "";
      start = 0;
      while ( (next = vcardnew.find("ADR", start) )>= 0 ) {
          int sep = vcardnew.find(":", next);
          vcard +=vcardnew.mid( start, next - start+3);
          start = sep;
      }
      vcard += vcardnew.mid( start,vcardnew.length() );
      vcard.replace ( QRegExp(";;;") , "" );
      vcard.replace ( QRegExp(";;") , "" );
      datastream += vcard;
     
  }
  
  QFile outFile(fileName);
  if ( outFile.open(IO_WriteOnly) ) { 
      datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
      QTextStream t( &outFile );  // use a text stream
      t.setEncoding( QTextStream::UnicodeUTF8 );
      t <<datastream;
      t <<  "\r\n\r\n";
      outFile.close();
          
  } else {
      qDebug("Error open temp file ");
      return false;
  }
  return true;
 }
-void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
+int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
 {
    if ( removeOld )
        setUntagged( true );
    KABC::Addressee::List list;
    QFile file( fileName );
    file.open( IO_ReadOnly );
    QByteArray rawData = file.readAll();
    file.close();
    QString data;
    if ( replaceLabel ) { 
        data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
        data.replace ( QRegExp("LABEL") , "ADR" );
        data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
    } else
        data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
    KABC::VCardTool tool;
    list =  tool.parseVCards( data );
    KABC::Addressee::List::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
        if ( !id.isEmpty() ) 
            (*it).setIDStr(id );
        (*it).setResource( 0 );
        if ( replaceLabel )
            (*it).removeVoice();
        if ( removeOld )
            (*it).setTagged( true );
        insertAddressee( (*it), false, true );
    }
    if ( removeOld )
        removeUntagged();
+    return list.count();
 }
 void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        if ( setNonSyncTagged ) {
            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
                (*ait).setTagged( true );
            } else
                (*ait).setTagged( false );
        } else
            (*ait).setTagged( false );
    }
 }
 void AddressBook::removeUntagged()
 {
  Iterator ait;
  bool todelete = false;
  Iterator todel;
  for ( ait = begin(); ait != end(); ++ait ) {
      if ( todelete )
          removeAddressee( todel );
      if (!(*ait).tagged()) {
          todelete = true;
          todel = ait;
      } else
          todelete = false;
  } 
  if ( todelete )
      removeAddressee( todel );
  deleteRemovedAddressees();
 }
 void AddressBook::smplifyAddressees() 
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        (*ait).simplifyEmails();
        (*ait).simplifyPhoneNumbers();
        (*ait).simplifyPhoneNumberTypes();
        (*ait).simplifyAddresses();
    }
 }
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        QString id = (*ait).IDStr();
        (*ait).setIDStr( ":");
        (*ait).setExternalUID( id );
        (*ait).setOriginalExternalUID( id ); 
        if ( isPreSync )
            (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
        else {
            (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
            (*ait).setID( currentSyncDevice,id );
            
        }
    }
 }
 void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
 {
 
    setUntagged();
    KABC::Addressee::List list;
    QFile file( fileName );
    file.open( IO_ReadOnly );
    QByteArray rawData = file.readAll();
    file.close();
    QString data;
    data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
    KABC::VCardTool tool;
    list =  tool.parseVCards( data );
    KABC::Addressee::List::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        Iterator ait;
        for ( ait = begin(); ait != end(); ++ait ) {
            if ( !(*ait).tagged() ) {
                if ( (*ait).containsAdr(*it)) {
                    (*ait).setTagged(true);
                    QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
                    (*it).setIDStr( ":");
                    (*it).setID( currentSyncDevice,id );
                    (*it).setExternalUID( id );
                    (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
                    (*it).setUid( ( (*ait).uid() ));
                    break;
                }
            }
            
        }
        if ( ait == end() )
            qDebug("ERROR:: no ext ID found for uid: %s", (*it).uid().latin1());      
    }
    clear();
    for ( it = list.begin(); it != list.end(); ++it ) {
        insertAddressee( (*it)  );
    }
 }
 bool AddressBook::saveABphone( QString fileName )
 {
    //smplifyAddressees();
    qDebug("saveABphone:: saving AB... ");
    if ( ! export2PhoneFormat( QStringList() ,fileName ) )
        return false;
    qDebug("saveABphone:: writing to phone... ");   
    if ( !PhoneAccess::writeToPhone( fileName) ) {
        return false;
    }
    qDebug("saveABphone:: re-reading from phone... ");   
    if ( !PhoneAccess::readFromPhone( fileName) ) {
        return false;
    }
    return true;
 }
 bool AddressBook::saveAB()
 {
  bool ok = true;
  deleteRemovedAddressees();
  Iterator ait;
  for ( ait = begin(); ait != end(); ++ait ) {
      if ( !(*ait).IDStr().isEmpty() ) {
          (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
    }
  }
  KRES::Manager<Resource>::ActiveIterator it;
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 23bba02..5edca06 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -22,257 +22,257 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_ADDRESSBOOK_H
 #define KABC_ADDRESSBOOK_H
 #include <qobject.h>
 #include <kresources/manager.h>
 #include <qptrlist.h>
 #include "addressee.h"
 #include "field.h"
 namespace KABC {
 class ErrorHandler;
 class Resource;
 class Ticket;
 /**
  @short Address Book
  This class provides access to a collection of address book entries.
 */
 class AddressBook : public QObject
 {
    Q_OBJECT
    friend QDataStream &operator<<( QDataStream &, const AddressBook & );
    friend QDataStream &operator>>( QDataStream &, AddressBook & );
    friend class StdAddressBook;
  public:
    /**
      @short Address Book Iterator
      This class provides an iterator for address book entries.
    */
    class Iterator
    {
      public:
        Iterator();
        Iterator( const Iterator & );
              ~Iterator();
              Iterator &operator=( const Iterator & );
        const Addressee &operator*() const;
        Addressee &operator*();
        Addressee* operator->();
        Iterator &operator++();
        Iterator &operator++(int);
        Iterator &operator--();
        Iterator &operator--(int);
        bool operator==( const Iterator &it );
        bool operator!=( const Iterator &it );
              struct IteratorData;
        IteratorData *d;
    };
    /**
      @short Address Book Const Iterator
      This class provides a const iterator for address book entries.
    */
    class ConstIterator
    {
      public:
        ConstIterator();
        ConstIterator( const ConstIterator & );
              ~ConstIterator();
              ConstIterator &operator=( const ConstIterator & );
        const Addressee &operator*() const;
        const Addressee* operator->() const;
        ConstIterator &operator++();
        ConstIterator &operator++(int);
        ConstIterator &operator--();
        ConstIterator &operator--(int);
        bool operator==( const ConstIterator &it );
        bool operator!=( const ConstIterator &it );
              struct ConstIteratorData;
        ConstIteratorData *d;
    };
    /**
      Constructs a address book object.
      @param format File format class.
    */
    AddressBook();
    AddressBook( const QString &config );
    AddressBook( const QString &config, const QString &family );
    virtual ~AddressBook();
    /**
      Requests a ticket for saving the addressbook. Calling this function locks
      the addressbook for all other processes. If the address book is already
      locked the function returns 0. You need the returned @ref Ticket object
      for calling the @ref save() function.
      @see save()
    */
    Ticket *requestSaveTicket( Resource *resource=0 );
    /**
      Load address book from file.
    */
    bool load();
    /**
      Save address book. The address book is saved to the file, the Ticket
      object has been requested for by @ref requestSaveTicket().
      @param ticket a ticket object returned by @ref requestSaveTicket()
    */
    bool save( Ticket *ticket );
    bool saveAB( );
    bool saveABphone( QString fileName );
    void smplifyAddressees(); 
    void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
    void export2File( QString fileName );
    bool export2PhoneFormat(  QStringList uids ,QString fileName );
-    void importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
+    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
    void setUntagged( bool setNonSyncTagged = false );
    void removeUntagged();
    void findNewExtIds(  QString fileName, QString currentSyncDevice  );
    /**
      Returns a iterator for first entry of address book.
    */
    Iterator begin();
    /**
      Returns a const iterator for first entry of address book.
    */
    ConstIterator begin() const;
    /**
      Returns a iterator for first entry of address book.
    */
    Iterator end();
    /**
      Returns a const iterator for first entry of address book.
    */
    ConstIterator end() const;
    /**
      Removes all entries from address book.
    */
    void clear();
    /**
      Insert an Addressee object into address book. If an object with the same
      unique id already exists in the address book it it replaced by the new
      one. If not the new object is appended to the address book.
    */
    void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
    /**
      Removes entry from the address book.
    */
    void removeAddressee( const Addressee & );
    /**
      This is like @ref removeAddressee() just above, with the difference that
      the first element is a iterator, returned by @ref begin().
    */
    void removeAddressee( const Iterator & );
    /**
      Find the specified entry in address book. Returns end(), if the entry
      couldn't be found.
    */
    Iterator find( const Addressee & );
    /**
      Find the entry specified by an unique id. Returns an empty Addressee
      object, if the address book does not contain an entry with this id.
    */
    Addressee findByUid( const QString & );
    /**
      Returns a list of all addressees in the address book. This list can
      be sorted with @ref KABC::AddresseeList for example.
    */
    Addressee::List allAddressees();
    /**
      Find all entries with the specified name in the address book. Returns
      an empty list, if no entries could be found.
    */
    Addressee::List findByName( const QString & );
    /**
      Find all entries with the specified email address  in the address book.
      Returns an empty list, if no entries could be found.
    */
    Addressee::List findByEmail( const QString & );
    /**
      Find all entries wich have the specified category in the address book.
      Returns an empty list, if no entries could be found.
    */
    Addressee::List findByCategory( const QString & );
    /**
      Return a string identifying this addressbook.
    */
    virtual QString identifier();
    /**
      Used for debug output.
    */
    void dump() const;
    void emitAddressBookLocked() { emit addressBookLocked( this ); }
    void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); }
    void emitAddressBookChanged() { emit addressBookChanged( this ); }
    /**
      Return list of all Fields known to the address book which are associated
      with the given field category.
    */
    Field::List fields( int category = Field::All );
    /**
      Add custom field to address book.
      @param label    User visible label of the field.
      @param category Ored list of field categories.
      @param key      Identifier used as key for reading and writing the field.
      @param app      String used as application key for reading and writing
                      the field.
    */
    bool addCustomField( const QString &label, int category = Field::All,
                         const QString &key = QString::null,
                         const QString &app = QString::null );
    /**
      Add address book resource.
    */
    bool addResource( Resource * );
    /**
      Remove address book resource.
    */
    bool removeResource( Resource * );
    /**
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 2cdf4bf..ba17c50 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -1,204 +1,204 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2004 Ulf Schenk
    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 <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <sl/slzdb.h>
 #include <libkdepim/ksyncprofile.h>
 #include "resourcesharpdtmconfig.h"
 #include "resourcesharpdtm.h"
 #include "stdaddressbook.h"
 #include "sharpdtmconverter.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 {
  void *init_microkabc_sharpdtm()
  {
    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
  }
 }
 ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
  : Resource( config ), mConverter (0)
 {
  // we can not choose the filename. Therefore use the default to display
  QString fileName = SlZDataBase::addressbookFileName();
  init( fileName );
 }
-ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
+ResourceSharpDTM::ResourceSharpDTM( const QString &fileName  )
-  : Resource( 0, syncable )
+  : Resource( 0 )
 {
  init( fileName );
 }
 void ResourceSharpDTM::init( const QString &fileName )
 {
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
  setFileName( fileName );
 }
 ResourceSharpDTM::~ResourceSharpDTM()
 {
  if (mConverter != 0)
    delete mConverter;
  if(mAccess != 0)
    delete mAccess;
 }
 void ResourceSharpDTM::writeConfig( KConfig *config )
 {
  Resource::writeConfig( config );
 }
 Ticket *ResourceSharpDTM::requestSaveTicket()
 {
 
  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( fileName() ) ) {
      qDebug("ResourceSharpDTM::requestSaveTicket(): Unable to lock file ");
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceSharpDTM::doOpen()
 {
  qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
  // the last parameter in the SlZDataBase constructor means "readonly"
  mAccess = new SlZDataBase(fileName(),
                        SlZDataBase::addressbookItems(),
                        NULL, false);
  if ( !mAccess ) {
    qDebug("Unable to load file() %s", fileName().latin1());
    return false;
  }
  if (mConverter == 0)
  {
    mConverter = new SharpDTMConverter();
    bool res = mConverter->init(); 
    if ( !res )
    {
          QString msg("Unable to initialize sharp converter. Most likely a problem with the category file");
      qDebug(msg);
      delete mAccess;
      mAccess = 0;
      return false;
    }
  }
 return true;
 }
 void ResourceSharpDTM::doClose()
 {
  qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
  if(mAccess)
  {
    delete mAccess;
    mAccess = 0;
  }
  // it seems so, that deletion of access deletes backend as well
  //delete backend;
  return;
 }
 bool ResourceSharpDTM::load()
 {
  qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
  bool res = false;
  CardId id;
  for (bool res=mAccess->first(); res == true; res=mAccess->next())
  {
    id = mAccess->cardId();
    KABC::Addressee addressee;
    res = mConverter->sharpToAddressee( id, mAccess, addressee );
    if ( !addressee.isEmpty() && res )
    {
      addressee.setResource( this );
      addressBook()->insertAddressee( addressee );
    }
  }
  return true;
 }
 bool ResourceSharpDTM::save( Ticket *ticket )
 {
  qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
  mDirWatch.stopScan();
  KABC::AddressBook::Iterator it;
  bool res;
  KABC::Addressee::List changedAddressees;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 087e9e3..3ab06c4 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -79,382 +79,386 @@ $Id$
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 #include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
 #include <addresseeview.h>
 #include <qapp.h>
 #include <qmenubar.h>
 //#include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h> // needed for SmallIcon
 #include <kresources/kcmkresources.h>
 #include <ktoolbar.h>
 //#include <qlabel.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 #include <qmenubar.h>
 #endif
 #endif // KAB_EMBEDDED
 #include "kcmconfigs/kcmkabconfig.h"
 #include "kcmconfigs/kcmkdepimconfig.h"
 #include "kpimglobalprefs.h"
 #include "externalapphandler.h"
 #include <kresources/selectdialog.h>
 #include <kmessagebox.h>
 #include <picture.h>
 #include <resource.h>
 //US#include <qsplitter.h>
 #include <qmap.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qclipboard.h>
 #include <qtextstream.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <kabc/vcardconverter.h>
 #include "addresseeutil.h"
 #include "undocmds.h"
 #include "addresseeeditordialog.h"
 #include "viewmanager.h"
 #include "details/detailsviewcontainer.h"
 #include "kabprefs.h"
 #include "xxportmanager.h"
 #include "incsearchwidget.h"
 #include "jumpbuttonbar.h"
 #include "extensionmanager.h"
 #include "addresseeconfig.h"
 #include <kcmultidialog.h>
 #ifdef _WIN32_
 #include "kaimportoldialog.h"
 #else
 #include <unistd.h>
 #endif
 // sync includes
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/ksyncprefsdialog.h>
 class KAex2phonePrefs : public QDialog
 {
  public:
    KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Export to phone options") );
        QVBoxLayout* lay = new QVBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel *lab;
        lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
        lab->setAlignment (AlignHCenter  ); 
        QHBox* temphb;
        temphb = new QHBox( this );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        lay->addWidget( temphb );
        temphb = new QHBox( this );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        lay->addWidget( temphb );
        temphb = new QHBox( this );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        lay->addWidget( temphb );
        // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this );
        // lay->addWidget( mWriteToSim );
        lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );  
        lab->setAlignment (AlignHCenter  ); 
        QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
        lay->addWidget( ok );
        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
        lay->addWidget( cancel );
        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
        resize( 220, 240 );
        
    }
   
 public:
    QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
    QCheckBox* mWriteToSim;
 };
 bool pasteWithNewUid = true;
 #ifdef KAB_EMBEDDED
 KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
  : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
    mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US  mLdapSearchDialog( 0 ),*/
    mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
 #else //KAB_EMBEDDED
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
  : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
    mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
    mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
  //  syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
  //  syncManager->setBlockSave(false);
  mExtensionBarSplitter = 0;
  mIsPart = !parent->inherits( "KAddressBookMain" );
  mAddressBook = KABC::StdAddressBook::self();
  KABC::StdAddressBook::setAutomaticSave( false );
 #ifndef KAB_EMBEDDED
  mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
 #endif //KAB_EMBEDDED
  connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
           SLOT( addressBookChanged() ) );
 #if 0
  // LP moved to addressbook init method
  mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                "X-Department", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                "X-Profession", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                "X-AssistantsName", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                "X-ManagersName", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                "X-SpousesName", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                "X-Office", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                "X-IMAddress", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                "X-Anniversary", "KADDRESSBOOK" );
  //US added this field to become compatible with Opie/qtopia addressbook
  // values can be "female" or "male" or "". An empty field represents undefined.
  mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                "X-Gender", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                "X-Children", "KADDRESSBOOK" );
  mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                "X-FreeBusyUrl", "KADDRESSBOOK" );
 #endif
  initGUI();
  mIncSearchWidget->setFocus();
  connect( mViewManager, SIGNAL( selected( const QString& ) ),
           SLOT( setContactSelected( const QString& ) ) );
  connect( mViewManager, SIGNAL( executed( const QString& ) ),
           SLOT( executeContact( const QString& ) ) );
  connect( mViewManager, SIGNAL( deleteRequest( ) ),
           SLOT( deleteContacts( ) ) );
  connect( mViewManager, SIGNAL( modified() ),
           SLOT( setModified() ) );
  connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) );
  connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) );
  connect( mXXPortManager, SIGNAL( modified() ),
           SLOT( setModified() ) );
  connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ),
           SLOT( incrementalSearch( const QString& ) ) );
  connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
           mJumpButtonBar, SLOT( recreateButtons() ) );
  connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
           SLOT( sendMail( const QString& ) ) );
  connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
  connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
  connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&)));
 #ifndef KAB_EMBEDDED
  connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
           mXXPortManager, SLOT( importVCard( const KURL& ) ) );
  connect( mDetails, SIGNAL( browse( const QString& ) ),
           SLOT( browse( const QString& ) ) );
  mAddressBookService = new KAddressBookService( this );
 #endif //KAB_EMBEDDED
+  mMessageTimer = new QTimer( this ); 
+  connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) );
  mEditorDialog = 0;
  createAddresseeEditorDialog( this );
  setModified( false );
 }
 KABCore::~KABCore()
 {
    //  save();
    //saveSettings();
    //KABPrefs::instance()->writeConfig();
    delete AddresseeConfig::instance();
    mAddressBook = 0;
    KABC::StdAddressBook::close();
    
    delete syncManager;
 }
 void KABCore::recieve( QString fn  )
 {
    //qDebug("KABCore::recieve ");
-    mAddressBook->importFromFile( fn, true );
+    int count = mAddressBook->importFromFile( fn, true );
    mViewManager->refreshView();
+    message(i18n("%1 contact(s) received!").arg( count ));
    topLevelWidget()->raise();
 }
 void KABCore::restoreSettings()
 {
  mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
  bool state;
  if (mMultipleViewsAtOnce)
    state = KABPrefs::instance()->mDetailsPageVisible;
  else
    state = false;
  mActionDetails->setChecked( state );
  setDetailsVisible( state );
  state = KABPrefs::instance()->mJumpButtonBarVisible;
  mActionJumpBar->setChecked( state );
  setJumpButtonBarVisible( state );
 /*US
 QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
  if ( splitterSize.count() == 0 ) {
    splitterSize.append( width() / 2 );
    splitterSize.append( width() / 2 );
  }
  mMiniSplitter->setSizes( splitterSize );
  if (  mExtensionBarSplitter ) {
  splitterSize = KABPrefs::instance()->mExtensionsSplitter;
  if ( splitterSize.count() == 0 ) {
    splitterSize.append( width() / 2 );
    splitterSize.append( width() / 2 );
  }
  mExtensionBarSplitter->setSizes( splitterSize );
  }
 */
  mViewManager->restoreSettings();
  mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
  mExtensionManager->restoreSettings();
 #ifdef DESKTOP_VERSION
  int wid = width();
  if ( wid < 10 )
      wid = 400;
 #else
  int wid = QApplication::desktop()->width();
  if ( wid < 640 )
      wid = QApplication::desktop()->height();
 #endif
  QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
  if ( true /*splitterSize.count() == 0*/ ) {
      splitterSize.append( wid / 2 );
      splitterSize.append( wid / 2 );
  }
  mMiniSplitter->setSizes( splitterSize );
  if (  mExtensionBarSplitter ) {
      //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
      if ( true /*splitterSize.count() == 0*/ ) {
          splitterSize.append( wid / 2 );
          splitterSize.append( wid / 2 );
      }
      mExtensionBarSplitter->setSizes( splitterSize );
  }
 }
 void KABCore::saveSettings()
 {
  KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
  if ( mExtensionBarSplitter )
    KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
  KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked();
  KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes();
 #ifndef KAB_EMBEDDED
  KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
  KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
 #endif //KAB_EMBEDDED
  mExtensionManager->saveSettings();
  mViewManager->saveSettings();
  KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
 }
 KABC::AddressBook *KABCore::addressBook() const
 {
  return mAddressBook;
 }
 KConfig *KABCore::config()
 {
 #ifndef KAB_EMBEDDED
  return KABPrefs::instance()->config();
 #else //KAB_EMBEDDED
  return KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
 }
 KActionCollection *KABCore::actionCollection() const
 {
  return mGUIClient->actionCollection();
 }
 KABC::Field *KABCore::currentSearchField() const
 {
   if (mIncSearchWidget)
    return mIncSearchWidget->currentField();
  else
    return 0;
 }
 QStringList KABCore::selectedUIDs() const
 {
  return mViewManager->selectedUids();
 }
 KABC::Resource *KABCore::requestResource( QWidget *parent )
 {
  QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
  QPtrList<KRES::Resource> kresResources;
  QPtrListIterator<KABC::Resource> resIt( kabcResources );
  KABC::Resource *resource;
  while ( ( resource = resIt.current() ) != 0 ) {
    ++resIt;
    if ( !resource->readOnly() ) {
@@ -572,391 +576,392 @@ void KABCore::setContactSelected( const QString &uid )
  mActionExport2phone->setEnabled( selected );
  mActionWhoAmI->setEnabled( selected );
  mActionCategories->setEnabled( selected );
 }
 void KABCore::sendMail()
 {
  sendMail( mViewManager->selectedEmails().join( ", " ) );
 }
 void KABCore::sendMail( const QString& emaillist )
 {
  // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... "
  if (emaillist.contains(",") > 0)
    ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null );
  else
    ExternalAppHandler::instance()->mailToOneContact( emaillist );
 }
 void KABCore::mailVCard()
 {
  QStringList uids = mViewManager->selectedUids();
  if ( !uids.isEmpty() )
    mailVCard( uids );
 }
 void KABCore::mailVCard( const QStringList& uids )
 {
  QStringList urls;
 //  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
  QString dirName = "/tmp/" + KApplication::randomString( 8 );
  QDir().mkdir( dirName, true );
  for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
    KABC::Addressee a = mAddressBook->findByUid( *it );
    if ( a.isEmpty() )
      continue;
    QString name = a.givenName() + "_" + a.familyName() + ".vcf";
    QString fileName = dirName + "/" + name;
    QFile outFile(fileName);
    if ( outFile.open(IO_WriteOnly) ) {  // file opened successfully
      KABC::VCardConverter converter;
      QString vcard;
      converter.addresseeToVCard( a, vcard );
      QTextStream t( &outFile );  // use a text stream
      t.setEncoding( QTextStream::UnicodeUTF8 );
      t << vcard;
      outFile.close();
      urls.append( fileName );
    }
  }
  bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
 /*US
  kapp->invokeMailer( QString::null, QString::null, QString::null,
                      QString::null,  // subject
                      QString::null,  // body
                      QString::null,
                      urls );  // attachments
 */
 }
 /**
  Beams the "WhoAmI contact.
 */
 void KABCore::beamMySelf()
 {
  KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
  if (!a.isEmpty())
  {
    QStringList uids;
    uids << a.uid();
        beamVCard(uids);
  } else {
      KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) );
  }
 }
 void KABCore::export2phone()
 {
    KAex2phonePrefs ex2phone;
    ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
    ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
    ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
    if ( !ex2phone.exec() ) {
        return;
    }
    KPimGlobalPrefs::instance()->mEx2PhoneConnection  = ex2phone.mPhoneConnection->text();
    KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
    KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
    PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
                              KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                              KPimGlobalPrefs::instance()->mEx2PhoneModel );
    QStringList uids = mViewManager->selectedUids();
    if ( uids.isEmpty() )
        return;
    QString  fileName = getPhoneFile();
    if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) )
        return;
    
+    message(i18n("Exporting to phone..."));
    QTimer::singleShot( 1, this , SLOT ( writeToPhone()));
 }
 QString KABCore::getPhoneFile()
 {
 #ifdef _WIN32_
    return  locateLocal("tmp", "phonefile.vcf");
 #else
    return "/tmp/phonefile.vcf";
 #endif
 }
 void KABCore::writeToPhone( )
 {
    if ( PhoneAccess::writeToPhone( getPhoneFile() ) )
-        qDebug("Export okay ");
+        message(i18n("Export to phone finished!"));
    else
-        qDebug("Error export contacts ");
+        qDebug(i18n("Error exporting to phone"));
 }
 void KABCore::beamVCard()
 {
  QStringList uids = mViewManager->selectedUids();
  if ( !uids.isEmpty() )
    beamVCard( uids );
 }
 void KABCore::beamVCard(const QStringList& uids)
 {
 /*US
        QString beamFilename;
        Opie::OPimContact c;
        if ( actionPersonal->isOn() ) {
                beamFilename = addressbookPersonalVCardName();
                if ( !QFile::exists( beamFilename ) )
                        return; // can't beam a non-existent file
                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                        beamFilename );
                Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                Opie::OPimContactAccess::List allList = access->allRecords();
                Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
                c = *it;
                delete access;
        } else {
                unlink( beamfile ); // delete if exists
                mkdir("/tmp/obex/", 0755);
                c = m_abView -> currentEntry();
                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                        beamfile );
                Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                access->add( c );
                access->save();
                delete access;
                beamFilename = beamfile;
        }
        owarn << "Beaming: " << beamFilename << oendl;
 */
 #if 0
  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
  QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
  QString name = "contact.vcf";
  QString fileName = dirName + "/" + name;
 #endif
  // LR: we should use the /tmp dir, because: /tmp = RAM, (HOME)/kdepim = flash memory
  //
  QString fileName = "/tmp/kapibeamfile.vcf";
  //QDir().mkdir( dirName, true );
 
  KABC::VCardConverter converter;
  QString description;
  QString datastream;
  for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
      KABC::Addressee a = mAddressBook->findByUid( *it );
      if ( a.isEmpty() )
          continue;
      if (description.isEmpty())
          description = a.formattedName();
      QString vcard;
      converter.addresseeToVCard( a, vcard );
      int start = 0;
      int next;
      while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
          int semi = vcard.find(";", next);
          int dopp = vcard.find(":", next);
          int sep;
          if ( semi < dopp && semi >= 0 )
              sep = semi ;
          else
              sep = dopp;
          datastream +=vcard.mid( start, next - start);
          datastream +=vcard.mid( next+5,sep -next -5 ).upper();
          start = sep;
      }
      datastream += vcard.mid( start,vcard.length() );
  }
 #ifndef DESKTOP_VERSION
  QFile outFile(fileName);
  if ( outFile.open(IO_WriteOnly) ) { 
      datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
      QTextStream t( &outFile );  // use a text stream
      //t.setEncoding( QTextStream::UnicodeUTF8 );
      t.setEncoding( QTextStream::Latin1 );
      t <<datastream.latin1();
      outFile.close();
      Ir *ir = new Ir( this );
      connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
      ir->send( fileName, description, "text/x-vCard" );
  } else {
      qDebug("Error open temp  beam file ");
      return;
  }
 #endif
 }
 void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
  delete ir;
 #endif
  topLevelWidget()->raise();
-  message( i18n("Beaming successful!") );
+  message( i18n("Beaming finished!") );
 }
 void KABCore::browse( const QString& url )
 {
 #ifndef KAB_EMBEDDED
  kapp->invokeBrowser( url );
 #else //KAB_EMBEDDED
  qDebug("KABCore::browse must be fixed");
 #endif //KAB_EMBEDDED
 }
 void KABCore::selectAllContacts()
 {
  mViewManager->setSelected( QString::null, true );
 }
 void KABCore::deleteContacts()
 {
  QStringList uidList = mViewManager->selectedUids();
  deleteContacts( uidList );
 }
 void KABCore::deleteContacts( const QStringList &uids )
 {
  if ( uids.count() > 0 ) {
    PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids );
    UndoStack::instance()->push( command );
    RedoStack::instance()->clear();
    // now if we deleted anything, refresh
    setContactSelected( QString::null );
    setModified( true );
  }
 }
 void KABCore::copyContacts()
 {
  KABC::Addressee::List addrList = mViewManager->selectedAddressees();
  QString clipText = AddresseeUtil::addresseesToClipboard( addrList );
  kdDebug(5720) << "KABCore::copyContacts: " << clipText << endl;
  QClipboard *cb = QApplication::clipboard();
  cb->setText( clipText );
 }
 void KABCore::cutContacts()
 {
  QStringList uidList = mViewManager->selectedUids();
 //US  if ( uidList.size() > 0 ) {
  if ( uidList.count() > 0 ) {
    PwCutCommand *command = new PwCutCommand( mAddressBook, uidList );
    UndoStack::instance()->push( command );
    RedoStack::instance()->clear();
    setModified( true );
  }
 }
 void KABCore::pasteContacts()
 {
  QClipboard *cb = QApplication::clipboard();
  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
  pasteContacts( list );
 }
 void KABCore::pasteContacts( KABC::Addressee::List &list  )
 {
  KABC::Resource *resource = requestResource( this );
  KABC::Addressee::List::Iterator it;
  for ( it = list.begin(); it != list.end(); ++it )
    (*it).setResource( resource );
  PwPasteCommand *command = new PwPasteCommand( this, list );
  UndoStack::instance()->push( command );
  RedoStack::instance()->clear();
  setModified( true );
 }
 void KABCore::setWhoAmI()
 {
  KABC::Addressee::List addrList = mViewManager->selectedAddressees();
  if ( addrList.count() > 1 ) {
    KMessageBox::sorry( this, i18n( "Please select only one contact." ) );
    return;
  }
  QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
  if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes )
    static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] );
 }
 void KABCore::setCategories()
 {
  KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
  if ( !dlg.exec() )
    return;
  bool merge = false;
  QString msg = i18n( "Merge with existing categories?" );
  if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes )
    merge = true;
  QStringList categories = dlg.selectedCategories();
  QStringList uids = mViewManager->selectedUids();
  QStringList::Iterator it;
  for ( it = uids.begin(); it != uids.end(); ++it ) {
    KABC::Addressee addr = mAddressBook->findByUid( *it );
    if ( !addr.isEmpty() ) {
      if ( !merge )
        addr.setCategories( categories );
      else {
        QStringList addrCategories = addr.categories();
        QStringList::Iterator catIt;
        for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
          if ( !addrCategories.contains( *catIt ) )
            addrCategories.append( *catIt );
        }
        addr.setCategories( addrCategories );
      }
@@ -1070,279 +1075,275 @@ void KABCore::newContact()
 void KABCore::addEmail( QString aStr )
 {
 #ifndef KAB_EMBEDDED
  QString fullName, email;
  KABC::Addressee::parseEmailAddress( aStr, fullName, email );
  // Try to lookup the addressee matching the email address
  bool found = false;
  QStringList emailList;
  KABC::AddressBook::Iterator it;
  for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) {
    emailList = (*it).emails();
    if ( emailList.contains( email ) > 0 ) {
      found = true;
      (*it).setNameFromString( fullName );
      editContact( (*it).uid() );
    }
  }
  if ( !found ) {
    KABC::Addressee addr;
    addr.setNameFromString( fullName );
    addr.insertEmail( email, true );
    mAddressBook->insertAddressee( addr );
    mViewManager->refreshView( addr.uid() );
    editContact( addr.uid() );
  }
 #else //KAB_EMBEDDED
  qDebug("KABCore::addEmail finsih method");
 #endif //KAB_EMBEDDED
 }
 void KABCore::importVCard( const KURL &url, bool showPreview )
 {
  mXXPortManager->importVCard( url, showPreview );
 }
 void KABCore::importFromOL()
 {
 #ifdef _WIN32_
  KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
  idgl->exec();
  KABC::Addressee::List list = idgl->getAddressList();
  if ( list.count() > 0 ) {
    KABC::Addressee::List listNew;
    KABC::Addressee::List listExisting;
    KABC::Addressee::List::Iterator it;
    KABC::AddressBook::Iterator iter;
    for ( it = list.begin(); it != list.end(); ++it ) {
      if ( mAddressBook->findByUid((*it).uid() ).isEmpty())
        listNew.append( (*it) );
      else
        listExisting.append( (*it) );
    }
    if ( listExisting.count()  > 0 )
      KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
    if ( listNew.count() > 0 ) {
      pasteWithNewUid = false;
      pasteContacts( listNew );
      pasteWithNewUid = true;
    }
  }
  delete idgl;
 #endif
 }
 void KABCore::importVCard( const QString &vCard, bool showPreview )
 {
  mXXPortManager->importVCard( vCard, showPreview );
 }
 //US added a second method without defaultparameter
 void KABCore::editContact2() {
  editContact( QString::null );
 }
 void KABCore::editContact( const QString &uid )
 {
  if ( mExtensionManager->isQuickEditVisible() )
    return;
  // First, locate the contact entry
  QString localUID = uid;
  if ( localUID.isNull() ) {
    QStringList uidList = mViewManager->selectedUids();
    if ( uidList.count() > 0 )
      localUID = *( uidList.at( 0 ) );
  }
  KABC::Addressee addr = mAddressBook->findByUid( localUID );
  if ( !addr.isEmpty() ) {
      mEditorDialog->setAddressee( addr );
      KApplication::execDialog ( mEditorDialog );
  }
 }
 /**
  Shows or edits the detail view for the given uid. If the uid is QString::null,
  the method will try to find a selected addressee in the view.
 */
 void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
 {
  if ( mMultipleViewsAtOnce )
  {
    editContact( uid );
  }
  else
  {
    setDetailsVisible( true );
    mActionDetails->setChecked(true);
  }
 }
 void KABCore::save()
 {
     if (syncManager->blockSave())
        return;
    if ( !mModified )
        return;
    syncManager->setBlockSave(true);
   QString text = i18n( "There was an error while attempting to save\n the "
    "address book. Please check that some \nother application is "
    "not using it. " );
-   statusMessage(i18n("Saving addressbook ... "));
+   message(i18n("Saving addressbook ... "));
 #ifndef KAB_EMBEDDED
  KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
  if ( !b || !b->save() ) {
    KMessageBox::error( this, text, i18n( "Unable to Save" ) );
  }
 #else //KAB_EMBEDDED
  KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
  if ( !b || !b->save() ) {
    QMessageBox::critical( this, i18n( "Unable to Save" ), text,  i18n("Ok"));
  }
 #endif //KAB_EMBEDDED
-  statusMessage(i18n("Addressbook saved!"));
+  message(i18n("Addressbook saved!"));
  setModified( false );
  syncManager->setBlockSave(false);
 }
-void KABCore::statusMessage(QString mess , int time )
-{
-    //topLevelWidget()->setCaption( mess );
-    // pending setting timer to revome message
-}
 void KABCore::undo()
 {
  UndoStack::instance()->undo();
  // Refresh the view
  mViewManager->refreshView();
 }
 void KABCore::redo()
 {
  RedoStack::instance()->redo();
  // Refresh the view
  mViewManager->refreshView();
 }
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
  if (mMultipleViewsAtOnce)
  {
    if ( visible )
      mJumpButtonBar->show();
    else
      mJumpButtonBar->hide();
  }
  else
  {
        // show the jumpbar only if "the details are hidden" == "viewmanager are shown"
    if (mViewManager->isVisible())
    {
      if ( visible )
        mJumpButtonBar->show();
      else
        mJumpButtonBar->hide();
        }
        else
        {
      mJumpButtonBar->hide();
        }
  }
 }
 void KABCore::setDetailsToState()
 {
    setDetailsVisible(  mActionDetails->isChecked() );
 }
 void KABCore::setDetailsVisible( bool visible )
 {
  if (visible && mDetails->isHidden())
  {
    KABC::Addressee::List addrList = mViewManager->selectedAddressees();
    if ( addrList.count() > 0 )
      mDetails->setAddressee( addrList[ 0 ] );
  }
  // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
  // the listview and the detailview. We do that by changing the splitbar size.
  if (mMultipleViewsAtOnce)
  {
    if ( visible )
      mDetails->show();
    else
      mDetails->hide();
  }
  else
  {
    if ( visible ) {
      mViewManager->hide();
      mDetails->show();
    }
    else {
      mViewManager->show();
      mDetails->hide();
    }
    setJumpButtonBarVisible( !visible );
  }
 }
 void KABCore::extensionChanged( int id )
 {
  //change the details view only for non desktop systems
 #ifndef DESKTOP_VERSION
  if (id == 0)
  {
    //the user disabled the extension.
    if (mMultipleViewsAtOnce)
    { // enable detailsview again
      setDetailsVisible( true );
      mActionDetails->setChecked( true );
    }
    else
    {  //go back to the listview
      setDetailsVisible( false );
      mActionDetails->setChecked( false );
      mActionDetails->setEnabled(true);
        }
  }
  else
  {
    //the user enabled the extension.
    setDetailsVisible( false );
    mActionDetails->setChecked( false );
    if (!mMultipleViewsAtOnce)
    {
      mActionDetails->setEnabled(false);
        }
    mExtensionManager->setSelectionChanged();
  }
 #endif// DESKTOP_VERSION
 }
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
@@ -2030,257 +2031,257 @@ void KABCore::addActionsManually()
 this->layout()->add( mJumpButtonBar );
 */
 #endif //KAB_EMBEDDED
  mActionExport2phone->plug( ExportMenu );
 connect ( syncMenu, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
 syncManager->fillSyncMenu();
 }
 void KABCore::showLicence()
 {
    KApplication::showLicence();
 }
 void KABCore::removeVoice()
 {
    if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
        return;
    KABC::Addressee::List list = mViewManager->selectedAddressees();
    KABC::Addressee::List::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        
        if ( (*it).removeVoice() )
            contactModified((*it) );
    }
 }
 void KABCore::clipboardDataChanged()
 {
  if ( mReadWrite )
    mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 }
 void KABCore::updateActionMenu()
 {
  UndoStack *undo = UndoStack::instance();
  RedoStack *redo = RedoStack::instance();
  if ( undo->isEmpty() )
    mActionUndo->setText( i18n( "Undo" ) );
  else
    mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
  mActionUndo->setEnabled( !undo->isEmpty() );
  if ( !redo->top() )
    mActionRedo->setText( i18n( "Redo" ) );
  else
    mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
  mActionRedo->setEnabled( !redo->isEmpty() );
 }
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
  KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
  qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
  KRES::KCMKResources dlg( this, "" , 0 );
  if ( !dlg.exec() )
    return;
  KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
 * for the attendees list of an event.
 */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
  QStringList nameList;
  QStringList emailList;
  QStringList uidList;
  KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
  uint i=0;
  for (i=0; i < list.count(); i++)
  {
        nameList.append(list[i].realName());
        emailList.append(list[i].preferredEmail());
        uidList.append(list[i].uid());
  }
  bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
 }
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
 * to put them into the calendar.
 */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
  //  qDebug("KABCore::requestForBirthdayList");
  QStringList birthdayList;
  QStringList anniversaryList;
  QStringList realNameList;
  QStringList preferredEmailList;
  QStringList assembledNameList;
  QStringList uidList;
  KABC::AddressBook::Iterator it;
    int count = 0;
    for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
        ++count;
    }
    QProgressBar bar(count,0 );
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
        w = 220;
    int h = bar.sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
    bar.show();
-    bar.setCaption (i18n("collecting birthdays - close to abort!") );
+    bar.setCaption (i18n("Collecting birthdays - close to abort!") );
    qApp->processEvents();
    QDate bday;
    QString anni;
    QString formattedbday;
  for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it )  
  {
        if ( ! bar.isVisible() )
            return;
        bar.setProgress( count++ );
        qApp->processEvents();
        bday = (*it).birthday().date();
        anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" );
        if ( bday.isValid() || !anni.isEmpty())
        {
          if (bday.isValid()) 
            formattedbday = KGlobal::locale()->formatDate(bday,  true, KLocale::ISODate);
          else
            formattedbday = "NOTVALID";
          if (anni.isEmpty())
            anni = "INVALID";
            
          birthdayList.append(formattedbday);
          anniversaryList.append(anni); //should be ISODate
          realNameList.append((*it).realName());
          preferredEmailList.append((*it).preferredEmail());
          assembledNameList.append((*it).assembledName());
          uidList.append((*it).uid());
          qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() );
        }
  }
  bool res = ExternalAppHandler::instance()->returnBirthdayListFromKAPI(sourceChannel, uid, birthdayList, anniversaryList, realNameList, preferredEmailList, assembledNameList, uidList);
 }
 /* this method will be called through the QCop interface from other apps to show details of a contact.
 */
 void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
 {
    qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
    QString foundUid = QString::null;
    if ( ! uid.isEmpty() ) {
        Addressee adrr = mAddressBook->findByUid( uid );
        if (  !adrr.isEmpty() ) {
            foundUid = uid;
        }
            if ( email == "sendbacklist" ) {
                //qDebug("ssssssssssssssssssssssend ");
                QStringList nameList;
                QStringList emailList;
                QStringList uidList;
                nameList.append(adrr.realName());
                emailList = adrr.emails();
                uidList.append( adrr.preferredEmail());
                bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
                return;
            }
        
    }
  
  if ( email == "sendbacklist" ) 
      return;
  if (foundUid.isEmpty())
  {
    //find the uid of the person first
    Addressee::List namelist;
    Addressee::List emaillist;
    if (!name.isEmpty())
      namelist = mAddressBook->findByName( name );
    if (!email.isEmpty())
      emaillist = mAddressBook->findByEmail( email );
    qDebug("count %d %d ",  namelist.count(),emaillist.count() );
    //check if we have a match in Namelist and Emaillist
    if ((namelist.count() == 0) && (emaillist.count() > 0)) {
      foundUid = emaillist[0].uid();
    }
    else if ((namelist.count() > 0) && (emaillist.count() == 0))
      foundUid = namelist[0].uid();
    else
    {
      for (int i = 0; i < namelist.count(); i++)
      {
        for (int j = 0; j < emaillist.count(); j++)
        {
          if (namelist[i] == emaillist[j])
          {
            foundUid = namelist[i].uid();
          }
        }
      }
    }
  }
  else
  {
    foundUid = uid;
  }
  if (!foundUid.isEmpty())
  {
   
    // raise Ka/Pi if it is in the background
 #ifndef DESKTOP_VERSION
 #ifndef KORG_NODCOP
      //QCopEnvelope e("QPE/Application/kapi", "raise()");
 #endif
 #endif
    
    mMainWindow->showMaximized();
    mMainWindow-> raise();
    mViewManager->setSelected( "", false);
    mViewManager->refreshView( "" );
    mViewManager->setSelected( foundUid, true );
    mViewManager->refreshView( foundUid );
    if ( !mMultipleViewsAtOnce )
    {
      setDetailsVisible( true );
      mActionDetails->setChecked(true);
    }
  }
@@ -2684,191 +2685,191 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                        }
                    }
                }
            }
        }
        ++incCounter;
    }
    el.clear();
    syncManager->hideProgressBar();
    mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
    // get rid of micro seconds
    QTime t =  mLastAddressbookSync.time();
    mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
    addresseeLSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
    addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
    addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
    addresseeLSync.setGivenName(i18n("!DO NOT EDIT!")   );
    addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
    addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
    addresseeRSync.setNote( "" ) ;
    addresseeLSync.setNote( "" );
    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
        remote->insertAddressee( addresseeRSync, false );
    local->insertAddressee( addresseeLSync, false );
    QString mes;
    mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
    if ( syncManager->mShowSyncSummary ) {
        KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
    }
    qDebug( mes );
    return syncOK;
 }
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 { 
    //pending prepare addresseeview for output
    //pending detect, if remote file has REV field. if not switch to external sync
    mGlobalSyncMode = SYNC_MODE_NORMAL;
    QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
    AddressBook abLocal(filename,"syncContact");
    bool syncOK = false;
    if ( abLocal.load() ) {
        qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
        bool external = false;
        bool isXML = false;
        if ( filename.right(4) == ".xml") {
            mGlobalSyncMode = SYNC_MODE_EXTERNAL;
            isXML = true;
            abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
        } else {
            external = !manager->mIsKapiFile;
            if ( external ) {
                qDebug("Setting vcf mode to external ");
                mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                AddressBook::Iterator it;  
                for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                    (*it).setID( mCurrentSyncDevice, (*it).uid() );
                    (*it).computeCsum( mCurrentSyncDevice );
                }
            }
        }
        //AddressBook::Iterator it;
        //QStringList vcards;
        //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
        //  qDebug("Name %s ", (*it).familyName().latin1());
        //}
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile )
                {
                    if ( external )
                        abLocal.removeSyncAddressees( !isXML);
                    qDebug("Saving remote AB ");
                    if ( ! abLocal.saveAB()) 
                        qDebug("Error writing back AB to file ");
                    if ( isXML ) {
                        // afterwrite processing
                        abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
                    }
                }
        }
        setModified();
        
    }
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 }
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
    if (  resource == "phone" )
        return syncPhone();
    QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
    AddressBook abLocal( resource,"syncContact");
    bool syncOK = false;
    if ( abLocal.load() ) {
        qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
        mGlobalSyncMode = SYNC_MODE_EXTERNAL;
        abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile ) {
                abLocal.removeSyncAddressees( false );
                abLocal.saveAB();
                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
            }
        }
        setModified();
    }
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 }
 void KABCore::message( QString m )
 {
-    
    topLevelWidget()->setCaption( m );
-    QTimer::singleShot( 15000, this , SLOT ( setCaptionBack()));
+    mMessageTimer->start( 15000, true );
 }
 bool KABCore::syncPhone()
 {
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    QString fileName = getPhoneFile();
    if ( !PhoneAccess::readFromPhone( fileName) ) {
        message(i18n("Phone access failed!"));
        return false;
    }   
    AddressBook abLocal( fileName,"syncContact");
    bool syncOK = false;
     {
         abLocal.importFromFile( fileName );
        qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
        mGlobalSyncMode = SYNC_MODE_EXTERNAL;
        abLocal.preparePhoneSync( mCurrentSyncDevice, true );
        abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile ) {
                abLocal.removeSyncAddressees( true );
                abLocal.saveABphone( fileName );
                abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
                //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
                abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
            }
        }
        setModified();
    }
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 }
 void KABCore::getFile( bool success )
 {
    if ( ! success ) {
        message( i18n("Error receiving file. Nothing changed!") );
        return;
    }
    mAddressBook->importFromFile( sentSyncFile() , false, true );
    message( i18n("Pi-Sync successful!") );
    mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 {
    mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef _WIN32_
    return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
    return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 void KABCore::setCaptionBack()
 {
+    mMessageTimer->stop();
    topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 5871d39..c7be343 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -1,490 +1,491 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    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 KABCORE_H
 #define KABCORE_H
 #include <kabc/field.h>
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 #include <qdict.h>
+#include <qtimer.h>
 #include <qwidget.h>
 #include <qpopupmenu.h>
 #include <ksyncmanager.h>
 namespace KABC {
 class AddressBook;
 }
 #ifndef KAB_EMBEDDED
 class KAboutData;
 class KConfig;
 class KAddressBookService;
 class LDAPSearchDialog;
 #else //KAB_EMBEDDED
 class KAddressBookMain;
 //US class QAction;
 #endif //KAB_EMBEDDED
 class KCMultiDialog;
 class KXMLGUIClient;
 class ExtensionManager;
 class XXPortManager;
 class JumpButtonBar;
 class IncSearchWidget;
 class KDGanttMinimizeSplitter;
 class KAction;
 class KActionCollection;
 class KToggleAction;
 class KSyncProfile;
 class QAction;
 class QMenuBar;
 class QSplitter;
 class ViewContainer;
 class ViewManager;
 class AddresseeEditorDialog;
 class Ir;
 class KABCore : public QWidget, public KSyncInterface
 {
  Q_OBJECT
  public:
    KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 );
    ~KABCore();
 #ifdef KAB_EMBEDDED
  //US added functionality
    QPopupMenu* getViewMenu() {return viewMenu;}
    QPopupMenu* getFilterMenu() {return filterMenu;}
    QPopupMenu* getSettingsMenu() {return settingsMenu;}
    void addActionsManually();
 #endif //KAB_EMBEDDED
    /**
      Restores the global settings.
     */
    void restoreSettings();
    /**
      Saves the global settings.
     */
    void saveSettings();
    /**
      Returns a pointer to the StdAddressBook of the application.
     */
    KABC::AddressBook *addressBook() const;
    /**
      Returns a pointer to the KConfig object of the application.
     */
    static KConfig *config();
    /**
      Returns a pointer to the global KActionCollection object. So
      other classes can register their actions easily.
     */
    KActionCollection *actionCollection() const;
    /**
      Returns the current search field of the Incremental Search Widget.
     */
    KABC::Field *currentSearchField() const;
    /**
      Returns the uid list of the currently selected contacts.
     */
    QStringList selectedUIDs() const;
    /**
      Displays the ResourceSelectDialog and returns the selected
      resource or a null pointer if no resource was selected by
      the user.
     */
    KABC::Resource *requestResource( QWidget *parent );
 #ifndef KAB_EMBEDDED
    static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 #ifdef KAB_EMBEDDED
    inline QPopupMenu* getImportMenu() { return ImportMenu;}
    inline QPopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
  public slots:
 #ifdef KAB_EMBEDDED
    void createAboutData();
 #endif //KAB_EMBEDDED
-    void statusMessage(QString, int time = 0 );
    void showLicence();
    void faq();
    void whatsnew() ;
    void synchowto() ;
    void writeToPhone();
    /**
      Is called whenever a contact is selected in the view.
     */
    void setContactSelected( const QString &uid );
    /**
      Opens the preferred mail composer with all selected contacts as
      arguments.
     */
    void sendMail();
    /**
      Opens the preferred mail composer with the given contacts as
      arguments.
     */
    void sendMail( const QString& email );
    void mailVCard();
    void mailVCard(const QStringList& uids);
    /**
      Beams the "WhoAmI contact.
     */
    void beamMySelf();
    void beamVCard();
    void export2phone();
    void beamVCard(const QStringList& uids);
    void beamDone( Ir *ir );
    /**
      Starts the preferred web browser with the given URL as argument.
     */
    void browse( const QString& url );
    /**
      Select all contacts in the view.
     */
    void selectAllContacts();
    /**
      Deletes all selected contacts from the address book.
     */
    void deleteContacts();
    /**
      Deletes given contacts from the address book.
      @param uids The uids of the contacts, which shall be deleted.
     */
    void deleteContacts( const QStringList &uids );
    /**
      Copys the selected contacts into clipboard for later pasting.
     */
    void copyContacts();
    /**
      Cuts the selected contacts and stores them for later pasting.
     */
    void cutContacts();
    /**
      Paste contacts from clipboard into the address book.
     */
    void pasteContacts();
    /**
      Paste given contacts into the address book.
      @param list The list of addressee, which shall be pasted.
     */
    void pasteContacts( KABC::Addressee::List &list );
    /**
      Sets the whoAmI contact, that is used by many other programs to
      get personal information about the current user.
     */
    void setWhoAmI();
    /**
      Displays the category dialog and applies the result to all
      selected contacts.
     */
    void setCategories();
    /**
      Sets the field list of the Incremental Search Widget.
     */
    void setSearchFields( const KABC::Field::List &fields );
    /**
      Search with the current search field for a contact, that matches
      the given text, and selects it in the view.
     */
    void incrementalSearch( const QString& text );
    /**
      Marks the address book as modified.
     */
    void setModified();
    /**
      Marks the address book as modified without refreshing the view.
     */
    void setModifiedWOrefresh();
    /**
      Marks the address book as modified concerning the argument.
     */
    void setModified( bool modified );
    /**
      Returns whether the address book is modified.
     */
    bool modified() const;
    /**
      Called whenever an contact is modified in the contact editor
      dialog or the quick edit.
     */
    void contactModified( const KABC::Addressee &addr );
    /**
      DCOP METHODS.
     */
    void addEmail( QString addr );
    void importVCard( const KURL& url, bool showPreview );
    void importVCard( const QString& vCard, bool showPreview );
    void newContact();
    QString getNameByPhone( const QString& phone );
    /**
      END DCOP METHODS
     */
    /**
      Saves the contents of the AddressBook back to disk.
     */
    void save();
    /**
      Undos the last command using the undo stack.
     */
    void undo();
    /**
      Redos the last command that was undone, using the redo stack.
     */
    void redo();
    /**
      Shows the edit dialog for the given uid. If the uid is QString::null,
      the method will try to find a selected addressee in the view.
     */
    void editContact( const QString &uid /*US = QString::null*/ );
 //US added a second method without defaultparameter
    void editContact2();
    /**
      Shows or edits the detail view for the given uid. If the uid is QString::null,
      the method will try to find a selected addressee in the view.
     */
    void executeContact( const QString &uid /*US = QString::null*/ );
    /**
      Launches the configuration dialog.
     */
    void openConfigDialog();
    /**
      Launches the ldap search dialog.
     */
    void openLDAPDialog();
    /**
      Creates a KAddressBookPrinter, which will display the print
      dialog and do the printing.
     */
    void print();
    /**
      Registers a new GUI client, so plugins can register its actions.
     */
   void addGUIClient( KXMLGUIClient *client );
   void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
   void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
   void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
  signals:
    void contactSelected( const QString &name );
    void contactSelected( const QPixmap &pixmap );
  public slots:
    void recieve(QString cmsg );
    void getFile( bool success );
    void syncFileRequest();
    void setDetailsVisible( bool visible );
    void setDetailsToState();
    //    void slotSyncMenu( int );
  private slots:
    void setJumpButtonBarVisible( bool visible );
    void setCaptionBack();
  void importFromOL();
    void extensionModified( const KABC::Addressee::List &list );
    void extensionChanged( int id );
    void clipboardDataChanged();
    void updateActionMenu();
    void configureKeyBindings();
    void removeVoice();
 #ifdef KAB_EMBEDDED
    void configureResources();
 #endif //KAB_EMBEDDED
    void slotEditorDestroyed( const QString &uid );
    void configurationChanged();
    void addressBookChanged();
  private:
+    QTimer *mMessageTimer;
    void initGUI();
    void initActions();
    QString getPhoneFile();
    AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                        const char *name = 0 );
 KXMLGUIClient *mGUIClient;
  KABC::AddressBook *mAddressBook;
  ViewManager *mViewManager;
  // QSplitter *mDetailsSplitter;
  KDGanttMinimizeSplitter *mExtensionBarSplitter;
  ViewContainer *mDetails;
  KDGanttMinimizeSplitter* mMiniSplitter;
  XXPortManager *mXXPortManager;
  JumpButtonBar *mJumpButtonBar;
  IncSearchWidget *mIncSearchWidget;
  ExtensionManager *mExtensionManager;
  KCMultiDialog *mConfigureDialog;
 #ifndef KAB_EMBEDDED
    LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
    // QDict<AddresseeEditorDialog> mEditorDict;
    AddresseeEditorDialog *mEditorDialog;
    bool mReadWrite;
    bool mModified;
    bool mIsPart;
    bool mMultipleViewsAtOnce;
    //US file menu
    KAction *mActionMail;
    KAction *mActionBeam;
    KAction *mActionExport2phone;
    KAction* mActionPrint;
    KAction* mActionNewContact;
    KAction *mActionSave;
    KAction *mActionEditAddressee;
    KAction *mActionMailVCard;
    KAction *mActionBeamVCard;
    KAction *mActionQuit;
    //US edit menu
    KAction *mActionCopy;
    KAction *mActionCut;
    KAction *mActionPaste;
    KAction *mActionSelectAll;
    KAction *mActionUndo;
    KAction *mActionRedo;
    KAction *mActionDelete;
    //US settings menu
    KAction *mActionConfigResources;
    KAction *mActionConfigKAddressbook;
    KAction *mActionConfigShortcuts;
    KAction *mActionConfigureToolbars;
    KAction *mActionKeyBindings;
    KToggleAction *mActionJumpBar;
    KToggleAction *mActionDetails;
    KAction *mActionWhoAmI;
    KAction *mActionCategories;
    KAction *mActionAboutKAddressbook;
    KAction *mActionLicence;
    KAction *mActionFaq;
    KAction *mActionWN;
    KAction *mActionSyncHowto;
    KAction *mActionDeleteView;
    QPopupMenu *viewMenu;
    QPopupMenu *filterMenu;
    QPopupMenu *settingsMenu;
    QPopupMenu *changeMenu;
 //US    QAction *mActionSave;
    QPopupMenu *ImportMenu;
    QPopupMenu *ExportMenu;
    //LR additional methods
    KAction *mActionRemoveVoice;
    KAction * mActionImportOL;
 #ifndef KAB_EMBEDDED
    KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
    class KABCorePrivate;
    KABCorePrivate *d;
    //US    bool mBlockSaveFlag;
 #ifdef KAB_EMBEDDED
    KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
    //this are the overwritten callbackmethods from the syncinterface
    virtual bool sync(KSyncManager* manager, QString filename, int mode);
    virtual bool syncExternal(KSyncManager* manager, QString resource);
    bool syncPhone();
    void message( QString m );
    // LR *******************************
    // sync stuff!
    QString sentSyncFile();
    QPopupMenu *syncMenu;
    KSyncManager* syncManager;
    int mGlobalSyncMode; 
    bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
    KABC::Addressee getLastSyncAddressee();
    QDateTime mLastAddressbookSync;
    int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
    // *********************
 };
 #endif