more sync

5 files changed, 41 insertions, 17 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index e04f4b1..bdc2762 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -102,814 +102,838 @@ AddressBook::Iterator::~Iterator()
   delete d;
 }
 
 const Addressee &AddressBook::Iterator::operator*() const
 {
   return *(d->mIt);
 }
 
 Addressee &AddressBook::Iterator::operator*()
 {
   return *(d->mIt);
 }
 
 Addressee *AddressBook::Iterator::operator->()
 {
   return &(*(d->mIt));
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator++()
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator++(int)
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator--()
 {
   (d->mIt)--;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator--(int)
 {
   (d->mIt)--;
   return *this;
 }
 
 bool AddressBook::Iterator::operator==( const Iterator &it )
 {
   return ( d->mIt == it.d->mIt );
 }
 
 bool AddressBook::Iterator::operator!=( const Iterator &it )
 {
   return ( d->mIt != it.d->mIt );
 }
 
 
 AddressBook::ConstIterator::ConstIterator()
 {
   d = new ConstIteratorData;
 }
 
 AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i )
 {
   d = new ConstIteratorData;
   d->mIt = i.d->mIt;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i )
 {
   if( this  == &i ) return *this; // guard for self assignment
   delete d; // delete the old data because the Iterator was really constructed before
   d = new ConstIteratorData;
   d->mIt = i.d->mIt;
   return *this;
 }
 
 AddressBook::ConstIterator::~ConstIterator()
 {
   delete d;
 }
 
 const Addressee &AddressBook::ConstIterator::operator*() const
 {
   return *(d->mIt);
 }
 
 const Addressee* AddressBook::ConstIterator::operator->() const
 {
   return &(*(d->mIt));
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++()
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int)
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--()
 {
   (d->mIt)--;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int)
 {
   (d->mIt)--;
   return *this;
 }
 
 bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
 {
   return ( d->mIt == it.d->mIt );
 }
 
 bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 {
   return ( d->mIt != it.d->mIt );
 }
 
 
 AddressBook::AddressBook()
 {
   init(0, "contact");
 }
 
 AddressBook::AddressBook( const QString &config )
 {
   init(config, "contact");
 }
 
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
   init(config, family);
 
 }
 
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
   blockLSEchange = false;
   d = new AddressBookData;
   QString fami = family;
   if (config != 0) {
       if ( family == "syncContact" ) {
           qDebug("creating sync config ");
           fami = "contact";
           KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
           con->setGroup( "General" );
           con->writeEntry( "ResourceKeys", QString("sync") );
           con->writeEntry( "Standard", QString("sync") );
           con->setGroup( "Resource_sync" );
           con->writeEntry( "FileName", config );
           con->writeEntry( "FileFormat", QString("vcard") );
           con->writeEntry( "ResourceIdentifier", QString("sync") );
           con->writeEntry( "ResourceName", QString("sync_res") );
           if ( config.right(4) == ".xml" )
               con->writeEntry( "ResourceType", QString("qtopia") );
           else if (  config == "sharp"            ) {
               con->writeEntry( "ResourceType", QString("sharp") );
           } else {
               con->writeEntry( "ResourceType", QString("file") );
           }
           //con->sync();
           d->mConfig = con;
       }
       else
     d->mConfig = new KConfig( locateLocal("config", config) );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
   }
   else {
     d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
   }
 
 //US  d->mErrorHandler = 0;
   d->mManager = new KRES::Manager<Resource>( fami );
   d->mManager->readConfig( d->mConfig );
   if ( family == "syncContact" ) {
       KRES::Manager<Resource> *manager = d->mManager;
       KRES::Manager<Resource>::ActiveIterator it;
       for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
           (*it)->setAddressBook( this );
           if ( !(*it)->open() )
               error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
       }
       Resource *res = standardResource();
       if ( !res ) {
           qDebug("ERROR: no standard resource");
           res = manager->createResource( "file" );
           if ( res )
               {
                   addResource( res );
               }
           else
               qDebug(" No resource available!!!");
       }
       setStandardResource( res );
       manager->writeConfig();
   }
   addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                 "X-Department", "KADDRESSBOOK" );
   addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                 "X-Profession", "KADDRESSBOOK" );
   addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                 "X-AssistantsName", "KADDRESSBOOK" );
   addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                 "X-ManagersName", "KADDRESSBOOK" );
   addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                 "X-SpousesName", "KADDRESSBOOK" );
   addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                 "X-Office", "KADDRESSBOOK" );
   addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                 "X-IMAddress", "KADDRESSBOOK" );
   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.
   addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                 "X-Gender", "KADDRESSBOOK" );
   addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                 "X-Children", "KADDRESSBOOK" );
   addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
   addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
                                 "X-ExternalID", "KADDRESSBOOK" );
 }
 
 AddressBook::~AddressBook()
 {
   delete d->mConfig; d->mConfig = 0;
   delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
   delete d; d = 0;
 }
 
 bool AddressBook::load()
 {
 
   clear();
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
       qDebug( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
     } else {
       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, QString resourceName )
 {
   
   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()  ) {
           bool include = (*it).resource()->includeInSync();
           if ( !resourceName.isEmpty()  )
               include = (resourceName == (*it).resource()->name() );
           if ( include ) {
               qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) );
               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;
 
 }
-int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
+int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld, QString resource   )
 {
 
     if ( removeOld )
-        setUntagged( true );
+        setUntagged( true, resource );
     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;
+
+    Resource * setRes = 0;
+    if ( !resource.isEmpty() ) {
+        KRES::Manager<Resource>::ActiveIterator it;
+        KRES::Manager<Resource> *manager = d->mManager;
+        for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
+            qDebug("SaveAB::checking resource..." );
+            if ( (*it)->name() == resource  ) {
+                setRes = (*it);
+                qDebug("Inserting imported contacs to resource %s", resource.latin1());
+                break;
+            }
+        }
+    }
     for ( it = list.begin(); it != list.end(); ++it ) {
         QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
         if ( !id.isEmpty() ) 
             (*it).setIDStr(id );
-        (*it).setResource( 0 );
+        (*it).setResource(  setRes );
         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)
