completed KDE AB sync. but will it work ...?

8 files changed, 57 insertions, 11 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index d101589..9b196b5 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -673,386 +673,389 @@ bool AddressBook::saveAB()
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
       qDebug("SaveAB::checking resource..." );
       if ( (*it)->readOnly() )
           qDebug("resource is readonly." );
       if ( (*it)->isOpen() )
           qDebug("resource is open" );
       
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = requestSaveTicket( *it );
       qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         qDebug( i18n( "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("StdAddressBook::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 ) {
               
                     // get rid of micro seconds
                     QDateTime dt =  QDateTime::currentDateTime();
                     QTime t =  dt.time();
                     dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
                     (*it).setRevision( dt ); 
                 }
                 (*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( 2004,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() );
             ++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 )
 {
     //qDebug("AddressBook::preExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         (*it).setID( csd, (*it).externalUID() );
         (*it).computeCsum( csd );
     }
     mergeAB( aBook ,csd, isSubset );  
 }
 void AddressBook::postExternSync( AddressBook* aBook , const QString& csd)
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         // qDebug("check uid %s ", (*it).uid().latin1() );
         if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
              (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
                 qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
             } else {
                 (*it).computeCsum( csd );
                 if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
                     ad.setID( csd, (*it).externalUID() );
                 ad.setCsum( csd, (*it).getCsum( csd ) );
                 aBook->insertAddressee( ad );
             }
         }
     }
 }
 
 bool   AddressBook::containsExternalUid( const QString& uid  )
 {
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         if ( uid == (*it).externalUID( ) )
             return true;
     }
     return false;
 }
 Addressee   AddressBook::findByExternUid( const QString& uid , const QString& profile  )
 {
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         if ( uid == (*it).getID( profile ) )
             return (*it);
     }
     return Addressee();
 }
 void  AddressBook::mergeAB( AddressBook *aBook, const QString& profile , bool isSubset )
 {
     Iterator it;
     Addressee ad;
     for ( it = begin(); it != end(); ++it ) {
         ad = aBook->findByExternUid( (*it).externalUID(), profile );
             if ( !ad.isEmpty() ) {
                 (*it).mergeContact( ad ,isSubset);
             }
     }
 #if 0 
     // test only
     for ( it = begin(); it != end(); ++it ) {
         
         qDebug("uid %s ", (*it).uid().latin1());
     }
 #endif
 }
 
 #if 0
 Addressee::List AddressBook::getExternLastSyncAddressees()
 {
     Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( (*it).uid().left( 19 ) == "last-syncAddressee-"  ) {
         if ( (*it).familyName().left(4) == "!E: " )
             results.append( *it );
     }
   }
 
   return results;
 }
 #endif
 void AddressBook::resetTempSyncStat()
 {
     Iterator it;
   for ( it = begin(); it != end(); ++it ) {
       (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
   }
 
 }
  
 QStringList AddressBook:: uidList()
 {
     QStringList results;
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         results.append( (*it).uid() );
     }
     return results;
 }
 
 
 Addressee::List AddressBook::allAddressees()
 {
    return d->mAddressees; 
  
 }
 
 Addressee::List AddressBook::findByName( const QString &name )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( name == (*it).realName() ) {
       results.append( *it );
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
   Addressee::List results;
   QStringList mailList;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     mailList = (*it).emails();
     for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
       if ( email == (*ite) ) {
         results.append( *it );
       }
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByCategory( const QString &category )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( (*it).hasCategory( category) ) {
       results.append( *it );
     }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2f00a09..ea87929 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1123,388 +1123,390 @@ void KABCore::addEmail( QString aStr )
     editContact( addr.uid() );
   }
 #else //KAB_EMBEDDED
   qDebug("KABCore::addEmail finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::importVCard( const KURL &url, bool showPreview )
 {
   mXXPortManager->importVCard( url, showPreview );
 }
 void KABCore::importFromOL()
 {
 #ifdef _WIN32_
   KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
   idgl->exec();
   KABC::Addressee::List list = idgl->getAddressList();
   if ( list.count() > 0 ) {
     KABC::Addressee::List listNew;
     KABC::Addressee::List listExisting;
     KABC::Addressee::List::Iterator it;
     KABC::AddressBook::Iterator iter;
     for ( it = list.begin(); it != list.end(); ++it ) {
       if ( mAddressBook->findByUid((*it).uid() ).isEmpty())
 	listNew.append( (*it) );
       else
 	listExisting.append( (*it) );
     }
     if ( listExisting.count()  > 0 )
       KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
     if ( listNew.count() > 0 ) {
       pasteWithNewUid = false;
       pasteContacts( listNew );
       pasteWithNewUid = true;
     }
   }
   delete idgl;
 #endif
 }
 
 void KABCore::importVCard( const QString &vCard, bool showPreview )
 {
   mXXPortManager->importVCard( vCard, showPreview );
 }
 
 //US added a second method without defaultparameter
 void KABCore::editContact2() {
   editContact( QString::null );
 }
 
 void KABCore::editContact( const QString &uid )
 {
 
   if ( mExtensionManager->isQuickEditVisible() )
     return;
 
   // First, locate the contact entry
   QString localUID = uid;
   if ( localUID.isNull() ) {
     QStringList uidList = mViewManager->selectedUids();
     if ( uidList.count() > 0 )
       localUID = *( uidList.at( 0 ) );
   }
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
       mEditorDialog->setAddressee( addr );
       KApplication::execDialog ( mEditorDialog );
   }
 }
 
 /**
   Shows or edits the detail view for the given uid. If the uid is QString::null,
   the method will try to find a selected addressee in the view.
  */
 void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
 {
   if ( mMultipleViewsAtOnce )
   {
     editContact( uid );
   }
   else
   {
     setDetailsVisible( true );
     mActionDetails->setChecked(true);
   }
 
 }
 
 void KABCore::save()
 {
      if (syncManager->blockSave())
         return;
     if ( !mModified )
         return;
 
     syncManager->setBlockSave(true);
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
     "not using it. " );
    message(i18n("Saving addressbook ... "));
 #ifndef KAB_EMBEDDED
   KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
   if ( !b || !b->save() ) {
     KMessageBox::error( this, text, i18n( "Unable to Save" ) );
   }
 #else //KAB_EMBEDDED
   KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
   if ( !b || !b->save() ) {
     QMessageBox::critical( this, i18n( "Unable to Save" ), text,  i18n("Ok"));
   }
 #endif //KAB_EMBEDDED
 
   message(i18n("Addressbook saved!"));
   setModified( false );
   syncManager->setBlockSave(false);
 }
 
 
 void KABCore::undo()
 {
   UndoStack::instance()->undo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::redo()
 {
   RedoStack::instance()->redo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mJumpButtonBar->show();
     else
       mJumpButtonBar->hide();
   }
   else
   {
 	// show the jumpbar only if "the details are hidden" == "viewmanager are shown"
     if (mViewManager->isVisible())
     {
       if ( visible )
         mJumpButtonBar->show();
       else
         mJumpButtonBar->hide();
 	}
 	else
 	{
       mJumpButtonBar->hide();
 	}
   }
 }
 
 
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
 }
 
 
 
 void KABCore::setDetailsVisible( bool visible )
 {
   if (visible && mDetails->isHidden())
   {
     KABC::Addressee::List addrList = mViewManager->selectedAddressees();
     if ( addrList.count() > 0 )
       mDetails->setAddressee( addrList[ 0 ] );
   }
 
   // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
   // the listview and the detailview. We do that by changing the splitbar size.
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mDetails->show();
     else
       mDetails->hide();
   }
   else
   {
     if ( visible ) {
       mViewManager->hide();
       mDetails->show();
+      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::openConfigDialog()
 {
     KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
     KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
     ConfigureDialog->addModule(kabcfg );
     KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
     ConfigureDialog->addModule(kdelibcfg );
 
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
              this, SLOT( configurationChanged() ) );
     connect( ConfigureDialog, SIGNAL( okClicked() ),
              this, SLOT( configurationChanged() ) );
     saveSettings();
 #ifndef DESKTOP_VERSION
     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." );
@@ -1855,384 +1857,387 @@ void KABCore::initActions()
 #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" ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
 
   mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
                                     SLOT( removeVoice() ), 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" );
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                  this, SLOT( synchowto() ), actionCollection(),
                  "sync" );
 
   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();
 
 #ifdef DESKTOP_VERSION
   QMenuBar* mb = mMainWindow->menuBar();
 
   //US setup menubar.
   //Disable the following block if you do not want to have a menubar.
   mb->insertItem( "&File", fileMenu );
   mb->insertItem( "&Edit", editMenu );
   mb->insertItem( "&View", viewMenu );
   mb->insertItem( "&Settings", settingsMenu );
   mb->insertItem( i18n("Synchronize"), syncMenu );
   mb->insertItem( "&Change selected", changeMenu );
   mb->insertItem( "&Help", helpMenu );
   mIncSearchWidget = new IncSearchWidget( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget);
 
 #else
   //US setup toolbar
   QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
   QPopupMenu *popupBarTB = new QPopupMenu( this );
   menuBarTB->insertItem( "ME", popupBarTB);
   tb->insertWidget(-1, 0, menuBarTB);
   mIncSearchWidget = new IncSearchWidget( tb );
 
   tb->enableMoving(false);
   popupBarTB->insertItem( "&File", fileMenu );
   popupBarTB->insertItem( "&Edit", editMenu );
   popupBarTB->insertItem( "&View", viewMenu );
   popupBarTB->insertItem( "&Settings", settingsMenu );
   popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
   mViewManager->getFilterAction()->plug ( popupBarTB);
   popupBarTB->insertItem( "&Change selected", changeMenu );
   popupBarTB->insertItem( "&Help", helpMenu );
   if (QApplication::desktop()->width() > 320 ) {
       // mViewManager->getFilterAction()->plug ( tb);
   }
 #endif
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
   mActionPrint->plug( fileMenu );
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( fileMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
   if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
       (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
   fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
   if ( Ir::supported() ) mActionBeam->plug(fileMenu );
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
 #ifdef _WIN32_
   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 );
 
   mActionRemoveVoice->plug( changeMenu );
   // settings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources->plug( settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionConfigKAddressbook->plug( settingsMenu );
 
   if ( mIsPart ) {
     //US not implemented yet
     //mActionConfigShortcuts->plug( settingsMenu );
     //mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     //US not implemented yet
     //mActionKeyBindings->plug( settingsMenu );
   }
 
   settingsMenu->insertSeparator();
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
   if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
     mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
   mActionBR->plug(settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
 
      
   mActionWN->plug( helpMenu );
   mActionSyncHowto->plug( helpMenu );
   mActionLicence->plug( helpMenu );
   mActionFaq->plug( helpMenu );
   mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
 	mActionUndo->plug( tb );
 	mActionDelete->plug( tb );
 	mActionRedo->plug( tb );
       }
+  } else {
+      if (KABPrefs::instance()->mMultipleViewsAtOnce )
+          mActionSave->plug( tb );
   }
   //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
 //US topLayout->addWidget( mJumpButtonBar );
  this->layout()->add( mJumpButtonBar );
 */
 
 #endif //KAB_EMBEDDED
 
   mActionExport2phone->plug( ExportMenu );
  connect ( syncMenu, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
  syncManager->fillSyncMenu();
 
 }
 void KABCore::showLicence()
 {
     KApplication::showLicence();
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
     KABC::Addressee::List list = mViewManager->selectedAddressees();
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         
         if ( (*it).removeVoice() )
             contactModified((*it) );
     }
 }
 
 
 
 void KABCore::clipboardDataChanged()
 {
 
   if ( mReadWrite )
     mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 
 }
 
 void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
   if ( !redo->top() )
     mActionRedo->setText( i18n( "Redo" ) );
   else
     mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
 
   mActionRedo->setEnabled( !redo->isEmpty() );
 }
 
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
   qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
   KRES::KCMKResources dlg( this, "" , 0 );
 
   if ( !dlg.exec() )
     return;
   KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 
 
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
  * for the attendees list of an event.
  */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
   QStringList nameList;
   QStringList emailList;
   QStringList uidList;
 
   KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
   uint i=0;
   for (i=0; i < list.count(); i++)
   {
 	nameList.append(list[i].realName());
 	emailList.append(list[i].preferredEmail());
 	uidList.append(list[i].uid());
   }
 
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
 
 }
 
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
  * to put them into the calendar.
  */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
   //  qDebug("KABCore::requestForBirthdayList");
   QStringList birthdayList;
   QStringList anniversaryList;
   QStringList realNameList;
   QStringList preferredEmailList;
   QStringList assembledNameList;
   QStringList uidList;
 
   KABC::AddressBook::Iterator it;
 
     int count = 0;
     for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("Collecting birthdays - close to abort!") );
     qApp->processEvents();
 
     QDate bday;
     QString anni;
     QString formattedbday;
 
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it )  
   {
         if ( ! bar.isVisible() )
             return;
         bar.setProgress( count++ );
         qApp->processEvents();
 	bday = (*it).birthday().date();
 	anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" );
 
         if ( bday.isValid() || !anni.isEmpty())
 	{
 	  if (bday.isValid()) 
 	    formattedbday = KGlobal::locale()->formatDate(bday,  true, KLocale::ISODate);
 	  else
 	    formattedbday = "NOTVALID";
 	  if (anni.isEmpty())
 	    anni = "INVALID";
 	    
 	  birthdayList.append(formattedbday);
 	  anniversaryList.append(anni); //should be ISODate
 	  realNameList.append((*it).realName());
 	  preferredEmailList.append((*it).preferredEmail());
 	  assembledNameList.append((*it).assembledName());
 	  uidList.append((*it).uid());
 
 	  qDebug("found birthday in KA/Pi: %s,%s,%s,%s: %s, %s", (*it).realName().latin1(), (*it).preferredEmail().latin1(), (*it).assembledName().latin1(), (*it).uid().latin1(), formattedbday.latin1(), anni.latin1() );
 	}
   }
 
   bool res = ExternalAppHandler::instance()->returnBirthdayListFromKAPI(sourceChannel, uid, birthdayList, anniversaryList, realNameList, preferredEmailList, assembledNameList, uidList);
 
 }
 
 /* this method will be called through the QCop interface from other apps to show details of a contact.
  */
 void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
 {
     qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
 
     QString foundUid = QString::null;
     if ( ! uid.isEmpty() ) {
@@ -2318,599 +2323,613 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
     }
   }
 }
 
 void KABCore::whatsnew()
 {
     KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
 }
 void KABCore::synchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 
 void  KABCore::faq()
 {
   KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
 }
 
 #include <libkcal/syncdefines.h>
 
 KABC::Addressee KABCore::getLastSyncAddressee()
 {
     Addressee lse; 
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
     lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
     if (lse.isEmpty()) {
         qDebug("Creating new last-syncAddressee ");
         lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
         QString sum = "";
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
             sum = "E: ";
         lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse.setRevision( mLastAddressbookSync );
         lse.setCategories( i18n("SyncEvent") );
         mAddressBook->insertAddressee( lse );
     }
     return lse;
 }
 int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full )
 {
  
     //void setZaurusId(int id);
     // int zaurusId() const;
     //  void setZaurusUid(int id);
    // int zaurusUid() const;
    // void setZaurusStat(int id);
    // int zaurusStat() const;
     // 0 equal
     // 1 take local
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastAddressbookSync;
     QDateTime localMod = local->revision();
     QDateTime remoteMod = remote->revision();
 
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
 
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
        
         //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
             lastSync = localMod.addDays(1);
             if ( mode <= SYNC_PREF_ASK )
                 return 0;
         } else {
             if ( locCh ) {
                 //qDebug("loc changed %s %s",  localMod.toString().latin1(), mLastAddressbookSync.toString().latin1());
                 lastSync = localMod.addDays( -1 );
                 if ( !remCh )
                     remoteMod =( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = localMod.addDays( 1 );
                 if ( remCh )
                     remoteMod =( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
           if ( localMod == remoteMod )
                 return 0;
         
     }
     // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
 
     //qDebug("%s %d  %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod);  
     //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(),  remote->lastModified().time().second(), remote->lastModified().time().msec() );
     //full = true; //debug only
     if ( full ) {
         bool equ = ( (*local) == (*remote) );
         if ( equ ) {
             //qDebug("equal ");
             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
             if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
               
         }//else //debug only
         //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
     }
     int result;
     bool localIsNew;
     //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
 
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 1;
         break;
     case SYNC_PREF_REMOTE:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 2;
         break;
     case SYNC_PREF_NEWEST:
         if ( localMod > remoteMod )
             return 1;
         else
             return 2;
         break;
     case SYNC_PREF_ASK: 
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         localIsNew = localMod >= remoteMod;
         //qDebug("conflict! ************************************** ");
         {
             KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
             result = acd.executeD(localIsNew);
             return result;
         }
         break;
     case SYNC_PREF_FORCE_LOCAL:
         return 1;
         break;
     case SYNC_PREF_FORCE_REMOTE:
         return 2;
         break;
        
     default:
         // SYNC_PREF_TAKE_BOTH not implemented
         break;
     }
     return 0;
 }
 
 
 bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode)
 {
     bool syncOK = true;
     int addedAddressee = 0;
     int addedAddresseeR = 0;
     int deletedAddresseeR = 0;
     int deletedAddresseeL = 0;
     int changedLocal = 0;
     int changedRemote = 0;
 
     QString mCurrentSyncName = syncManager->getCurrentSyncName();
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
 
     //QPtrList<Addressee> el = local->rawAddressees(); 
     Addressee addresseeR;
     QString uid;
     int take;
     Addressee addresseeL;
     Addressee addresseeRSync;
     Addressee addresseeLSync;
     // KABC::Addressee::List  addresseeRSyncSharp = remote->getExternLastSyncAddressees();
     //KABC::Addressee::List  addresseeLSyncSharp = local->getExternLastSyncAddressees();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastAddressbookSync = QDateTime::currentDateTime();
-    QDateTime modifiedCalendar = mLastAddressbookSync;;
+    if ( syncManager->syncWithDesktop() ) {
+        remote->removeSyncInfo( QString());//remove all info
+        if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
+            mLastAddressbookSync = KSyncManager::mRequestedSyncEvent;
+            qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
+        } else {
+            qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime ");
+        }
+    }
+    QDateTime modifiedCalendar = mLastAddressbookSync;
     addresseeLSync = getLastSyncAddressee();
     qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1());
     addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
     if ( !addresseeR.isEmpty() ) {
         addresseeRSync = addresseeR;
         remote->removeAddressee(addresseeR );
 
     } else {
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
             addresseeRSync = addresseeLSync         ;
         } else {
             qDebug("FULLDATE 1");
             fullDateRange = true;
             Addressee newAdd;
             addresseeRSync = newAdd;
             addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
             addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
             addresseeRSync.setRevision( mLastAddressbookSync );
             addresseeRSync.setCategories( i18n("SyncAddressee") );
         }
     }
     if ( addresseeLSync.revision() == mLastAddressbookSync ) {
             qDebug("FULLDATE 2");
         fullDateRange = true;
     }
     if ( ! fullDateRange  ) {
         if ( addresseeLSync.revision() != addresseeRSync.revision() ) {
             
             // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
             fullDateRange = true;
             qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() );
         } 
     }
     // fullDateRange = true; // debug only!
     if ( fullDateRange )
         mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastAddressbookSync = addresseeLSync.revision();
     // for resyncing if own file has changed
     // PENDING fixme later when implemented
 #if 0
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastAddressbookSync = loadedFileVersion;
         qDebug("setting mLastAddressbookSync ");
     }
 #endif
 
     //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" );
                             } 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
                 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.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; 
                     }
                 }
             }
         }
         ++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 ( 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 ) {
                             // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                             local->removeAddressee( inL );
                             ++deletedAddresseeL; 
                         } else {
                             if ( ! syncManager->mWriteBackExistingOnly ) {
                                 ++addedAddresseeR; 
                                 inL.setRevision( modifiedCalendar );
                                 local->insertAddressee( inL, false );
                                 inR = inL;
                                 inR.setResource( 0 );
                                 remote->insertAddressee( inR, false );
                             }
                         }
                     }
                 }
             }
         }
         ++incCounter;
     }
     el.clear();
     syncManager->hideProgressBar();
     mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
     // get rid of micro seconds
     QTime t =  mLastAddressbookSync.time();
     mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
     addresseeLSync.setRevision( mLastAddressbookSync );
     addresseeRSync.setRevision( mLastAddressbookSync );
     addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
     addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
     addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
     addresseeLSync.setGivenName(i18n("!DO NOT EDIT!")   );
     addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
     addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
     addresseeRSync.setNote( "" ) ;
     addresseeLSync.setNote( "" );
 
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->insertAddressee( addresseeRSync, false );
     local->insertAddressee( addresseeLSync, false );
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
     if ( syncManager->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
     }
     qDebug( mes );
     return syncOK;
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 { 
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal(filename,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
         bool external = false;
         bool isXML = false;
         if ( filename.right(4) == ".xml") {
             mGlobalSyncMode = SYNC_MODE_EXTERNAL;
             isXML = true;
             abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
         } else {
             external = !manager->mIsKapiFile;
             if ( external ) {
                 qDebug("Setting vcf mode to external ");
                 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                 AddressBook::Iterator it;  
                 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                     (*it).setID( mCurrentSyncDevice, (*it).uid() );
                     (*it).computeCsum( mCurrentSyncDevice );
                 }
             }
         }
         //AddressBook::Iterator it;
         //QStringList vcards;
         //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
         //  qDebug("Name %s ", (*it).familyName().latin1());
         //}
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("Saving remote AB ");
                     if ( ! abLocal.saveAB()) 
                         qDebug("Error writing back AB to file ");
                     if ( isXML ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
                     }
                 }
         }
         setModified();
         
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
     qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
     mAddressBook->removeSyncInfo( syncProfile );
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     if (  resource == "phone" )
         return syncPhone();
     disableBR( true );
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( false );
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
     disableBR( false );
     return syncOK;
 
 }
 void KABCore::message( QString m )
 {
     topLevelWidget()->setCaption( m );
     mMessageTimer->start( 15000, true );
 }
 bool KABCore::syncPhone()
 {
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
     QString fileName = getPhoneFile();
     if ( !PhoneAccess::readFromPhone( fileName) ) {
         message(i18n("Phone access failed!"));
         return false;
     }   
     AddressBook abLocal( fileName,"syncContact");
     bool syncOK = false;
      {
          abLocal.importFromFile( fileName );
         qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preparePhoneSync( mCurrentSyncDevice, true );
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( true );
                 abLocal.saveABphone( fileName );
                 abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
                 //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 }
 void KABCore::getFile( bool success )
 {
     if ( ! success ) {
         message( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     int count = mAddressBook->importFromFile( sentSyncFile() , false, true );
     if ( count )
         setModified( true );
     message( i18n("Pi-Sync successful!") );
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 {
+    if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) {
+        syncManager->slotSyncMenu( 999 );
+    } 
     mAddressBook->export2File( sentSyncFile() );
 }
 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("KAddressbook/Pi") );
 }
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index f4fb08b..81e0d99 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -111,384 +111,389 @@ void ViewManager::restoreSettings()
   // been modified by global settings
   QString _oldgroup = mCore->config()->group();
 
   QDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
     KConfigGroupSaver saver( mCore->config(), it.currentKey() );
     it.current()->readConfig( mCore->config() );
   }
   setActiveView( activeViewName );
 
   mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
 }
 
 void ViewManager::saveSettings()
 {
   QString _oldgroup = mCore->config()->group();
 
   QDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
     KConfigGroupSaver saver( mCore->config(), it.currentKey() );
 #ifdef DESKTOP_VERSION
     (*it)->writeConfig( mCore->config() );
 #else
     (*it).writeConfig( mCore->config() );
 #endif
   }
 
   Filter::save( mCore->config(), "Filter", mFilterList );
   KABPrefs::instance()->mCurrentFilter = mActionSelectFilter->currentItem();
 
   // write the view name list
   KABPrefs::instance()->mViewNames = mViewNameList;
   KABPrefs::instance()->mCurrentView = mActiveView->caption();
 
 }
 
 QStringList ViewManager::selectedUids() const
 {
   if ( mActiveView )
     return mActiveView->selectedUids();
   else
     return QStringList();
 }
 
 QStringList ViewManager::selectedEmails() const
 {
   if ( mActiveView )
     return mActiveView->selectedEmails();
   else
     return QStringList();
 }
 
 KABC::Addressee::List ViewManager::selectedAddressees() const
 {
   KABC::Addressee::List list;
   if ( mActiveView ) {
     QStringList uids = mActiveView->selectedUids();
     QStringList::Iterator it;
     for ( it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
       if ( !addr.isEmpty() )
         list.append( addr );
     }
   }
 
   return list;
 }
 //US added another method with no parameter, since my moc compiler does not support default parameters.
 void ViewManager::setSelected()
 {
   setSelected( QString::null, true );
 }
 
 void ViewManager::setSelected( const QString &uid, bool selected )
 {
   if ( mActiveView )
     mActiveView->setSelected( uid, selected );
 }
 
 void ViewManager::setListSelected(QStringList list)
 {
     int i, count = list.count();
     for ( i = 0; i < count;++i )
         setSelected( list[i], true );
 
 }
 void ViewManager::unloadViews()
 {
   mViewDict.clear();
   mActiveView = 0;
 }
 
 void ViewManager::setActiveView( const QString &name )
 {
   KAddressBookView *view = 0;
 
   // Check that this isn't the same as the current active view
   if ( mActiveView && ( mActiveView->caption() == name ) )
     return;
 
   // At this point we know the view that should be active is not
   // currently active. We will try to find the new on in the list. If
   // we can't find it, it means it hasn't been instantiated, so we will
   // create it on demand.
 
   view = mViewDict.find( name );
 
   // Check if we found the view. If we didn't, then we need to create it
   if ( view == 0 ) {
     KConfig *config = mCore->config();
 
     KConfigGroupSaver saver( config, name );
 
     QString type = config->readEntry( "Type", "Table" );
 
     kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
 
     ViewFactory *factory = mViewFactoryDict.find( type );
     if ( factory )
       view = factory->view( mCore->addressBook(), mViewWidgetStack );
 
     if ( view ) {
       view->setCaption( name );
       mViewDict.insert( name, view );
 //US my version needs an int as second parameter to addWidget
       mViewWidgetStack->addWidget( view, -1 );
       view->readConfig( config );
 
       // The manager just relays the signals
       connect( view, SIGNAL( selected( const QString& ) ),
                SIGNAL( selected( const QString & ) ) );
         connect( view, SIGNAL( executed( const QString& ) ),
              SIGNAL( executed( const QString& ) ) );
 
         connect( view, SIGNAL( deleteRequest( ) ),
              SIGNAL( deleteRequest(  ) ) );
 
       connect( view, SIGNAL( modified() ), SIGNAL( modified() ) );
       connect( view, SIGNAL( dropped( QDropEvent* ) ),
                SLOT( dropped( QDropEvent* ) ) );
       connect( view, SIGNAL( startDrag() ), SLOT( startDrag() ) );
     }
   }
 
   // If we found or created the view, raise it and refresh it
   if ( view ) {
     mActiveView = view;
     mViewWidgetStack->raiseWidget( view );
     // Set the proper filter in the view. By setting the combo
     // box, the activated slot will be called, which will push
     // the filter to the view and refresh it.
 
     if ( view->defaultFilterType() == KAddressBookView::None ) {
 
       mActionSelectFilter->setCurrentItem( 0 );
       setActiveFilter( 0 );
     } else if ( view->defaultFilterType() == KAddressBookView::Active ) {
       setActiveFilter( mActionSelectFilter->currentItem() );
     } else {
       uint pos = filterPosition( view->defaultFilterName() );
       mActionSelectFilter->setCurrentItem( pos );
       setActiveFilter( pos );
     }
 //US  qDebug("ViewManager::setActiveView 6" );
 
     // Update the inc search widget to show the fields in the new active
     // view.
     mCore->setSearchFields( mActiveView->fields() );
 
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US mActiveView->refresh();
 
   }
   else
   {
   qDebug("ViewManager::setActiveView: unable to find view" );
     kdDebug(5720) << "ViewManager::setActiveView: unable to find view\n";
   }
 }
 
 //US added another method with no parameter, since my moc compiler does not support default parameters.
 void ViewManager::refreshView()
 {
   refreshView( QString::null );
 }
 
 void ViewManager::refreshView( const QString &uid )
 {
   if ( mActiveView )
     mActiveView->refresh( uid );
 }
 
+void ViewManager::setFocusAV()
+{
+ if ( mActiveView )
+     mActiveView->setFocus();
+}
 void ViewManager::editView()
 {
   if ( !mActiveView )
     return;
 
   ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() );
   ViewConfigureWidget *wdg = 0;
   ViewConfigureDialog* dlg = 0;
   if ( factory ) {
     // Save the filters so the dialog has the latest set
     Filter::save( mCore->config(), "Filter", mFilterList );
     dlg = new  ViewConfigureDialog( 0, mActiveView->caption(), this, "conf_dlg" );
     wdg = factory->configureWidget( mCore->addressBook(), dlg,"conf_wid" );
   } else {
       qDebug("ViewManager::editView()::cannot find viewfactory ");
       return;
   }
   if ( wdg ) {
      dlg->setWidget( wdg );
 
 #ifndef DESKTOP_VERSION
     //dlg.setMaximumSize( 640, 480 );
     //dlg->setGeometry( 40,40, 400, 300);
     dlg->showMaximized();
 #endif
 
     KConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
 
     dlg->restoreSettings( mCore->config() );
 
     if ( dlg->exec() ) {
       dlg->saveSettings( mCore->config() );
       mActiveView->readConfig( mCore->config() );
 
       // Set the proper filter in the view. By setting the combo
       // box, the activated slot will be called, which will push
       // the filter to the view and refresh it.
       if ( mActiveView->defaultFilterType() == KAddressBookView::None ) {
         mActionSelectFilter->setCurrentItem( 0 );
         setActiveFilter( 0 );
       } else if ( mActiveView->defaultFilterType() == KAddressBookView::Active ) {
         setActiveFilter( mActionSelectFilter->currentItem() );
       } else {
         uint pos = filterPosition( mActiveView->defaultFilterName() );
         mActionSelectFilter->setCurrentItem( pos );
         setActiveFilter( pos );
       }
       mCore->setSearchFields( mActiveView->fields() );
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US      mActiveView->refresh();
 
 
       //US this is a bugfix, that we get notified if we change a views configuration
       emit modified();
 
     }
 
   }
   delete dlg;
 }
 
 void ViewManager::deleteView()
 {
   QString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" )
                      .arg( mActiveView->caption() );
   QString caption = i18n( "Confirm Delete" );
 
 
    if (QMessageBox::information( this, caption,
                                       text,
                                       i18n("Yes!"), i18n("No"), 0, 0 ) == 0)
    {
     mViewNameList.remove( mActiveView->caption() );
 
     // remove the view from the config file
     KConfig *config = mCore->config();
     config->deleteGroup( mActiveView->caption() );
 
     mViewDict.remove( mActiveView->caption() );
     mActiveView = 0;
 
     // we are in an invalid state now, but that should be fixed after
     // we emit the signal
     mActionSelectView->setItems( mViewNameList );
     if ( mViewNameList.count() > 0 ) {
       mActionSelectView->setCurrentItem( 0 );
       setActiveView( mViewNameList[ 0 ] );
     }
     mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
   }
 }
 
 void ViewManager::addView()
 {
   AddViewDialog dialog( &mViewFactoryDict, this );
 
   if ( dialog.exec() ) {
     QString newName = dialog.viewName();
     QString type = dialog.viewType();
 
     // Check for name conflicts
     bool firstConflict = true;
     int numTries = 1;
     while ( mViewNameList.contains( newName ) > 0 ) {
       if ( !firstConflict ) {
         newName = newName.left( newName.length() - 4 );
         firstConflict = false;
       }
 
       newName = QString( "%1 <%2>" ).arg( newName ).arg( numTries );
       numTries++;
     }
 
     // Add the new one to the list
     mViewNameList.append( newName );
 
     // write the view to the config file,
     KConfig *config = mCore->config();
 
     config->deleteGroup( newName );
 
     KConfigGroupSaver saver( config, newName );
 
     config->writeEntry( "Type", type );
 
     // try to set the active view
     mActionSelectView->setItems( mViewNameList );
     mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) );
     setActiveView( newName );
 
     editView();
 
     mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
   }
 }
 
 void ViewManager::createViewFactories()
 {
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
       continue;
 
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
 
     if ( !factory ) {
       kdDebug(5720) << "ViewManager::createViewFactories(): Factory creation failed" << endl;
       continue;
     }
 
     ViewFactory *viewFactory = static_cast<ViewFactory*>( factory );
 
     if ( !viewFactory ) {
       kdDebug(5720) << "ViewManager::createViewFactories(): Cast failed" << endl;
       continue;
     }
 
     mViewFactoryDict.insert( viewFactory->type(), viewFactory );
   }
 
 #else //KAB_EMBEDDED
   ViewFactory* viewFactory = new IconViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
   viewFactory = new TableViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
   viewFactory = new CardViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::dropped( QDropEvent *e )
 {
   kdDebug(5720) << "ViewManager::dropped: got a drop event" << endl;
 
 #ifndef KAB_EMBEDDED
 
   QString clipText, vcards;
   KURL::List urls;
 
   if ( KURLDrag::decode( e, urls) ) {
     KURL::List::Iterator it = urls.begin();
     int c = urls.count();
     if ( c > 1 ) {
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 585f4e9..a03a83f 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -1,156 +1,157 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 
 #include <qwidget.h>
 #include <qstringlist.h>
 #include <kaddressbookview.h>
 #include <qdict.h>
 
 class KAction;
 class KSelectAction;
 
 class KABCore;
 class QWidgetStack;
 class QDropEvent;
 
 namespace KABC { class AddressBook; }
 
 /**
   The view manager manages the views and everything related to them. The
   manager will load the views at startup and display a view when told to
   make one active.
 
   The view manager will also create and manage all dialogs directly related to
   views (ie: AddView, ConfigureView, DeleteView, etc).
  */
 class ViewManager : public QWidget
 {
   Q_OBJECT
   public:
     ViewManager( KABCore *core, QWidget *parent, const char *name = 0 );
     ~ViewManager();
 
     void restoreSettings();
     void saveSettings();
     void doSearch( const QString&  s ,KABC::Field *field );
 
     void unloadViews(); 
     KSelectAction * getFilterAction() { return mActionSelectFilter; }
 
     QStringList selectedUids() const;
     QStringList selectedEmails() const;
     KABC::Addressee::List selectedAddressees() const;
     void setListSelected(QStringList);
+    void setFocusAV();
 
   public slots:
     void scrollUP();
     void scrollDOWN();
 
 //US    void setSelected( const QString &uid = QString::null, bool selected = true );
     void setSelected( const QString &uid, bool);
 //US added another method with no parameter, since my moc compiler does not support default parameters.    
     void setSelected();
     
 
     
 //US added another method with no parameter, since my moc compiler does not support default parameters.    
     void refreshView();
     void refreshView( const QString &uid);
     
     void editView();
     void deleteView();
     void addView();
 
   protected slots:
     /**
       Called whenever the user drops something in the active view.
       This method will try to decode what was dropped, and if it was
       a valid addressee, add it to the addressbook.
      */
     void dropped( QDropEvent* );
 
     /**
       Called whenever the user attempts to start a drag in the view.
       This method will convert all the selected addressees into text (vcard)
       and create a drag object.
      */
     void startDrag();
 
   signals:
     /**
       Emitted whenever the user selects an entry in the view.
      */
     void selected( const QString &uid );
     void deleteRequest(  );
 
     /**
       Emitted whenever the user activates an entry in the view.
      */
     void executed( const QString &uid );
 
     /**
       Emitted whenever the address book is modified in some way.
      */
     void modified();
 
     /**
       Emitted whenever a url is dragged on a view.
      */
     void urlDropped( const KURL& );
 
   private slots:
     void setActiveView( const QString &name );
     void setActiveFilter( int index );
     void configureFilters();
 
   private:
     void createViewFactories();
     QStringList filterNames() const;    
     int filterPosition( const QString &name ) const;
     QStringList viewNames() const;
     int viewPosition( const QString &name ) const;
     void initActions();
     void initGUI();
 
     KABCore *mCore;
 
     Filter mCurrentFilter;
     Filter::List mFilterList;
 
     QDict<KAddressBookView> mViewDict;
     QDict<ViewFactory> mViewFactoryDict;
     QStringList mViewNameList;
 
     QWidgetStack *mViewWidgetStack;
     KAddressBookView *mActiveView;
     
     KAction *mActionDeleteView;
     KSelectAction *mActionSelectFilter;
     KSelectAction *mActionSelectView;
 
 };
 
 #endif
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 326db88..6e61351 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -738,641 +738,641 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
                 lastSync = localMod.addDays( -1 );
                 if ( !remCh )
                     remoteMod = ( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = localMod.addDays( 1 );
                 if ( remCh )
                     remoteMod =( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
           if ( localMod == remoteMod )
               // if ( local->revision() == remote->revision() )
                 return 0;
         
     }
     // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
 
     //qDebug("%s %d  %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision());  
     //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(),  remoteMod.time().second(), remoteMod.time().msec() );
     //full = true; //debug only
     if ( full ) {
         bool equ = false;
         if ( local->type() == "Event" ) {
             equ =  (*((Event*) local) == *((Event*) remote));
         }
         else if ( local->type() =="Todo" )
             equ =  (*((Todo*) local) == (*(Todo*) remote));
         else if ( local->type() =="Journal" )
             equ =  (*((Journal*) local) == *((Journal*) remote));
         if ( equ ) {
             //qDebug("equal ");
             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
             if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
               
         }//else //debug only
         //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
     }
     int result;
     bool localIsNew;
     //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  localMod.toString().latin1() , remoteMod.toString().latin1()  );
 
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 1;
         break;
     case SYNC_PREF_REMOTE:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 2;
         break;
     case SYNC_PREF_NEWEST:
         if ( localMod > remoteMod )
             return 1;
         else
             return 2;
         break;
     case SYNC_PREF_ASK: 
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         localIsNew = localMod >= remoteMod;
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 1 );
          else 
             getEventViewerDialog()->setColorMode( 2 );
         getEventViewerDialog()->setIncidence(local);
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 2 );
          else 
             getEventViewerDialog()->setColorMode( 1 );
         getEventViewerDialog()->addIncidence(remote);
         getEventViewerDialog()->setColorMode( 0 );
         //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo()  );
         getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!"));
         getEventViewerDialog()->showMe();
         result = getEventViewerDialog()->executeS( localIsNew );
         return result;
           
         break;
     case SYNC_PREF_FORCE_LOCAL:
         return 1;
         break;
     case SYNC_PREF_FORCE_REMOTE:
         return 2;
         break;
        
     default:
         // SYNC_PREF_TAKE_BOTH not implemented
         break;
     }
     return 0;
 }
 Event* CalendarView::getLastSyncEvent()
 {
     Event* lse; 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
     lse =   mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
     if (!lse) {
         lse = new Event();
         lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); 
         QString sum = "";
         if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
             sum = "E: ";
         lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse->setDtStart( mLastCalendarSync );
         lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         lse->setCategories( i18n("SyncEvent") );
         lse->setReadOnly( true );
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
 
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
 void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
 {
     if ( lastSync.count() == 0 ) {
         //qDebug(" lastSync.count() == 0");
         return;
     }
     if ( toDelete->type() == "Journal" )
         return;
 
     Event* eve = lastSync.first();
 
     while ( eve ) {
         QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
         if ( !id.isEmpty() ) {
             QString des = eve->description();
             QString pref = "e";
             if ( toDelete->type() == "Todo" )
                 pref = "t";
             des += pref+  id  + ",";
             eve->setReadOnly( false );
             eve->setDescription( des );
             //qDebug("setdes %s ", des.latin1());
             eve->setReadOnly( true );
         }
         eve = lastSync.next();
     }
 
 }
 void CalendarView::checkExternalId( Incidence * inc )
 {
     QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
     checkExternSyncEvent( lastSync, inc );
 
 }
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
     bool syncOK = true;
     int addedEvent = 0;
     int addedEventR = 0;
     int deletedEventR = 0;
     int deletedEventL = 0;
     int changedLocal = 0;
     int changedRemote = 0;
     //QPtrList<Event> el = local->rawEvents(); 
     Event* eventR;
     QString uid;
     int take;
     Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
     QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastCalendarSync = QDateTime::currentDateTime();
-    if ( mSyncKDE ) {
+    if ( mSyncManager->syncWithDesktop() ) {
         remote->resetPilotStat(1);
         if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
             mLastCalendarSync = KSyncManager::mRequestedSyncEvent;
             qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() );
             } else {
             qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime ");
         }
     }
     QDateTime modifiedCalendar = mLastCalendarSync;;
     eventLSync = getLastSyncEvent();
     eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } else {
-        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncKDE) {
+        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) {
             eventRSync = (Event*)eventLSync->clone();
         } else {
             fullDateRange = true;
             eventRSync = new Event();
             eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event"));
             eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); 
             eventRSync->setDtStart( mLastCalendarSync );
             eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
             eventRSync->setCategories( i18n("SyncEvent") );
         }
     }
     if ( eventLSync->dtStart() == mLastCalendarSync )
         fullDateRange = true;
    
     if ( ! fullDateRange  ) {
         if ( eventLSync->dtStart() != eventRSync->dtStart() ) {
             
             // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec());
             fullDateRange = true;
         } 
     }