+void AddressBook::setUntagged(bool setNonSyncTagged, QString resource) // = false , "")
 {
     Iterator ait;
-    for ( ait = begin(); ait != end(); ++ait ) {
-        if ( setNonSyncTagged ) {
-            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
+    if ( !resource.isEmpty() ) {
+        for ( ait = begin(); ait != end(); ++ait ) {
+            if ( (*ait).resource() && (*ait).resource()->name() == resource ) {
+                (*ait).setTagged( false );
+            }
+            else
                 (*ait).setTagged( true );
+        }
+    } else {
+        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 );
-        } 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::removeSyncInfo( QString syncProfile)
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).removeID( syncProfile );
     } 
     if ( syncProfile.isEmpty() ) {
         Iterator it = begin();
         Iterator it2 ;
         while ( it != end() ) {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 it2 = it;
                 //qDebug("removing %s ",(*it).uid().latin1() );
                 ++it;
                 removeAddressee( it2 );
             } else  {
                 //qDebug("skipping %s ",(*it).uid().latin1() );
                 ++it;
             }
         }
     } else { 
         Addressee lse;
         lse =  findByUid( "last-syncAddressee-"+ syncProfile );
         if ( ! lse.isEmpty() )
             removeAddressee( lse );  
     }
 
 }
 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;
   KRES::Manager<Resource> *manager = d->mManager;
   qDebug("SaveAB::saving..." );
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
       qDebug("SaveAB::checking resource..." );
       if ( (*it)->readOnly() )
           qDebug("SaveAB::resource is readonly." );
       if ( (*it)->isOpen() )
           qDebug("SaveAB::resource is open" );
       
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = requestSaveTicket( *it );
       qDebug("SaveAB::StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         qDebug( i18n( "SaveAB::Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
       //if ( !save( ticket ) ) 
       if ( ticket->resource() ) {
           QString name = ticket->resource()->resourceName();
           if ( ! ticket->resource()->save( ticket )  )
               ok = false;
           else
               qDebug("SaveAB::resource saved '%s'", name.latin1() );
               
       } else 
           ok = false;
           
     }
   }
   return ok;
 }
 
 AddressBook::Iterator AddressBook::begin()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::begin() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::Iterator AddressBook::end()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.end();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::end() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.end();
   return it;
 }
 
 void AddressBook::clear()
 {
   d->mAddressees.clear();
 }
 
 Ticket *AddressBook::requestSaveTicket( Resource *resource )
 {
   kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
 
   if ( !resource )
   {
     qDebug("AddressBook::requestSaveTicket no resource" );
     resource = standardResource();
   }
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( (*it) == resource ) {
       if ( (*it)->readOnly() || !(*it)->isOpen() )
         return 0;
       else
         return (*it)->requestSaveTicket();
     }
   }
 
   return 0;
 }
 //void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
 void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeResource )
 {
     if ( blockLSEchange && setRev && a.uid().left( 19 ) == QString("last-syncAddressee-") ) {
         //qDebug("block insert ");
         return;
     }
     //qDebug("inserting.... %s ",a.uid().latin1() );
     bool found = false;
     Addressee::List::Iterator it;
     for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
         if ( a.uid() == (*it).uid() ) {
        
             bool changed = false;
             Addressee addr = a;
             if ( addr != (*it) )
                 changed = true;
 
             if ( takeResource ) {
                 Resource * res = (*it).resource();
                 (*it) = a;
                 (*it).setResource( res );
             } else {
                 (*it) = a;
                 if ( (*it).resource() == 0 )
                     (*it).setResource( standardResource() );
             }
             if ( changed ) {
                 if ( setRev ) {
                     (*it).setRevision( QDateTime::currentDateTime() ); 
                 }
                 (*it).setChanged( true );
             }
 
             found = true;
         } else {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 QString name = (*it).uid().mid( 19 );
                 Addressee b = a;
                 QString id = b.getID( name );
                 if (  ! id.isEmpty() ) {
                     QString des = (*it).note();
                     int startN;
                     if( (startN = des.find( id ) ) >= 0 ) {
                         int endN = des.find( ",", startN+1 );
                         des =  des.left( startN ) + des.mid( endN+1 );
                         (*it).setNote( des );
                     }
                 }
             }
         }
     }
     if ( found )
         return; 
     
     d->mAddressees.append( a );
     Addressee& addr = d->mAddressees.last();
     if ( addr.resource() == 0 )
         addr.setResource( standardResource() );
     addr.setChanged( true );
 }
 
 void AddressBook::removeAddressee( const Addressee &a )
 {
   Iterator it;
   Iterator it2;
   bool found = false;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
         found = true;
         it2 = it;
     } else {
         if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
             QString name = (*it).uid().mid( 19 );
             Addressee b = a;
             QString id = b.getID( name );
             if ( ! id.isEmpty() ) {
                 QString des = (*it).note();
                 if( des.find( id ) < 0 ) {
                     des +=   id  + ",";
                     (*it).setNote( des );
                 }
             }
         }
         
     }
   }
 
   if ( found )
       removeAddressee( it2 );
       
 }
 
 void AddressBook::removeSyncAddressees( bool removeDeleted )
 {
     Iterator it = begin();
     Iterator it2 ;
     QDateTime dt ( QDate( 2003,1,1) );
     while ( it != end() ) {
         (*it).setRevision( dt );
         if (( *it).IDStr() != "changed" ) { 
             // "changed" is used for tagging changed addressees when syncing with KDE or OL
             (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
             (*it).setIDStr(":");
         }
         if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted  )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
             it2 = it;
             //qDebug("removing %s ",(*it).uid().latin1() );
             ++it;
             removeAddressee( it2 );
         } else  {
             //qDebug("skipping %s ",(*it).uid().latin1() );
             if ( removeDeleted ) {
                 // we have no postprocessing in the resource, we have to do it here
                 // we have to compute csum for all, because it could be the first sync
                 (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             }
             ++it;
         }
     }
     deleteRemovedAddressees();
 }
 
 void AddressBook::removeAddressee( const Iterator &it )
 {
   d->mRemovedAddressees.append( (*it) );
   d->mAddressees.remove( it.d->mIt );
 }
 
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
       return it;
     }
   }
   return end();
 }
 
 Addressee AddressBook::findByUid( const QString &uid )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( uid == (*it).uid() ) {
       return *it;
     }
   }
   return Addressee();
 }
 void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool isSubset )
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 4a0d0a3..e6daa5e 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -1,350 +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_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 removeSyncInfo( QString syncProfile); 
     void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
     void export2File( QString fileName, QString resourceName = "" );
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
-    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
-    void setUntagged( bool setNonSyncTagged = false );
+    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false, QString resource = "" );
+    void setUntagged( bool setNonSyncTagged = false, QString resource = "" );
     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.
     */
     void removeResources();
     bool removeResource( Resource * );
 
     /**
       Return pointer list of all resources.
     */
     QPtrList<Resource> resources();
 
     /**
       Set the @p ErrorHandler, that is used by @ref error() to
       provide gui-independend error messages.
     */
     void setErrorHandler( ErrorHandler * );
 
     /**
       Shows gui independend error messages.
     */
     void error( const QString& );
 
     /**
       Query all resources to clean up their lock files
      */
     void cleanUp();
 
     // sync stuff 
     //Addressee::List getExternLastSyncAddressees();
     void resetTempSyncStat(); 
     QStringList uidList(); 
     void removeSyncAddressees( bool removeDeleted = false );
     void  mergeAB( AddressBook *aBook, const QString& profile, bool isSubset );
     const Addressee findByExternUid( const QString& uid , const QString& profile  ) const;
     bool   containsExternalUid( const QString& uid  );
 
     void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset );
     void postExternSync( AddressBook* aBook, const QString& csd , bool setID );
   signals:
     /**
       Emitted, when the address book has changed on disk.
     */
     void addressBookChanged( AddressBook * );
 
     /**
       Emitted, when the address book has been locked for writing.
     */
     void addressBookLocked( AddressBook * );
 
     /**
       Emitted, when the address book has been unlocked.
     */
     void addressBookUnlocked( AddressBook * );
 
   protected:
     void deleteRemovedAddressees();
     void setStandardResource( Resource * );
     Resource *standardResource();
     KRES::Manager<Resource> *resourceManager();
 
     void init(const QString &config, const QString &family);
 
   private:
 //US    QPtrList<Resource> mDummy; // Remove in KDE 4
 
 
     struct AddressBookData;
     AddressBookData *d;
     bool blockLSEchange;
 };
 
 QDataStream &operator<<( QDataStream &, const AddressBook & );
 QDataStream &operator>>( QDataStream &, AddressBook & );
 
 }
 
 #endif
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5d377bf..7d8586a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1556,769 +1556,769 @@ void KABCore::setDetailsVisible( bool visible )
       mDetails->show();
     else
       mDetails->hide();
   }
   else
   {
     if ( visible ) {
       mViewManager->hide();
       mDetails->show();
       mIncSearchWidget->setFocus();
     }
     else {
       mViewManager->show();
       mDetails->hide();
       mViewManager->setFocusAV();
     }
     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 )
 {
 
   if ( list.count() != 0 ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it )
       mAddressBook->insertAddressee( *it );
     if ( list.count() > 1 )
         setModified();
     else
         setModifiedWOrefresh();
   }
   if ( list.count() == 0 )
     mViewManager->refreshView();
   else
      mViewManager->refreshView( list[ 0 ].uid() );
 
 
 
 }
 
 QString KABCore::getNameByPhone( const QString &phone )
 {
 #ifndef KAB_EMBEDDED
   QRegExp r( "[/*/-/ ]" );
   QString localPhone( phone );
 
   bool found = false;
   QString ownerName = "";
   KABC::AddressBook::Iterator iter;
   KABC::PhoneNumber::List::Iterator phoneIter;
   KABC::PhoneNumber::List phoneList;
   for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) {
     phoneList = (*iter).phoneNumbers();
     for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() );
           ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
       if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
         ownerName = (*iter).formattedName();
         found = true;
       }
     }
   }
 
   return ownerName;
 #else //KAB_EMBEDDED
   qDebug("KABCore::getNameByPhone finsih method");
   return "";
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::openConfigGlobalDialog()
 {
     KPimPrefsGlobalDialog gc ( this );
     gc.exec();
 }
 void KABCore::openConfigDialog()
 {
     KDialogBase * ConfigureDialog = new KDialogBase (  KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true);
 
     KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog , "KCMKabConfig" );
     ConfigureDialog->setMainWidget( kabcfg );
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
            this, SLOT( configurationChanged() ) );
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
             kabcfg, SLOT( save() ) );
     connect( ConfigureDialog, SIGNAL( acceptClicked() ),
              this, SLOT( configurationChanged() ) );
     connect( ConfigureDialog, SIGNAL( acceptClicked() ),
              kabcfg, SLOT( save() ) );
     connect( ConfigureDialog, SIGNAL( defaultClicked() ),
              kabcfg, SLOT( defaults() ) );
     saveSettings();
     kabcfg->load();
 #ifndef DESKTOP_VERSION
     if ( QApplication::desktop()->height() <= 480 )
         ConfigureDialog->hideButtons(); 
     ConfigureDialog->showMaximized();
 #endif
     if ( ConfigureDialog->exec() )
         KMessageBox::information( this,  i18n("Some changes are only\neffective after a restart!\n") );
     delete ConfigureDialog;
 }
 
 void KABCore::openLDAPDialog()
 {
 #ifndef KAB_EMBEDDED
   if ( !mLdapSearchDialog ) {
     mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
             SLOT( refreshView() ) );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this,
             SLOT( setModified() ) );
   } else
     mLdapSearchDialog->restoreSettings();
 
   if ( mLdapSearchDialog->isOK() )
     mLdapSearchDialog->exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::openLDAPDialog() finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::print()
 {
 #ifndef KAB_EMBEDDED
   KPrinter printer;
   if ( !printer.setup( this ) )
     return;
 
   KABPrinting::PrintingWizard wizard( &printer, mAddressBook,
                                       mViewManager->selectedUids(), this );
 
   wizard.exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::print() finsih method");
 #endif //KAB_EMBEDDED
 
 }
 
 
 void KABCore::addGUIClient( KXMLGUIClient *client )
 {
   if ( mGUIClient )
     mGUIClient->insertChildClient( client );
   else
     KMessageBox::error( this, "no KXMLGUICLient");
 }
 
 
 void KABCore::configurationChanged()
 {
   mExtensionManager->reconfigure();
 }
 
 void KABCore::addressBookChanged()
 {
 /*US
   QDictIterator<AddresseeEditorDialog> it( mEditorDict );
   while ( it.current() ) {
     if ( it.current()->dirty() ) {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
     ++it;
   }
 */
   if (mEditorDialog)
   {
     if (mEditorDialog->dirty())
     {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     QString currentuid = mEditorDialog->addressee().uid();
     mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
   }
   mViewManager->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) ;
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
   //topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
   syncMenu = new QPopupMenu( this );
   changeMenu= new QPopupMenu( this );
   beamMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
 
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   syncManager->setBlockSave(false);
 
     connect(syncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) );