-    if ( mSyncKDE ) {
+    if ( mSyncManager->syncWithDesktop() ) {
         fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); 
     }
     if ( fullDateRange )
         mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastCalendarSync = eventLSync->dtStart();
     // for resyncing if own file has changed
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastCalendarSync = loadedFileVersion;
         //qDebug("setting mLastCalendarSync ");
     }
     //qDebug("*************************** ");
     qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     Incidence* inL;
     QProgressBar bar( er.count(),0 );
     bar.setCaption (i18n("Syncing - close to abort!") );
     
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( inR ) {
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inR->uid(); 
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         QString idS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->incidence( uid );
             if ( inL ) { // maybe conflict - same uid in both calendars
                 if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                     //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) );
                         else
                             idS = inR->IDStr();
                         remote->deleteIncidence( inR );
                         inR = inL->clone();
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                             inR->setIDStr( idS );
                         remote->addIncidence(  inR );
-                        if ( mSyncKDE )
+                        if ( mSyncManager->syncWithDesktop() )
                             inR->setPilotId( 2 );
                         ++changedRemote;
                     } else {
                         idS = inL->IDStr();
                         int pid = inL->pilotId();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
-                        if ( mSyncKDE )
+                        if ( mSyncManager->syncWithDesktop() )
                             inL->setPilotId( pid  );
                         inL->setIDStr( idS );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                         }
                         local->addIncidence(  inL  );
                         ++changedLocal;
                     }
                 }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = eventLSync->description(); 
                     QString pref = "e";
                     if ( inR->type() == "Todo" )
                         pref = "t";
                     if ( des.find(pref+ inR->getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         //remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     } else {
                         inR->setLastModified( modifiedCalendar );
                         inL = inR->clone();
                         inL->setIDStr( ":" );
                         local->addIncidence( inL );
                         ++addedEvent;
                     }
                 } else {
                     if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
                         inR->setLastModified( modifiedCalendar );
                         inL = inR->clone();
                         inL->setIDStr( ":" );
                         local->addIncidence( inL );
                         ++addedEvent;
                     } else {
                         checkExternSyncEvent(eventRSyncSharp, inR);
                         remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     }
                 }
             }
         }
         inR =  er.next();
     }
     QPtrList<Incidence> el = local->rawIncidences(); 
     inL = el.first();
     modulo = (el.count()/10)+1;
     bar.setCaption (i18n("Add / remove events") ); 
     bar.setTotalSteps (  el.count()  ) ;
     bar.show();
     incCounter = 0;
    
     while ( inL ) {
            
         qApp->processEvents();
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inL->uid();
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inR = remote->incidence( uid );
             if ( ! inR ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! mSyncManager->mWriteBackExistingOnly ) {
                             inL->removeID(mCurrentSyncDevice );
                             ++addedEventR; 
                             //qDebug("remote added Incidence %s ", inL->summary().latin1());
                             inL->setLastModified( modifiedCalendar );
                             inR = inL->clone();
                             inR->setIDStr( ":" );
                             inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                             remote->addIncidence(  inR );
                         }
                     }
                 } else {
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! mSyncManager->mWriteBackExistingOnly ) {
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             inR = inL->clone();
                             inR->setIDStr( ":" );
                             remote->addIncidence(  inR );
                         }
                     }
                 }
             }
         }
         inL = el.next();
     }
     int delFut = 0;
     int remRem = 0;
     if ( mSyncManager->mWriteBackInFuture ) {
         er = remote->rawIncidences(); 
         remRem = er.count();
         inR = er.first();
         QDateTime dt;
         QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
         QDateTime end = cur.addDays( (mSyncManager->mWriteBackInFuture +1 ) *7 );
         while ( inR ) {
             if ( inR->type() == "Todo" ) {
                 Todo * t = (Todo*)inR;
                 if ( t->hasDueDate() )
                     dt = t->dtDue();
                 else
                     dt = cur.addSecs( 62 );
             }
             else if (inR->type() == "Event" ) {
                 bool ok;
                 dt =  inR->getNextOccurence( cur, &ok );
                     if ( !ok )
                         dt = cur.addSecs( -62 );
                 }
             else
                 dt = inR->dtStart();
             if ( dt < cur || dt > end ) {
                 remote->deleteIncidence( inR );
                 ++delFut;
             }
             inR =  er.next();
         }
     }
     bar.hide();
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
     eventLSync->setReadOnly( false );
     eventLSync->setDtStart( mLastCalendarSync );
     eventRSync->setDtStart( mLastCalendarSync );
     eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
     eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
     eventLSync->setReadOnly( true );
-    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncKDE) // kde is abnormal...
+    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal...
         remote->addEvent( eventRSync );
     else
         delete eventRSync;
     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"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); 
     QString delmess;
     if ( delFut  ) {
         delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); 
         mes += delmess;
     }
     if ( mSyncManager->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
     }
     qDebug( mes );
     mCalendar->checkAlarmForIncidence( 0, true );
     return syncOK;
 }
 
 void CalendarView::setSyncDevice( QString s )
 {
     mCurrentSyncDevice= s;
 }
 void CalendarView::setSyncName( QString s )
 {
     mCurrentSyncName= s;
 }
 bool CalendarView::syncCalendar(QString filename, int mode)
 {
     //qDebug("syncCalendar %s ", filename.latin1());
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     FileStorage* storage = new FileStorage( calendar );
     bool syncOK = false;
     storage->setFileName( filename );
     // qDebug("loading ... ");
     if ( storage->load() ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( mSyncManager->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat() );
                 storage->save();
             }
         }
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
 
 void CalendarView::syncExternal( int mode  )
 {
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
    
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
     bool loadSuccess = false;
     PhoneFormat* phoneFormat = 0;
     emit tempDisableBR(true);
 #ifndef DESKTOP_VERSION
     SharpFormat* sharpFormat = 0;
     if ( mode == 0 ) { // sharp
         sharpFormat = new SharpFormat () ;
         loadSuccess = sharpFormat->load( calendar, mCalendar ); 
 
     } else 
 #endif
         if ( mode == 1 ) { // phone 
         phoneFormat = new PhoneFormat (mCurrentSyncDevice,
                                          mSyncManager->mPhoneDevice,
                                          mSyncManager->mPhoneConnection,
                                          mSyncManager->mPhoneModel);
         loadSuccess = phoneFormat->load( calendar,mCalendar); 
         
         } else {
             emit tempDisableBR(false);
             return;
         }
     if ( loadSuccess ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( mSyncManager->mWriteBackFile )
             {
                 QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
                 if ( phoneFormat ) {
                     while ( inc ) {
                         inc->removeID(mCurrentSyncDevice);
                         inc =  iL.next();
                     }
                 }
 #ifndef DESKTOP_VERSION
                 if ( sharpFormat )
                     sharpFormat->save(calendar);
 #endif
                 if ( phoneFormat )
                     phoneFormat->save(calendar);
                 iL = calendar->rawIncidences(); 
                 inc = iL.first();
                 Incidence* loc;
                 while ( inc ) {
                     if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) {
                         loc = mCalendar->incidence(inc->uid() );
                         if ( loc ) {
                             loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
                             loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) );
                         }
                     }
                     inc =  iL.next();
                 }
                 Incidence* lse = getLastSyncEvent();
                 if ( lse ) {
                     lse->setReadOnly( false );
                     lse->setDescription( "" );
                     lse->setReadOnly( true );
                 }
             }
         }
         setModified( true );
     } else {
         QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                       question, i18n("Ok")) ;
 
     }
     delete calendar;
     updateView();
     emit tempDisableBR(false);
     return ;//syncOK;
 
 }
 
 bool CalendarView::importBday()
 {
 #ifndef KORG_NOKABC
 
 #ifdef DESKTOP_VERSION
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
     KABC::AddressBook::Iterator it;
     int count = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("Reading addressbook - close to abort!") );
     qApp->processEvents();
     count = 0;
     int addCount = 0;
     KCal::Attendee* a = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         if ( ! bar.isVisible() )
             return false;
         bar.setProgress( count++ );
         qApp->processEvents();
         //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() );
         if ( (*it).birthday().date().isValid() ){
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  (*it).birthday().date(), (*it).assembledName(),  a, true ) )
             ++addCount;
         } 
         QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); 
         if ( anni.isValid() ){ 
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  anni, (*it).assembledName(),  a, false ) )
             ++addCount;
         }
     }
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 #else //DESKTOP_VERSION
 
   ExternalAppHandler::instance()->requestBirthdayListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
   // the result should now arrive through method insertBirthdays