-    connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+    connect(syncManager , SIGNAL( getFile( bool ,const QString &)), this, SLOT(getFile( bool ,const QString &) ) );
     QString sync_file = sentSyncFile();
     //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1());
     syncManager->setDefaultFileName( sync_file );
     //connect(syncManager , SIGNAL( ), this, SLOT( ) );
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
   connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
  
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
     mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print" );
   
 
     mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print2" );
 
   mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
 
   mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
   mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                                SLOT( export2phone() ), actionCollection(),
                                "kaddressbook_ex2phone" );
 
   mActionBeamVCard = 0;
  mActionBeam = 0;
 
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) {
     mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this,
                                SLOT( beamVCard() ), actionCollection(),
                                "kaddressbook_beam_vcard" );
 
     mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
                                SLOT( beamMySelf() ), actionCollection(),
                                "kaddressbook_beam_myself" );
   }
 #endif
 
   mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
                                       this, SLOT( editContact2() ),
                                       actionCollection(), "file_properties" );
 
 #ifdef KAB_EMBEDDED
   // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
   mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
                                       mMainWindow, SLOT( exit() ),
                                       actionCollection(), "quit" );
 #endif //KAB_EMBEDDED
 
   // edit menu
   if ( mIsPart ) {
     mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
                                SLOT( copyContacts() ), actionCollection(),
                                "kaddressbook_copy" );
     mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
                               SLOT( cutContacts() ), actionCollection(),
                               "kaddressbook_cut" );
     mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
                                 SLOT( pasteContacts() ), actionCollection(),
                                 "kaddressbook_paste" );
     mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
                   SLOT( selectAllContacts() ), actionCollection(),
                  "kaddressbook_select_all" );
     mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
                                SLOT( undo() ), actionCollection(),
                                "kaddressbook_undo" );
     mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
                                this, SLOT( redo() ), actionCollection(),
                                "kaddressbook_redo" );
   } else {
     mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
     mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
     mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
     mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
     mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
     mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
   }
 
   mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
                                Key_Delete, this, SLOT( deleteContacts() ),
                                actionCollection(), "edit_delete" );
 
   mActionUndo->setEnabled( false );
   mActionRedo->setEnabled( false );
 
   // settings menu
 #ifdef KAB_EMBEDDED
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
                SLOT( configureResources() ), actionCollection(),
                "kaddressbook_configure_resources" );
 #endif //KAB_EMBEDDED
 
   if ( mIsPart ) {
     mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
                  SLOT( openConfigDialog() ), actionCollection(),
                  "kaddressbook_configure" );
 
     //US not implemented yet
     //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
     //             this, SLOT( configureKeyBindings() ), actionCollection(),
     //             "kaddressbook_configure_shortcuts" );
 #ifdef KAB_EMBEDDED
   mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
   mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
 
   } else {
       mActionConfigKAddressbook = new KAction( i18n( "&Configure KA/Pi..." ), "configure", 0, this,
                                                SLOT( openConfigDialog() ), actionCollection(),
                                                "kaddressbook_configure" );  
       mActionConfigGlobal = new KAction( i18n( "Global Settings..." ), "configure", 0, this,
                                          SLOT( openConfigGlobalDialog() ), actionCollection(),
                                          "kaddressbook_configure" );
   }
   mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                       actionCollection(), "options_show_jump_bar" );
   connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) );
 
   mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
                                       actionCollection(), "options_show_details" );
   connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
 
 
   mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
                                SLOT( toggleBeamReceive() ), actionCollection(),
                                "kaddressbook_beam_rec" );
 
 
   // misc
   // only enable LDAP lookup if we can handle the protocol
 #ifndef KAB_EMBEDDED
   if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
     new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
                  this, SLOT( openLDAPDialog() ), actionCollection(),
                  "ldap_lookup" );
   }
 #else //KAB_EMBEDDED
   //qDebug("KABCore::initActions() LDAP has to be implemented");
 #endif //KAB_EMBEDDED
 
 
   mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
                                SLOT( setWhoAmI() ), actionCollection(),
                                "set_personal" );
 
 
   mActionCategories = new KAction( i18n( "Set Categories for Contacts..." ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
   mActionEditCategories = new KAction( i18n( "Edit Category List..." ), 0, this,
                                    SLOT( editCategories() ), actionCollection(),
                                    "edit__categories" );
 
   mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
                                     SLOT( removeVoice() ), actionCollection(),
                                    "remove_voice" );
   mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this,
                                     SLOT( setFormattedName() ), actionCollection(),
                                    "set_formatted" );
 
   mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
                                     SLOT( manageCategories() ), actionCollection(),
                                    "remove_voice" );
 
 
   mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
                                     SLOT( importFromOL() ), actionCollection(),
                                    "import_OL" );
 #ifdef KAB_EMBEDDED
  mActionLicence = new KAction( i18n( "Licence" ), 0,
                  this, SLOT( showLicence() ), actionCollection(),
                  "licence_about_data" );
  mActionFaq = new KAction( i18n( "Faq" ), 0,
                  this, SLOT( faq() ), actionCollection(),
                  "faq_about_data" );
  mActionWN = new KAction( i18n( "What's New?" ), 0,
                  this, SLOT( whatsnew() ), actionCollection(),
                  "wn" );
 
 
   
  mActionStorageHowto = new KAction( i18n( "Storage HowTo" ), 0,
                  this, SLOT( storagehowto() ), actionCollection(),
                  "storage" );
   
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                  this, SLOT( synchowto() ), actionCollection(),
                  "sync" );
  mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
                  this, SLOT( kdesynchowto() ), actionCollection(),
                  "kdesync" );
  mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
                  this, SLOT( multisynchowto() ), actionCollection(),
                  "multisync" );
 
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
 
   clipboardDataChanged();
   connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
   connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
   mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
       QMenuBar* mb = mMainWindow->menuBar();
 
       //US setup menubar.
       //Disable the following block if you do not want to have a menubar.
       mb->insertItem( i18n("&File"), fileMenu );
       mb->insertItem( i18n("&Edit"), editMenu );
       mb->insertItem( i18n("&View"), viewMenu );
       mb->insertItem( i18n("&Settings"), settingsMenu );
 #ifdef DESKTOP_VERSION
       mb->insertItem( i18n("Synchronize"), syncMenu );
 #else
       mb->insertItem( i18n("Sync"), syncMenu );
 #endif
       //mb->insertItem( i18n("&Change"), changeMenu );
       mb->insertItem( i18n("&Help"), helpMenu );
       mIncSearchWidget = new IncSearchWidget( tb );
       // tb->insertWidget(-1, 0, mIncSearchWidget);
 #ifndef DESKTOP_VERSION
   } else  {
       //US setup toolbar
       QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
       QPopupMenu *popupBarTB = new QPopupMenu( this );
       menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB);
       tb->insertWidget(-1, 0, menuBarTB);
       mIncSearchWidget = new IncSearchWidget( tb );
       tb->enableMoving(false);
       popupBarTB->insertItem( i18n("&File"), fileMenu );
       popupBarTB->insertItem( i18n("&Edit"), editMenu );
       popupBarTB->insertItem( i18n("&View"), viewMenu );
       popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
       popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
       mViewManager->getFilterAction()->plug ( popupBarTB);
       //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
       popupBarTB->insertItem( i18n("&Help"), helpMenu );
       if (QApplication::desktop()->width() > 320 ) {
           // mViewManager->getFilterAction()->plug ( tb);
       }
   }
 #endif
   mIncSearchWidget->setSize();
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
 #ifdef DESKTOP_VERSION
   mActionPrint->plug( fileMenu );
   mActionPrintDetails->plug( fileMenu );
   fileMenu->insertSeparator();
 #endif
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( editMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( editMenu );
   editMenu->insertSeparator();
   // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
   //  (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
     // fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
   editMenu->insertItem( i18n("&Change"), changeMenu );
   editMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() )  fileMenu->insertItem( i18n("&Beam"), beamMenu );
 #endif
 #if 0 
   // PENDING fix MailVCard
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #endif
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug( beamMenu );
   if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
   if ( Ir::supported() ) mActionBeam->plug( beamMenu );
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
 #ifdef _OL_IMPORT_
   mActionImportOL->plug( ImportMenu  );
 #endif
   // edit menu
   mActionUndo->plug( editMenu );
   mActionRedo->plug( editMenu );
   editMenu->insertSeparator();
   mActionCut->plug( editMenu );
   mActionCopy->plug( editMenu );
   mActionPaste->plug( editMenu );
   mActionDelete->plug( editMenu );
   editMenu->insertSeparator();
   mActionSelectAll->plug( editMenu );
 
   mActionSetFormattedName->plug( changeMenu );
   mActionRemoveVoice->plug( changeMenu );
   // settingsmings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   // settingsMenu->insertSeparator();
 
   mActionConfigKAddressbook->plug( settingsMenu, 0 );
   mActionConfigGlobal->plug( settingsMenu, 1 );
   mActionConfigResources->plug( settingsMenu,2 );
   settingsMenu->insertSeparator(3);
 
   if ( mIsPart ) {
     //US not implemented yet
     //mActionConfigShortcuts->plug( settingsMenu );
     //mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     //US not implemented yet
@@ -3079,422 +3079,422 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         qDebug("setting mLastAddressbookSync ");
     }
 #endif
 
 
     // ********** setting filters ****************
     Filter filterIN  = mViewManager->getFilterByName( syncManager->mFilterInAB );
     Filter filterOUT = mViewManager->getFilterByName( syncManager->mFilterOutAB );
    
     //qDebug("*************************** ");
     // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
     QStringList er = remote->uidList(); 
     Addressee inR ;//= er.first();
     Addressee  inL;
 
     syncManager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
 
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( incCounter < er.count()) {
         if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
           syncManager->showProgressBar(incCounter);
 
         uid = er[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         QString idS,OidS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->findByUid( uid );
             inR = remote->findByUid( uid );
             //inL.setResource( 0 );
             //inR.setResource( 0 );
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
                 if ( !inL.resource() || inL.resource()->includeInSync() ) {
                     if ( (take = takeAddressee( &inL, &inR, mode, fullDateRange )) ) {
                         //qDebug("take %d %s ", take, inL.summary().latin1());
                         if ( take == 3 )
                             return false;
                         if ( take == 1  ) {// take local **********************
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                                 inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                                 local->insertAddressee(  inL, false );
                                 idS = inR.externalUID();
                                 OidS = inR.originalExternalUID();
                             }
                             else
                                 idS = inR.IDStr();
                             remote->removeAddressee( inR );
                             inR = inL;
                             inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inR.setOriginalExternalUID( OidS );
                                 inR.setExternalUID( idS );
                                 if ( syncManager->syncWithDesktop() ) {
                                     inR.setIDStr("changed" );
                                 }
                                     //inR.insertCustom( "KADDRESSBOOK", "X-KDESYNC","changed" );
                             } else {
                                 inR.setIDStr( idS );
                             }
                             inR.setResource( 0 );
                             remote->insertAddressee(  inR , false);
                             ++changedRemote;
                         } else { // take == 2  take remote **********************
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 if ( inR.revision().date().year() < 2004 )
                                     inR.setRevision( modifiedCalendar );
                             }
                             idS = inL.IDStr();
                             local->removeAddressee( inL );
                             inL = inR;
                             inL.setIDStr( idS );
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                                 inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                             }
                             inL.setResource( 0 );
                             local->insertAddressee(  inL , false );
                             ++changedLocal;
                         }
                     }
                 }
             } else { //  no conflict ********** add or delete remote 
                 if ( filterIN.name().isEmpty() || filterIN.filterAddressee( inR ) ) {
                     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                         QString des = addresseeLSync.note(); 
                         if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                             inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                             remote->insertAddressee( inR, false );
                             ++deletedAddresseeR; 
                         } else {
                             inR.setRevision( modifiedCalendar );
                             remote->insertAddressee( inR, false );
                             inL = inR; 
                             inL.setIDStr( ":" );
                             inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                             inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                             inL.setResource( 0 );
                             local->insertAddressee( inL , false);
                             ++addedAddressee;
                         }
                     } else {
                         if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
                             inR.setRevision( modifiedCalendar );
                             remote->insertAddressee( inR, false );
                             inR.setResource( 0 );
                             local->insertAddressee( inR, false );
                             ++addedAddressee;
                         } else {
                             // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
                             remote->removeAddressee( inR );
                             ++deletedAddresseeR; 
                         }
                     }
                 } else {
                     ++filteredIN; 
                 }
             }
         }
         ++incCounter;
     }
     er.clear();
     QStringList el = local->uidList(); 
     modulo = (el.count()/10)+1;
 
     syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count());
     incCounter = 0;
     while ( incCounter < el.count()) {
         qApp->processEvents();
         if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
           syncManager->showProgressBar(incCounter);
         uid = el[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
             if ( !inL.resource() || inL.resource()->includeInSync() ) {
                 inR = remote->findByUid( uid );
                 if ( inR.isEmpty() ){
                     if ( filterOUT.name().isEmpty() ||  filterOUT.filterAddressee( inL )  ) { 
                         //  no conflict ********** add or delete local
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                                 // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                                 local->removeAddressee( inL );
                                 ++deletedAddresseeL; 
                             } else {
                                 if ( ! syncManager->mWriteBackExistingOnly ) {
                                     inL.removeID(mCurrentSyncDevice );
                                     ++addedAddresseeR;
                                     inL.setRevision( modifiedCalendar );
                                     local->insertAddressee( inL, false );
                                     inR = inL;
                                     inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
                                     inR.setResource( 0 );
                                     remote->insertAddressee( inR, false );
                                 }
                             }
                         } else {
                             if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
                                 //qDebug("data %s ", inL.revision().toString().latin1());
                                 // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                                 local->removeAddressee( inL );
                                 ++deletedAddresseeL; 
                             } else {
                                 if ( ! syncManager->mWriteBackExistingOnly ) {
                                     ++addedAddresseeR; 
                                     inL.setRevision( modifiedCalendar );
                                     local->insertAddressee( inL, false );
                                     inR = inL;
                                     inR.setIDStr( ":" );
                                     inR.setResource( 0 );
                                     remote->insertAddressee( inR, false );
                                 }
                             }
                         }
                     } else {
                         ++filteredOUT; 
                     }
                 }
             }
         }
         ++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 %d incoming filtered out\n %d outgoing filtered out"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR, filteredIN, filteredOUT ); 
     qDebug( mes );
     mes = i18n("Local addressbook changed!\n") +mes;
     if ( syncManager->mShowSyncSummary ) { 
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                                        i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("KA: WB cancelled ");
             syncManager->mWriteBackFile = false; 
             return syncOK;
         }
     }
     return syncOK;
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode,QString resource)
 { 
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     if ( manager != syncManager )
         qDebug("KABCore::sync:: ERROR! :: manager != syncManager ");
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal(filename,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("KA: Sync::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("KA: Sync::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 );
         syncManager->hideProgressBar();
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("KA: Sync::Saving remote AB ");
                     if ( ! abLocal.saveAB()) 
                         qDebug("KA: sync::Error writing back AB to file ");
                     if (  external ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML);
                     }
                 }
         }
         setModified();
         
     }
     abLocal.removeResources();
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
     qDebug("KA: AB:removeSyncInfo for profile %s ", syncProfile.latin1());
     mAddressBook->removeSyncInfo( syncProfile );
     setModified();
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     if (  resource == "phone" )
         return syncPhone();
     disableBR( true );
    if ( manager != syncManager )
         qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager ");
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
     message(i18n("Loading DTM address data..."), false);
     if ( abLocal.load() ) {
         qDebug("KA: AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         message(i18n("Sync preprocessing..."),false);
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
         message(i18n("Synchronizing..."),false);
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         syncManager->hideProgressBar();
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( false );
                 message(i18n("Saving DTM address data..."),false);
                 abLocal.saveAB();
                 message(i18n("Sync postprocessing..."),false);
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
             }
         } else
             message( i18n("Sync cancelled or failed.") );
         setModified();
     }
     abLocal.removeResources();
     if ( syncOK ) {
         mViewManager->refreshView();
         message(i18n("DTM syncing finished."));
     }
     disableBR( false );
     return syncOK;
 
 }
 void KABCore::message( QString m, bool startTimer)
 {
     topLevelWidget()->setCaption( m );
     qApp->processEvents();
     if ( startTimer )
         mMessageTimer->start( 15000, true );
     else
         mMessageTimer->stop();
 }
 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("KA: 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 );
         syncManager->hideProgressBar();
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( true );
                 abLocal.saveABphone( fileName );
                 abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
                 //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
             }
         }
         setModified();
     }
     abLocal.removeResources();
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 }
-void KABCore::getFile( bool success )
+void KABCore::getFile( bool success ,const QString & resource)
 {
     if ( ! success ) {
         message( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    int count = mAddressBook->importFromFile( sentSyncFile() , false, true );
+    int count = mAddressBook->importFromFile( sentSyncFile() , false, true ,resource);
     if ( count )
         setModified( true );
     message( i18n("Pi-Sync successful!") );
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest(const QString & resource)
 { 
     if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) {
         syncManager->slotSyncMenu( 999 );
     } 
 
     if ( resource == "ALL" ) {
         mAddressBook->export2File( sentSyncFile() );
     }
     else
         mAddressBook->export2File( sentSyncFile(), resource);
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
     return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
 void KABCore::setCaptionBack()
 {
     mMessageTimer->stop();
     topLevelWidget()->setCaption( i18n("KA/Pi") );
 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 2d1505f..e69cb60 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -1,535 +1,535 @@
 /*
     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>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 
 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();
 
   
 
     /**
       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 setDetailsToggle();
 
     void showLicence();
     void faq();
     void whatsnew() ;
     void synchowto() ;
     void storagehowto() ;
     void multisynchowto() ;
     void kdesynchowto() ;
     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();
     void manageCategories();
     void editCategories();
 
     /**
       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 );
     void incrementalSearchJump( 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 );
     void addrModified( const KABC::Addressee &addr, bool updateDetails = true );
 
     /**
       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();
     void openConfigGlobalDialog();
 
     /**
       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 loadDataAfterStart();
     void recieve(QString cmsg );
-    void getFile( bool success );
+    void getFile( bool success,const QString & );
     void syncFileRequest(const QString &);
     void setDetailsVisible( bool visible );
     void setDetailsToState();
    
     void saveSettings();
 
   private slots:
     void updateToolBar();
     void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void receiveStart( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
     void resizeAndCallContactdialog();
     void callContactdialog();
     void doRingSync();
 
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
     void setFormattedName();
 #ifdef KAB_EMBEDDED
     void configureResources();
 #endif //KAB_EMBEDDED
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
     QCString mCStringMess;
     QByteArray mByteData;
     QString mEmailSourceChannel;
     QString mEmailSourceUID;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     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;
     KToggleAction *mActionBR;
     KAction *mActionExport2phone;
     KAction* mActionPrint;
     KAction* mActionPrintDetails;
     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 *mActionConfigGlobal;
     KAction *mActionConfigKAddressbook;
     KAction *mActionConfigShortcuts;
     KAction *mActionConfigureToolbars;
     KAction *mActionKeyBindings;
     KToggleAction *mActionJumpBar;
     KToggleAction *mActionDetails;
     KAction *mActionWhoAmI;
     KAction *mActionCategories;
     KAction *mActionEditCategories;
     KAction *mActionManageCategories;
     KAction *mActionAboutKAddressbook;
     KAction *mActionLicence;
     KAction *mActionFaq;
     KAction *mActionWN;
     KAction *mActionSyncHowto;
     KAction *mActionStorageHowto;
     KAction *mActionKdeSyncHowto;
     KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
     QPopupMenu *viewMenu;
     QPopupMenu *filterMenu;
     QPopupMenu *settingsMenu;
     QPopupMenu *changeMenu;
     QPopupMenu *beamMenu;
 //US    QAction *mActionSave;
     QPopupMenu *ImportMenu;
     QPopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction *mActionSetFormattedName;
     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,QString resource);
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     bool syncPhone();
     void message( QString m , bool startTimer = true);
 
     // 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
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index e615cbe..7197b30 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -60,770 +60,770 @@ QDateTime KSyncManager::mRequestedSyncEvent;
 
 
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
     : QObject(),  mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu)
 {
     mServerSocket = 0;
     bar = new QProgressBar ( 1, 0 );
     bar->setCaption ("");
     mWriteBackInPast = 2;
     
 
 }
 
 KSyncManager::~KSyncManager()
 {
     delete bar;
 }
  
 void KSyncManager::setDefaultFileName( QString s)
 {
     mDefFileName = s ;
     if ( mPrefs->mPassiveSyncAutoStart )
       enableQuick( false );
 }
 
 void KSyncManager::fillSyncMenu()
 {
     if ( mSyncMenu->count() )
         mSyncMenu->clear();
     
     mSyncMenu->insertItem( i18n("Configure..."), 0 );
     mSyncMenu->insertSeparator();
     QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu );
     mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 );
     clearMenu->insertItem( i18n("For all profiles"), 1 );
     clearMenu->insertSeparator();
     connect ( clearMenu, SIGNAL( activated ( int )  ), this, SLOT (slotClearMenu( int ) ) );
     mSyncMenu->insertSeparator();
     if ( mServerSocket == 0 ) {
         mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
     } else {
         mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
     }
     mSyncMenu->insertSeparator();
     mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
     mSyncMenu->insertSeparator();
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
     mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 2 ) {
         prof.clear();
         QString externalName;
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
         externalName = "OutLook(not_implemented)";
 #else
         externalName = "KDE_Desktop";
 #endif
 #else
         externalName = "Sharp_DTM";
 #endif
         prof << externalName;
         prof << i18n("Local_file");
         prof << i18n("Last_file");
         KSyncProfile* temp = new KSyncProfile ();
         temp->setName( prof[0] );
         temp->writeConfig(&config);
         temp->setName( prof[1] );
         temp->writeConfig(&config);
         temp->setName( prof[2] );
         temp->writeConfig(&config);
         config.setGroup("General");
         config.writeEntry("SyncProfileNames",prof);
         config.writeEntry("ExternSyncProfiles",externalName);
         config.sync();
         delete temp;
     }
     mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
     mSyncProfileNames = prof;
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
         QString insertText = prof[i];
         if ( i == 0 ) {
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
         insertText = "OutLook(not_implemented)";
 #else
         insertText = "KDE_Desktop";
 #endif
 #else
         insertText = "Sharp_DTM";
 #endif
         }
         mSyncMenu->insertItem(  insertText, 1000+i ); 
         clearMenu->insertItem(  insertText, 1000+i ); 
         if ( i == 2 )
             mSyncMenu->insertSeparator();
     }
     QDir app_dir;
     //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
     if ( mTargetApp == PWMPI) {
         mSyncMenu->removeItem( 1000 );
         clearMenu->removeItem( 1000 );
     }
 #ifndef DESKTOP_VERSION
     else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
         mSyncMenu->removeItem( 1000 );
         clearMenu->removeItem( 1000 );
     }
 #endif
     mSyncMenu->removeItem( 1002 );
     clearMenu->removeItem( 1002 );
 }
 void KSyncManager::slotClearMenu( int action )
 {
     QString syncDevice;
     if ( action > 999 ) {
         syncDevice = mSyncProfileNames[action - 1000] ;
     }
 
 
 
     int result = 0;
     QString sd;
     if ( syncDevice.isEmpty() )
         sd = i18n("Do you want to\nclear all sync info\nof all profiles?");
     else
         sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice );
 
     result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0,
                                    0, 1 );
     if ( result )
         return;
     mImplementation->removeSyncInfo( syncDevice );
 }
 void KSyncManager::slotSyncMenu( int action )
 {
     qDebug("KSM::syncaction %d ", action);
     mCurrentResourceLocal = "";  
     emit multiResourceSyncStart( false );
     if ( action == 5000 )
         return;
     mSyncWithDesktop = false;
     if ( action == 0 ) {
 
         // seems to be a Qt2 event handling bug
         // syncmenu.clear causes a segfault at first time
         // when we call it after the main event loop, it is ok
         // same behaviour when calling OM/Pi via QCOP for the first time
         QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 
         //confSync();
 
         return;
     }
     if ( action == 1 ) {
         multiSync( true );
         return;
     }
     if ( action == 2 ) {
         enableQuick();
         QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
         return;
     }
     if ( action == 3 ) {
         delete mServerSocket;
         mServerSocket = 0;
         QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
         return;
     }
 
     if (blockSave())
         return;
 
     setBlockSave(true);
     bool silent = false;
     if ( action == 999 ) {
         //special mode for silent syncing
         action = 1000;
         silent = true;
     }
 
     mCurrentSyncProfile = action - 1000 ;
     mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
     mCurrentSyncName =  mLocalMachineName ;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     if (silent) {
         mAskForPreferences = false;
         mShowSyncSummary = false;
         mWriteBackFile = true;
         mSyncAlgoPrefs = 2;// take newest
     }
     else {
         mAskForPreferences = temp->getAskForPreferences();
         mShowSyncSummary = temp->getShowSummaryAfterSync();
         mWriteBackFile = temp->getWriteBackFile();
         mSyncAlgoPrefs = temp->getSyncPrefs();
     }
     mWriteBackExistingOnly = temp->getWriteBackExisting();
     mIsKapiFile = temp->getIsKapiFile();
     mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() ) {
         mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
         mWriteBackInPast =  temp->getWriteBackPastWeeks( );
     }
     mFilterInCal = temp->getFilterInCal();
     mFilterOutCal = temp->getFilterOutCal();
     mFilterInAB = temp->getFilterInAB();
     mFilterOutAB = temp->getFilterOutAB();
 
     if ( action == 1000  ) {
         mIsKapiFile = false; 
 #ifdef DESKTOP_VERSION
         syncKDE();
 #else
         syncSharp();
 #endif
     
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         mWriteBackFile = false;
         mAskForPreferences = false;
         mShowSyncSummary = false; 
         mSyncAlgoPrefs = 3; 
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
             switch(mTargetApp)
                 {
                 case (KAPI):
                     if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                         mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                     break;
                 case (KOPI):
                     if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                         mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                     break;
                 case (PWMPI):
                     if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                         mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                     break;
                 default:
                     qDebug("KSM::slotSyncMenu: invalid apptype selected");
                     break;
               
                 }
         } else {
             if (  temp->getIsPhoneSync() ) {
                 mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPhoneConnection = temp->getPhoneConnection( );
                 mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else if (  temp->getIsPiSync()|| temp->getIsPiSyncSpec()) {
                 mSpecificResources.clear();
                 if ( mTargetApp == KAPI ) {
                     if ( temp->getIsPiSyncSpec() )
                         mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true );
                     mPassWordPiSync = temp->getRemotePwAB();
                     mActiveSyncPort = temp->getRemotePortAB();
                     mActiveSyncIP = temp->getRemoteIPAB();
                 } else if ( mTargetApp == KOPI ) {
                     if ( temp->getIsPiSyncSpec() )
                         mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
                     mPassWordPiSync = temp->getRemotePw();
                     mActiveSyncPort = temp->getRemotePort();
                     mActiveSyncIP = temp->getRemoteIP();
                 } else  {
                     mPassWordPiSync = temp->getRemotePwPWM();
                     mActiveSyncPort = temp->getRemotePortPWM();
                     mActiveSyncIP = temp->getRemoteIPPWM();
                 } 
                 syncPi();
                 while ( !mPisyncFinished ) {
                     //qDebug("waiting ");
                     qApp->processEvents();
                 }
             } else
                 syncRemote( temp );
 
         }
     }
     delete temp;
     setBlockSave(false);
 }
 
 void KSyncManager::enableQuick( bool ask )
 {
     bool autoStart;
     bool changed = false;
     if ( ask ) {
         QDialog dia ( 0, "input-dialog", true );
         QLineEdit lab ( &dia );
         QVBoxLayout lay( &dia );
         lab.setText( mPrefs->mPassiveSyncPort );
         lay.setMargin(7);
         lay.setSpacing(7);
         int po = 9197+mTargetApp;
         QLabel label ( i18n("Port number (Default: %1)\nValid range from 1 to 65535").arg(po), &dia );
         lay.addWidget( &label);
         lay.addWidget( &lab);
 
         QLineEdit lepw ( &dia );
         lepw.setText( mPrefs->mPassiveSyncPw );
         QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
         lay.addWidget( &label2);
         lay.addWidget( &lepw);
         QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia );
         lay.addWidget( &autostart);
         autostart.setChecked( mPrefs->mPassiveSyncAutoStart );
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
         QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
         syncdesktop.hide();// not implemented!
 #else
         QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
 #endif
         lay.addWidget( &syncdesktop);
 #else
         mPrefs->mPassiveSyncWithDesktop = false;
         QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia );
         syncdesktop.hide();
 #endif
         syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop );
 
         QPushButton pb ( "OK",  &dia);
         lay.addWidget( &pb );
         connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
         dia.resize( 230,120 );
         dia.setCaption( i18n("Enter port for Pi-Sync") );
         dia.show();
 #ifndef DESKTOP_VERSION
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         dia.move( (dw-dia.width())/2, (dh - dia.height() )/2 );
 #endif
         if ( ! dia.exec() )
             return;
         dia.hide();
         qApp->processEvents();
         if ( mPrefs->mPassiveSyncPw != lepw.text() ) {
             changed = true;
             mPrefs->mPassiveSyncPw = lepw.text();
         }
         if ( mPrefs->mPassiveSyncPort != lab.text() ) {
             mPrefs->mPassiveSyncPort = lab.text();
             changed = true;
         }
         autoStart = autostart.isChecked();
         if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) {
             changed = true;
             mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked();
         }
     }
     else
         autoStart = mPrefs->mPassiveSyncAutoStart;
     if ( autoStart != mPrefs->mPassiveSyncAutoStart )
         changed =  true;
     bool ok;
     mPrefs->mPassiveSyncAutoStart = false;
     Q_UINT32 port_t = mPrefs->mPassiveSyncPort.toUInt(&ok);
     if ( ! ok || port_t > 65535 ) {
         KMessageBox::information( 0, i18n("No valid port number:\n%1").arg ( mPrefs->mPassiveSyncPort ), i18n("Pi-Sync Port Error"));
         return;
     }
     Q_UINT16 port = port_t;
     //qDebug("port %d ", port);
     mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
     mServerSocket->setFileName( defaultFileName() );//bbb
     if ( !mServerSocket->ok() ) {
         QTimer::singleShot( 2000, this, SLOT ( displayErrorPort() ) );
         delete mServerSocket;
         mServerSocket = 0;
         return;
     }
     mPrefs->mPassiveSyncAutoStart = autoStart;
     if ( changed ) {
         mPrefs->writeConfig();
     }
-    connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
-    connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
+    //connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
+    //connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
     connect( mServerSocket, SIGNAL ( request_file(const QString &) ),this, SIGNAL  ( request_file(const QString &) ) );
     connect( mServerSocket, SIGNAL ( file_received( bool ,const QString &) ), this,  SIGNAL  ( getFile( bool,const QString & ) ) );
 }
 void KSyncManager::displayErrorPort()
 {
     KMessageBox::information( 0, i18n("<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?").arg( mPrefs->mPassiveSyncPort) , i18n("Pi-Sync Port Error"));
 }
 void KSyncManager::syncLocalFile()
 {
 
     QString fn =mPrefs->mLastSyncedLocalFile;
     QString ext;
 
     switch(mTargetApp)
         {
             case (KAPI):
             ext = "(*.vcf)";
             break;
             case (KOPI):
             ext = "(*.ics/*.vcs)";
             break;
             case (PWMPI):
             ext = "(*.pwm)";
             break;
             default:
             qDebug("KSM::syncLocalFile: invalid apptype selected");
             break;
               
         }
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
     if ( fn == "" )
         return;
     if (  syncWithFile(  fn, false ) ) {
         qDebug("KSM::syncLocalFile() successful ");
     }
 
 }
 
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
     bool ret = false;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     if ( !info. exists() ) {
         mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
         QMessageBox::warning( mParent, i18n("Warning!"),
                                            mess );
         return ret;
     }
     int result = 0;
     if ( !quick ) {
         mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( mParent, i18n("Warning!"),
                                        mess,
                                        i18n("Sync"), i18n("Cancel"), 0,
                                        0, 1 );
         if ( result )
             return false;
     }
     if ( mAskForPreferences )
         if ( !edit_sync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
             return false;
         }
     if ( result == 0 ) {
         //qDebug("Now sycing ... ");
         if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ,mCurrentResourceLocal ) )
             mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
         else
             mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
         if ( ! quick )
             mPrefs->mLastSyncedLocalFile = fn;
     }
     return ret;
 }
 
 void KSyncManager::quickSyncLocalFile()
 {
     
     if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) {
         qDebug("KSM::quick syncLocalFile() successful ");
       
     }
 }
 
 void KSyncManager::multiSync( bool askforPrefs  )
 {
     if (blockSave())
         return;
     setBlockSave(true);
     mCurrentResourceLocal = "";
     if ( askforPrefs ) {
         QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
         if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
                                        question,
                                        i18n("Yes"), i18n("No"),
                                        0, 0 ) != 0 ) {
             setBlockSave(false);
             mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
             return;
         }
     }
     mCurrentSyncDevice = i18n("Multiple profiles") ;
     mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         if ( !edit_sync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted.") );
             return;
         }
         mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
     }
     mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") );
     qApp->processEvents();
     int num = ringSync() ;
     if (  num > 1 )
         ringSync();
     setBlockSave(false);
     if ( num )
         emit save();
     if ( num )
         mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) );
     else
         mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 
 int KSyncManager::ringSync()
 {
     emit multiResourceSyncStart( false );
     int syncedProfiles = 0;
     unsigned int i;
     QTime timer;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     QStringList syncProfileNames = mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
     mAskForPreferences = false;
     mCurrentResourceLocal = "";
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
 
         bool includeInRingSync = false;
         switch(mTargetApp)
             {
             case (KAPI):
                 includeInRingSync = temp->getIncludeInRingSyncAB();
                 break;
             case (KOPI):
                 includeInRingSync = temp->getIncludeInRingSync();
                 break;
             case (PWMPI):
                 includeInRingSync = temp->getIncludeInRingSyncPWM();
                 break;
             default:
                 qDebug("KSM::ringSync: invalid apptype selected");
                 break;
               
             }
         
         
         if ( includeInRingSync && ( i < 1 || i > 2  )) {
             mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles; 
             mSyncWithDesktop = false; 
             // mAskForPreferences = temp->getAskForPreferences();
             mWriteBackFile = temp->getWriteBackFile();
             mWriteBackExistingOnly = temp->getWriteBackExisting();
             mIsKapiFile = temp->getIsKapiFile();
             mWriteBackInFuture = 0;
             if ( temp->getWriteBackFuture() ) {
                 mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
                 mWriteBackInPast =  temp->getWriteBackPastWeeks( );
             }
             mFilterInCal = temp->getFilterInCal();
             mFilterOutCal = temp->getFilterOutCal();
             mFilterInAB = temp->getFilterInAB();
             mFilterOutAB = temp->getFilterOutAB();
             mShowSyncSummary = false;
             mCurrentSyncDevice = syncProfileNames[i] ;
             mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
                 mIsKapiFile = false; 
 #ifdef DESKTOP_VERSION
                 syncKDE();
 #else
                 syncSharp();
 #endif
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                     switch(mTargetApp)
                         {
                         case (KAPI):
                             if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                             break;
                         case (KOPI):
                             if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                             break;
                         case (PWMPI):
                             if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                             break;
                         default:
                             qDebug("KSM: invalid apptype selected");
                             break;
                         }
                 } else {
                     if (  temp->getIsPhoneSync() ) {
                         mPhoneDevice = temp->getPhoneDevice( ) ;
                         mPhoneConnection = temp->getPhoneConnection( );
                         mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
                     } else if (  temp->getIsPiSync() || temp->getIsPiSyncSpec()) {
                         mSpecificResources.clear();
                         if ( mTargetApp == KAPI ) {
                             if ( temp->getIsPiSyncSpec() )
                                 mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true );
                             mPassWordPiSync = temp->getRemotePwAB();
                             mActiveSyncPort = temp->getRemotePortAB();
                             mActiveSyncIP = temp->getRemoteIPAB();
                         } else if ( mTargetApp == KOPI ) {
                             if ( temp->getIsPiSyncSpec() )
                                 mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
                             mPassWordPiSync = temp->getRemotePw();
                             mActiveSyncPort = temp->getRemotePort();
                             mActiveSyncIP = temp->getRemoteIP();
                         } else  {
                             mPassWordPiSync = temp->getRemotePwPWM();
                             mActiveSyncPort = temp->getRemotePortPWM();
                             mActiveSyncIP = temp->getRemoteIPPWM();
                         } 
                         syncPi();
                         while ( !mPisyncFinished ) {
                             //qDebug("waiting ");
                             qApp->processEvents();
                         }
                         timer.start(); 
                         while ( timer.elapsed () < 2000 ) {
                             qApp->processEvents();
                         }
                     } else
                         syncRemote( temp, false );
 
                 }
             }
             timer.start();
             mParent->topLevelWidget()->setCaption(i18n("Multiple sync in progress ... please wait!") );
             while ( timer.elapsed () < 2000 ) {
                 qApp->processEvents();
 #ifndef _WIN32_
                 sleep (1);
 #endif
             }
 
         }
 
     }
     delete temp;
     return syncedProfiles;
 }
 
 void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 {
     QString question;
     if ( ask ) {
         question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
         if ( QMessageBox::information( mParent, i18n("Sync"),
                                        question,
                                        i18n("Yes"), i18n("No"),
                                        0, 0 ) != 0 )
             return;
     }
 
     QString preCommand;
     QString localTempFile;
     QString postCommand;
 
     switch(mTargetApp)
         {
         case (KAPI):
             preCommand = prof->getPreSyncCommandAB();
             postCommand = prof->getPostSyncCommandAB();
             localTempFile = prof->getLocalTempFileAB();
             break;
         case (KOPI):
             preCommand = prof->getPreSyncCommand();
             postCommand = prof->getPostSyncCommand();
             localTempFile = prof->getLocalTempFile();
             break;
         case (PWMPI):
             preCommand = prof->getPreSyncCommandPWM();
             postCommand = prof->getPostSyncCommandPWM();
             localTempFile = prof->getLocalTempFilePWM();
             break;
         default:
             qDebug("KSM::syncRemote: invalid apptype selected");
             break;
         }
 
 
     int fi;
     if ( (fi = preCommand.find("$PWD$")) > 0 ) {
         QString pwd = getPassword();
         preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 );
 
     }
     int maxlen = 30;
     if ( QApplication::desktop()->width() > 320 )
         maxlen += 25;
     mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) );
     int result = system ( preCommand );
     // 0 : okay
     // 256: no such file or dir
     //
     qDebug("KSM::Sync: Remote copy result(0 = okay): %d ",result );
     if ( result != 0 ) {
         unsigned int len = maxlen;
         while ( len <  preCommand.length() ) {
             preCommand.insert( len , "\n" );
             len += maxlen +2;
         }
         question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ;
         QMessageBox::information( mParent, i18n("Sync - ERROR"),
                                   question,
                                   i18n("Okay!")) ;
         mParent->topLevelWidget()->setCaption ("KDE-Pim");
         return;
     }
     mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) );
     //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
 
     if ( syncWithFile( localTempFile, true ) ) {
 
         if ( mWriteBackFile ) {
             int fi;
             if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                 QString pwd = getPassword();
                 postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
             mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
             result = system ( postCommand );
             qDebug("KSM::Sync:Writing back file result: %d ", result);
             if ( result != 0 ) {
                 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                 return;
             } else {
                 mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) );
             }
         }
     }
     return;
 }
 bool KSyncManager::edit_pisync_options()
 {
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice );
     QVBoxLayout lay ( &dia );
     lay.setSpacing( 5 );
     lay.setMargin( 3 );
     QLabel lab1 ( i18n("Password for remote access:"), &dia); 
     lay.addWidget( &lab1 );
     QLineEdit le1 (&dia );
     lay.addWidget( &le1 );
     QLabel lab2 ( i18n("Remote IP address:"), &dia);
     lay.addWidget( &lab2 );
     QLineEdit le2 (&dia );
     lay.addWidget( &le2 );
     QLabel lab3 ( i18n("Remote port number:\n(May be: 1 - 65535)"), &dia);
     lay.addWidget( &lab3 );
     QLineEdit le3 (&dia );
     lay.addWidget( &le3 );
     QPushButton pb ( "OK",  &dia); 
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
     le1.setText( mPassWordPiSync );
     le2.setText( mActiveSyncIP  );
     le3.setText( mActiveSyncPort );
     if ( dia.exec() ) {
         mPassWordPiSync = le1.text();