@@ -3556,225 +3556,222 @@ void CalendarView::toggleAllDaySize()
         KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize *2;
     */
     viewManager()->agendaView()->toggleAllDay();
 }
 void CalendarView::toggleExpand()
 {
     //  if ( mLeftFrame->isHidden() ) {
     //     mLeftFrame->show(); 
     //     emit calendarViewExpanded( false );
     //   } else {
     //     mLeftFrame->hide();
     //     emit calendarViewExpanded( true );
     //   }
 
     globalFlagBlockAgenda = 1;
     emit calendarViewExpanded( !mLeftFrame->isHidden() );
     globalFlagBlockAgenda = 5;
     mViewManager->raiseCurrentView( !mLeftFrame->isHidden() );
     //mViewManager->showView( 0, true );
 }
 
 void CalendarView::calendarModified( bool modified, Calendar * )
 {
     setModified( modified );
 }
 
 Todo *CalendarView::selectedTodo()
 {
     Incidence *incidence = currentSelection();
     if ( incidence && incidence->type() == "Todo" ) {
         return static_cast<Todo *>( incidence );
     }
 
     incidence = mTodoList->selectedIncidences().first();
     if ( incidence && incidence->type() == "Todo" ) {
         return static_cast<Todo *>( incidence );
     }
 
     return 0;
 }
 
 void CalendarView::dialogClosing(Incidence *in)
 {
     // mDialogList.remove(in);
 }
 
 void CalendarView::showIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         ShowIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 void CalendarView::editIncidenceDescription()
 { 
     mFlagEditDescription = true;
     editIncidence();
     mFlagEditDescription = false;
 }
 void CalendarView::editIncidence()
 {
     // qDebug("editIncidence() ");
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         EditIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 void CalendarView::deleteIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         deleteIncidence(incidence);
     }
 }
 
 void CalendarView::showIncidence(Incidence *incidence)
 {
     if ( incidence ) {
         ShowIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 void CalendarView::editIncidence(Incidence *incidence)
 { 
     if ( incidence ) {
        
         EditIncidenceVisitor v;
         v.act( incidence, this );
         
     }
 }
 
 void CalendarView::deleteIncidence(Incidence *incidence)
 {
     //qDebug(" CalendarView::deleteIncidence ");
     if ( incidence ) {
         DeleteIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 
 void CalendarView::lookForOutgoingMessages()
 {
     OutgoingDialog *ogd = mDialogManager->outgoingDialog();
     ogd->loadMessages();
 }
 
 void CalendarView::lookForIncomingMessages()
 {
     IncomingDialog *icd = mDialogManager->incomingDialog();
     icd->retrieve();
 }
 
 bool  CalendarView::removeCompletedSubTodos( Todo* t )
 {
     bool deleteTodo = true;
     QPtrList<Incidence> subTodos;
     Incidence *aTodo;
     subTodos = t->relations();
     for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) {
         if (! removeCompletedSubTodos( (Todo*) aTodo ))
             deleteTodo = false;
     }
     if ( deleteTodo ) {
         if ( t->isCompleted() ) {
             checkExternalId(  t );
             mCalendar->deleteTodo( t );
             changeTodoDisplay( t,KOGlobals::EVENTDELETED );
         }
         else
             deleteTodo = false;
     }
     return deleteTodo;
 
 }
 void CalendarView::purgeCompleted()
 {
     int result = KMessageBox::warningContinueCancel(this,
                                                     i18n("Delete all\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge"));
 
     if (result == KMessageBox::Continue) {
 
         QPtrList<Todo> todoCal;
         QPtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;
         Todo *aTodo;//, *rTodo;
         Incidence *rIncidence;
         bool childDelete = false;
         bool deletedOne = true;
         todoCal = calendar()->todos();
         for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) {
             if ( !aTodo->relatedTo() )
                 rootTodos.append( aTodo );
         }
         for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) {
             removeCompletedSubTodos( aTodo );
         }
 
         updateView();
     }
 }
 
 void CalendarView::slotCalendarChanged()
 {
    ; 
 }
 
 NavigatorBar *CalendarView::navigatorBar()
 {
     return mNavigatorBar;
 }
 
 
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug(" alendarView::keyPressEvent ");
     e->ignore();
 }
 
 
 bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 {
     // mSyncManager = manager;
-    mSyncKDE = false;
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
         qDebug("SyncKDE request detected!");
-        mSyncKDE = true;
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     return syncCalendar( filename, mode );
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
-    mSyncKDE = false;
     //mSyncManager = manager;
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     if ( resource == "sharp" )
         syncExternal( 0 );
     if ( resource == "phone" )
          syncExternal( 1 );  
     // pending setmodified
     return true;
 }
 void CalendarView::setSyncManager(KSyncManager* manager)
 {
    mSyncManager = manager;
 }
 
 void  CalendarView::removeSyncInfo( QString syncProfile) 
 {
     qDebug("removeSyncInfo for profile %s ", syncProfile.latin1());
     mCalendar->removeSyncInfo( syncProfile );
 
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index acc20d6..437a51c 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -300,307 +300,306 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void todoAdded(Todo *);
     void todoChanged(Todo *);
     void todoToBeDeleted(Todo *);
     void todoDeleted();
 
     void updateView(const QDate &start, const QDate &end);
     void updateView();
   
     /** Full update of visible todo views */
     void updateTodoViews();
 
     void updateUnmanagedViews();
   
     /** cut the current appointment to the clipboard */
     void edit_cut();
   
     /** copy the current appointment(s) to the clipboard */
     void edit_copy();
 
     /** paste the current vobject(s) in the clipboard buffer into calendar */
     void edit_paste();
   
     /** edit viewing and configuration options. */
     void edit_options();
     /**
       Functions for printing, previewing a print, and setting up printing
       parameters.
     */
     void print();
     void printSetup();
     void printPreview();
 
     /** Export as iCalendar file */
     void exportICalendar();
   
     /** Export as vCalendar file */
     bool exportVCalendar( QString fn);
   
     /** pop up a dialog to show an existing appointment. */
     void appointment_show();
     /**
      * pop up an Appointment Dialog to edit an existing appointment.	Get
      * information on the appointment from the list of unique IDs that is
      * currently in the View, called currIds.
      */
     void appointment_edit();
     /**
      * pop up dialog confirming deletion of currently selected event in the
      * View.
      */
     void appointment_delete();
 
     /** mails the currently selected event to a particular user as a vCalendar
       attachment. */
     void action_mail();
 
     /* frees a subtodo from it's relation */
     void todo_unsub( Todo * );
     void todo_resub( Todo * parent, Todo * sub );
 
     /** Take ownership of selected event. */
     void takeOverEvent();
 
     /** Take ownership of all events in calendar. */
     void takeOverCalendar();
   
     /** query whether or not the calendar is "dirty". */
     bool isModified();
     /** set the state of calendar. Modified means "dirty", i.e. needing a save. */
     void setModified(bool modified=true);
 
     /** query if the calendar is read-only. */
     bool isReadOnly();
     /** set state of calendar to read-only */
     void setReadOnly(bool readOnly=true);
 
     void eventUpdated(Incidence *);
 
     /* iTIP scheduling actions */
     void schedule_publish(Incidence *incidence = 0);
     void schedule_request(Incidence *incidence = 0);
     void schedule_refresh(Incidence *incidence = 0);
     void schedule_cancel(Incidence *incidence = 0);
     void schedule_add(Incidence *incidence = 0);
     void schedule_reply(Incidence *incidence = 0);
     void schedule_counter(Incidence *incidence = 0);
     void schedule_declinecounter(Incidence *incidence = 0);
     void schedule_publish_freebusy(int daysToPublish = 30);
 
     void openAddressbook();
 
     void editFilters();
     void toggleFilerEnabled();
     QPtrList<CalFilter> filters();
     void toggleFilter();
     void showFilter(bool visible);
     void updateFilter();
     void filterEdited();
     void selectFilter( int );
     KOFilterView *filterView();
 
     void showIntro();
 
     /** Move the curdatepient view date to today */
     void goToday();
 
     /** Move to the next date(s) in the current view */
     void goNext();
   
     /** Move to the previous date(s) in the current view */
     void goPrevious();
   /** Move to the next date(s) in the current view */
     void goNextMonth();
   
     /** Move to the previous date(s) in the current view */
     void goPreviousMonth();
 
     void toggleExpand();
     void toggleDateNavigatorWidget();
     void toggleAllDaySize();
     void dialogClosing(Incidence *);
   
     /** Look for new messages in the inbox */
     void lookForIncomingMessages();
    /** Look for new messages in the outbox */
     void lookForOutgoingMessages();
 
     void processMainViewSelection( Incidence * );
     void processTodoListSelection( Incidence * );
     
     void processIncidenceSelection( Incidence * );
 
     void purgeCompleted();
     bool removeCompletedSubTodos( Todo* );
     void slotCalendarChanged();
     bool importBday();
     bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
     bool importQtopia( const QString &categoriesFile,
                        const QString &datebookFile,
                        const QString &tasklistFile );
     void syncExternal( int mode );
     void slotSelectPickerDate( QDate ) ;
     void showDatePicker( ) ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
   protected slots:
     void timerAlarm();
     void suspendAlarm();
     void beamDone( Ir *ir );
     /** Select a view or adapt the current view to display the specified dates. */
     void showDates( const KCal::DateList & );
     void selectWeekNum ( int );
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified(); 
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
 
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     void setSyncManager(KSyncManager* manager);
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
     bool checkFileChanged(QString fn);
     Event* getLastSyncEvent();
     /** Adapt navigation units correpsonding to step size of navigation of the
      * current view.
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete();
     void showEventEditor();
     void showTodoEditor();
     void writeLocale();
     Todo *selectedTodo();
 
   private:
-    bool mSyncKDE;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;
     QString mSuspendAlarmNotification;
     QTimer* mSuspendTimer;
     QTimer* mAlarmTimer;
     QTimer* mRecheckAlarmTimer;
     void computeAlarm( QString );
     void startAlarm( QString, QString );
     void setSyncEventsReadOnly();
     
     QDateTime loadedFileVersion;
     void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
     QString  mCurrentSyncName;
     KOBeamPrefs* beamDialog;
     void init();
     int mDatePickerMode;
     bool mFlagEditDescription;
     QDateTime mLastCalendarSync;
     void createPrinter();
 
     void calendarModified( bool, Calendar * );
 
     CalPrinter *mCalPrinter;
 
     QSplitter    *mPanner;
     QSplitter    *mLeftSplitter;
     QWidget      *mLeftFrame;
     QWidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
     QVBox* mDateFrame;
     NavigatorBar *mNavigatorBar;
 
     KDateNavigator *mDateNavigator;       // widget showing small month view.
 
     KOFilterView *mFilterView;
 
     ResourceView *mResourceView;
 
     // calendar object for this viewing instance
     Calendar      *mCalendar;
 
     CalendarResourceManager *mResourceManager;
 
     FileStorage *mStorage;
 
     DateNavigator *mNavigator;
 
     KOViewManager *mViewManager;
     KODialogManager *mDialogManager;
 
     // Calendar filters
     QPtrList<CalFilter> mFilters;
 
     // various housekeeping variables.
     bool            mModified;	   // flag indicating if calendar is modified
     bool            mReadOnly; // flag indicating if calendar is read-only
     QDate mSaveSingleDate;
 
     Incidence *mSelectedIncidence;
     Incidence *mMoveIncidence;
     KOTodoView *mTodoList;
     KOEventEditor * mEventEditor;
     KOTodoEditor  * mTodoEditor;
     KOEventViewerDialog * mEventViewerDialog;
     void keyPressEvent ( QKeyEvent *e) ;
     //QMap<Incidence*,KOIncidenceEditor*> mDialogList;
 };
 
 
 class CalendarViewVisitor : public Incidence::Visitor
 {
   public:
     CalendarViewVisitor() : mView( 0 ) {}
 
     bool act( Incidence *incidence, CalendarView *view )
     {
       mView = view;
       return incidence->accept( *this );
     }
     
   protected:
     CalendarView *mView;
 };
 
 class ShowIncidenceVisitor : public CalendarViewVisitor
 {
   protected:
     bool visit( Event *event ) { mView->showEvent( event ); return true; }  
     bool visit( Todo *todo ) { mView->showTodo( todo ); return true; }  
     bool visit( Journal * j ) { mView->showJournal( j );return true; }
 };
 
 class EditIncidenceVisitor : public CalendarViewVisitor
 {
   protected:
     bool visit( Event *event ) { mView->editEvent( event ); return true; }  
     bool visit( Todo *todo ) { mView->editTodo( todo ); return true; }  
     bool visit( Journal *j ) {  mView->editJournal( j); return true; }
 };
 
 class DeleteIncidenceVisitor : public CalendarViewVisitor
 {
   protected:
     bool visit( Event *event ) { mView->deleteEvent( event ); return true; }  
     bool visit( Todo *todo ) { mView->deleteTodo( todo ); return true; }  
     bool visit( Journal * j) {mView->deleteJournal( j ); return true; }
 };
 
 #endif
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index e09050e..17e6c75 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1,445 +1,447 @@
 /*
   This file is part of KDE-Pim/Pi.
   Copyright (c) 2004 Ulf Schenk
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License as published by the Free Software Foundation; either
   version 2 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
 
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 
 // $Id$
 
 #include "ksyncmanager.h"
 
 #include <stdlib.h>
 
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 
 #include "ksyncprofile.h"
 #include "ksyncprefsdialog.h"
 #include "kpimprefs.h"
 #include <kmessagebox.h>
 
 #include <qdir.h>
 #include <qprogressbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
 QDateTime KSyncManager::mRequestedSyncEvent;
 
 
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
     : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
 {
     mServerSocket = 0;
     bar = new QProgressBar ( 1, 0 );
     bar->setCaption ("");
     
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( mPrefs->mPassiveSyncAutoStart )
       enableQuick( false );
 
 }
 
 KSyncManager::~KSyncManager()
 {
     delete bar;
 }
 
 
 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 ) {
         mSyncMenu->insertItem(  prof[i], 1000+i ); 
         clearMenu->insertItem(  prof[i], 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("syncaction %d ", action);
     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( );
    
     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("KSyncManager::slotSyncMenu: invalid apptype selected");
                     break;
 	      
                 }
         } else {
             if (  temp->getIsPhoneSync() ) {
                 mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPhoneConnection = temp->getPhoneConnection( );
                 mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else if (  temp->getIsPiSync() ) {
                 if ( mTargetApp == KAPI ) {
                     mPassWordPiSync = temp->getRemotePwAB();
                     mActiveSyncPort = temp->getRemotePortAB();
                     mActiveSyncIP = temp->getRemoteIPAB();
                 } else if ( mTargetApp == KOPI ) {
                     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)").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 );
 #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 );
 
         dia.setFixedSize( 230,120 );
         dia.setCaption( i18n("Enter port for Pi-Sync") );
         QPushButton pb ( "OK",  &dia);
         lay.addWidget( &pb );
         connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
         dia.show();
         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_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         KMessageBox::information( 0, i18n("No valid port"));
         return;
     }
     //qDebug("port %d ", port);
     mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
     mServerSocket->setFileName( defaultFileName() );
     //qDebug("connected ");
     if ( !mServerSocket->ok() ) {
         KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!"));
         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 ) ) );
 }
 
 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("KSyncManager::syncLocalFile: invalid apptype selected");
             break;
 	      
         }
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
     if ( fn == "" )
         return;
     if (  syncWithFile(  fn, false ) ) {
         qDebug("syncLocalFile() successful ");
     }
 
@@ -693,389 +695,407 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 
 
     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 fileSize = 0;
     int result = system ( preCommand );
     // 0 : okay
     // 256: no such file or dir
     //
     qDebug("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("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:"), &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();
         mActiveSyncPort = le3.text();
         mActiveSyncIP = le2.text();
         return true;
     }
     return false;
 }
 bool KSyncManager::edit_sync_options()
 {
 
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
     QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
     QVBoxLayout lay ( &dia );
     lay.setSpacing( 2 );
     lay.setMargin( 3 );
     lay.addWidget(&gr);
     QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
     QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
     QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
     QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
     QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
     QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
     //QRadioButton both( i18n("Take both on conflict"), &gr );
     QPushButton pb ( "OK",  &dia); 
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
     switch ( mSyncAlgoPrefs ) {
     case 0:
         loc.setChecked( true);
         break;
     case 1:
         rem.setChecked( true );
         break;
     case 2:
         newest.setChecked( true);
         break;
     case 3:
         ask.setChecked( true);
         break;
     case 4:
         f_loc.setChecked( true);
         break;
     case 5:
         f_rem.setChecked( true);
         break;
     case 6:
         // both.setChecked( true);
         break; 
     default:
         break;
     }
     if ( dia.exec() ) {
         mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
         return true;
     }
     return false;
 }
 
 QString  KSyncManager::getPassword( )
 {
     QString retfile = "";
     QDialog dia ( mParent, "input-dialog", true );
     QLineEdit lab ( &dia );
     lab.setEchoMode( QLineEdit::Password );
     QVBoxLayout lay( &dia );
     lay.setMargin(7);
     lay.setSpacing(7);
     lay.addWidget( &lab);
     dia.setFixedSize( 230,50 );
     dia.setCaption( i18n("Enter password") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     int res = dia.exec();
     if ( res )
         retfile = lab.text();
     dia.hide();
     qApp->processEvents();
     return retfile;
 
 }
 
 
 void KSyncManager::confSync()
 { 
     static KSyncPrefsDialog* sp = 0;
     if ( ! sp ) {
         sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
     }
     sp->usrReadConfig();
 #ifndef DESKTOP_VERSION
     sp->showMaximized();
 #else
     sp->show();
 #endif
     sp->exec();
     QStringList oldSyncProfileNames = mSyncProfileNames;
     mSyncProfileNames = sp->getSyncProfileNames();
     mLocalMachineName = sp->getLocalMachineName ();
     int ii;
     for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) {
         if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) )
             mImplementation->removeSyncInfo( oldSyncProfileNames[ii]  );
     }
     QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
 }
 void KSyncManager::syncKDE()
 {
+    mSyncWithDesktop = true;
     emit save();
     switch(mTargetApp)
         {
         case (KAPI):
+            {
+#ifdef DESKTOP_VERSION
+                QString command = qApp->applicationDirPath () + "/kdeabdump"; 
+#else
+                QString command = "kdeabdump"; 
+#endif
+                if ( ! QFile::exists ( command ) )
+                    command = "kdeabdump";  
+                QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf";
+                system (  command.latin1());
+                    if ( syncWithFile( fileName,true ) ) {
+                        if ( mWriteBackFile ) {
+                            command += " --read";
+                            system (  command.latin1());
+                        }
+                    }
 
+            }
             break;
         case (KOPI):
             {
 #ifdef DESKTOP_VERSION
                 QString command = qApp->applicationDirPath () + "/kdecaldump"; 
 #else
                 QString command = "kdecaldump"; 
 #endif
                 if ( ! QFile::exists ( command ) )
                     command = "kdecaldump";  
                 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
                 system (  command.latin1());
                     if ( syncWithFile( fileName,true ) ) {
                         if ( mWriteBackFile ) {
                             command += " --read";
                             system (  command.latin1());
                         }
                     }
                 
             }
             break;
         case (PWMPI):
 
             break;
         default:
             qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
             break;
 	      
         }
 }
 
 void KSyncManager::syncSharp()
 {
 
     if ( ! syncExternalApplication("sharp") )
         qDebug("ERROR sync sharp  ");
 }
 
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
    
     emit save();
 
     if ( mAskForPreferences )  
         if ( !edit_sync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
             return false;
         }
 
     qDebug("Sync extern %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
 
     return syncOK;
 
 }
 
 void KSyncManager::syncPhone()
 {
 
     syncExternalApplication("phone");
 
 }
 
 void KSyncManager::showProgressBar(int percentage, QString caption, int total)
 {
     if (!bar->isVisible())
         {
             bar->setCaption (caption); 
             bar->setTotalSteps (  total  ) ;
 
             bar->show();
         }
 
     bar->setProgress( percentage );
 }
 
 void KSyncManager::hideProgressBar()
 {
     bar->hide();
 }
 
 bool KSyncManager::isProgressBarCanceled()
 {
     return !bar->isVisible();
 }
 
 QString KSyncManager::syncFileName()
 {
 
     QString fn = "tempfile";
     switch(mTargetApp)
         {
         case (KAPI):
             fn = "tempsyncab.vcf";
             break;
         case (KOPI):
             fn = "tempsynccal.ics";
             break;
         case (PWMPI):
             fn = "tempsyncpw.pwm";
             break;
         default:
             break;
         }
 #ifdef _WIN32_
     return  locateLocal( "tmp", fn );
 #else
     return (QString( "/tmp/" )+ fn );
 #endif
 }
 
 void KSyncManager::syncPi()
 {
     mPisyncFinished = false;
     qApp->processEvents();
     if ( mAskForPreferences )
         if ( !edit_pisync_options()) {
             mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
             return;
         }
     bool ok;
     Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
     mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     //enum { success, errorW, errorR, quiet };
     if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) {
         mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         delete s;
         if ( state == KCommandSocket::errorR ) {
             KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
             connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
             commandSocket->sendStop();
         }
         mPisyncFinished = true;
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
         mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
         mPisyncFinished = true;
 
     } else  if ( state == KCommandSocket::successR ) {
         QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
 
     } else  if ( state == KCommandSocket::successW ) {
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
         mPisyncFinished = true;
     }
 
     delete s;
 }
 
 void KSyncManager::readFileFromSocket()
 {
     QString fileName = syncFileName();
     mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
         mPisyncFinished = true;
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
     if ( mWriteBackFile ) 
         commandSocket->writeFile(  fileName );
     else {
         commandSocket->sendStop();
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
         mPisyncFinished = true;
     }
 }
 
 KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
 {
     mPassWord = pw;
     mSocket = 0;
     mSyncActionDialog = 0;
     blockRC = false;
 };
 
 void KServerSocket::newConnection ( int socket ) 
 {
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 2af891b..6da0ee4 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -1,214 +1,216 @@
 /*
   This file is part of KDE-Pim/Pi.
   Copyright (c) 2004 Ulf Schenk
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License as published by the Free Software Foundation; either
   version 2 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
 
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 
   $Id$
 */
 #ifndef _KSYNCMANAGER_H
 #define _KSYNCMANAGER_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qsocket.h>
 #include <qdatetime.h>
 #include <qserversocket.h> 
 #include <qtextstream.h>
 #include <qregexp.h>
 
 class QPopupMenu;
 class KSyncProfile;
 class KPimPrefs;
 class QWidget;
 class KSyncManager;
 class KSyncInterface;
 class QProgressBar;
 
 
 class KServerSocket : public QServerSocket
 {
     Q_OBJECT
 
         public:
     KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
 
     void newConnection ( int socket ) ;
     void setFileName( QString fn  ) {mFileName = fn;};
  signals:
     void file_received( bool );
     void request_file();
     void saveFile();
     void endConnect();
     private slots:
     void discardClient();
     void readClient();
     void readBackFileFromSocket();
  private :
     bool blockRC;
     void send_file();
     void get_file();
     void end_connect();
     QDialog* mSyncActionDialog;
     QSocket* mSocket; 
     QString mPassWord;
     QString mFileName; 
     QTime piTime;
     QString piFileString;
 };
 
 class KCommandSocket : public QObject
 {
     Q_OBJECT
         public:
     enum state { successR, errorR, successW, errorW, errorTO, quiet };
     KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
     void readFile( QString );
     void writeFile( QString );
     void sendStop();
        
  signals:
     void commandFinished( KCommandSocket*, int );
     private slots:
     void startReadFileFromSocket();
     void readFileFromSocket();
     void deleteSocket();
     void writeFileToSocket();
  private :
     QSocket* mSocket; 
     QString mPassWord;
     Q_UINT16 mPort;
     QString mHost;
     QString mFileName;
     QTimer* mTimerSocket;
     int mRetVal;
     QTime mTime;
     QString mFileString;
     bool mFirst;
 };
 
 
 class KSyncManager : public QObject
 {
     Q_OBJECT
 
         public:
     enum TargetApp {
         KOPI = 0,
         KAPI = 1,
         PWMPI = 2 };
   
     KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
     ~KSyncManager() ;
 
     void multiSync( bool askforPrefs  );
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
     void setDefaultFileName( QString s) { mDefFileName = s ;}
     QString defaultFileName() { return mDefFileName ;}
     QString syncFileName();
     void enableQuick( bool ask = true);
 
+    bool syncWithDesktop () { return mSyncWithDesktop;}
     QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
     void showProgressBar(int percentage, QString caption = QString::null, int total=100);
     void hideProgressBar();
     bool isProgressBarCanceled();
 
     // sync stuff
     QString mLocalMachineName;
     QStringList  mExternSyncProfiles;
     QStringList  mSyncProfileNames;
     bool mAskForPreferences;
     bool mShowSyncSummary;
     bool mIsKapiFile;
     bool mWriteBackExistingOnly;
     int mSyncAlgoPrefs;
     bool mWriteBackFile;
     int  mWriteBackInFuture;
     QString mPhoneDevice;
     QString mPhoneConnection;
     QString mPhoneModel;
     QString mPassWordPiSync;
     QString mActiveSyncPort;
     QString mActiveSyncIP ;
     static QDateTime mRequestedSyncEvent;
 
  signals:
     void save();
     void request_file();
     void getFile( bool );
 
     public slots:
     void slotSyncMenu( int );
     void slotClearMenu( int action );
     void deleteCommandSocket(KCommandSocket*s, int state);
     void readFileFromSocket();
     void fillSyncMenu();
 
  private:
     void syncPi();
     KServerSocket * mServerSocket;
     KPimPrefs* mPrefs;
     QString mDefFileName;
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;
     void quickSyncLocalFile();
     bool syncWithFile( QString fn , bool quick );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
     void syncKDE();
     bool syncExternalApplication(QString);
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     bool edit_sync_options();
     bool edit_pisync_options();
     int ringSync();
     QString  getPassword( );
     bool mPisyncFinished;
     bool mBlockSaveFlag;
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
     QPopupMenu* mSyncMenu;
     QProgressBar* bar;
+    bool mSyncWithDesktop;
 
 private slots:
     void confSync();
 
 
 };
 
 
 class KSyncInterface 
 { 
  public :
     virtual void removeSyncInfo( QString syncProfile) = 0;
     virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
     virtual bool syncExternal(KSyncManager* manager, QString resource)
     {
         // empty implementation, because some syncable applications do not 
         // have an external(sharpdtm)  syncmode, like pwmanager.
         return false;
     }
 
    
 };
 
 
 #endif