moved sync related progressbar management to ksyncmanager, and proceeded with

the sync implementation of pwmanager

7 files changed, 318 insertions, 55 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f222234..f8359de 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -569,1027 +569,1028 @@ void KABCore::mailVCard( const QStringList& uids )
 
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t << vcard;
 
       outFile.close();
 
       urls.append( fileName );
     }
   }
 
   bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
 
 
 /*US
   kapp->invokeMailer( QString::null, QString::null, QString::null,
                       QString::null,  // subject
                       QString::null,  // body
                       QString::null,
                       urls );  // attachments
 */
 
 }
 
 /**
   Beams the "WhoAmI contact.
 */
 void KABCore::beamMySelf()
 {
   KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
   if (!a.isEmpty())
   {
     QStringList uids;
     uids << a.uid();
 
 	beamVCard(uids);
   } else {
       KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) );
 
 
   }
 }
 
 void KABCore::beamVCard()
 {
   QStringList uids = mViewManager->selectedUids();
   if ( !uids.isEmpty() )
     beamVCard( uids );
 }
 
 
 void KABCore::beamVCard(const QStringList& uids)
 {
 /*US
 	QString beamFilename;
 	Opie::OPimContact c;
 	if ( actionPersonal->isOn() ) {
 		beamFilename = addressbookPersonalVCardName();
 		if ( !QFile::exists( beamFilename ) )
 			return; // can't beam a non-existent file
 		Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
 											beamFilename );
 		Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 		Opie::OPimContactAccess::List allList = access->allRecords();
 		Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
 		c = *it;
 
 		delete access;
 	} else {
 		unlink( beamfile ); // delete if exists
 		mkdir("/tmp/obex/", 0755);
 		c = m_abView -> currentEntry();
 		Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
 											beamfile );
 		Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 		access->add( c );
 		access->save();
 		delete access;
 
 		beamFilename = beamfile;
 	}
 
 	owarn << "Beaming: " << beamFilename << oendl;
 */
 
 #if 0
   QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
 
   QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
 
   QString name = "contact.vcf";
 
   QString fileName = dirName + "/" + name;
 #endif
   // LR: we should use the /tmp dir, because: /tmp = RAM, (HOME)/kdepim = flash memory
   //
   QString fileName = "/tmp/kapibeamfile.vcf";
 
 
   //QDir().mkdir( dirName, true );
 
  
   KABC::VCardConverter converter;
   QString description;
   QString datastream;
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
           continue;
 
       if (description.isEmpty())
           description = a.formattedName();
 
       QString vcard;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           datastream +=vcard.mid( start, next - start);
           datastream +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       datastream += vcard.mid( start,vcard.length() );
   }
 #ifndef DESKTOP_VERSION
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t <<datastream;
       outFile.close();
       Ir *ir = new Ir( this );
       connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
       ir->send( fileName, description, "text/x-vCard" );
   } else {
       qDebug("Error open temp  beam file ");
       return;
   }
 #endif
 
 }
 
 void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
   delete ir;
 #endif
 }
 
 
 void KABCore::browse( const QString& url )
 {
 #ifndef KAB_EMBEDDED
   kapp->invokeBrowser( url );
 #else //KAB_EMBEDDED
   qDebug("KABCore::browse must be fixed");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::selectAllContacts()
 {
   mViewManager->setSelected( QString::null, true );
 }
 
 void KABCore::deleteContacts()
 {
   QStringList uidList = mViewManager->selectedUids();
   deleteContacts( uidList );
 }
 
 void KABCore::deleteContacts( const QStringList &uids )
 {
   if ( uids.count() > 0 ) {
     PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids );
     UndoStack::instance()->push( command );
     RedoStack::instance()->clear();
 
     // now if we deleted anything, refresh
     setContactSelected( QString::null );
     setModified( true );
   }
 }
 
 void KABCore::copyContacts()
 {
   KABC::Addressee::List addrList = mViewManager->selectedAddressees();
 
   QString clipText = AddresseeUtil::addresseesToClipboard( addrList );
 
   kdDebug(5720) << "KABCore::copyContacts: " << clipText << endl;
 
   QClipboard *cb = QApplication::clipboard();
   cb->setText( clipText );
 }
 
 void KABCore::cutContacts()
 {
   QStringList uidList = mViewManager->selectedUids();
 
 //US  if ( uidList.size() > 0 ) {
   if ( uidList.count() > 0 ) {
     PwCutCommand *command = new PwCutCommand( mAddressBook, uidList );
     UndoStack::instance()->push( command );
     RedoStack::instance()->clear();
 
     setModified( true );
   }
 }
 
 void KABCore::pasteContacts()
 {
   QClipboard *cb = QApplication::clipboard();
 
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
 
   pasteContacts( list );
 }
 
 void KABCore::pasteContacts( KABC::Addressee::List &list  )
 {
   KABC::Resource *resource = requestResource( this );
   KABC::Addressee::List::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it )
     (*it).setResource( resource );
 
   PwPasteCommand *command = new PwPasteCommand( this, list );
   UndoStack::instance()->push( command );
   RedoStack::instance()->clear();
 
   setModified( true );
 }
 
 void KABCore::setWhoAmI()
 {
   KABC::Addressee::List addrList = mViewManager->selectedAddressees();
 
   if ( addrList.count() > 1 ) {
     KMessageBox::sorry( this, i18n( "Please select only one contact." ) );
     return;
   }
 
   QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
   if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes )
     static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] );
 }
 
 void KABCore::setCategories()
 {
   KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
   if ( !dlg.exec() )
     return;
 
   bool merge = false;
   QString msg = i18n( "Merge with existing categories?" );
   if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes )
     merge = true;
 
   QStringList categories = dlg.selectedCategories();
 
   QStringList uids = mViewManager->selectedUids();
   QStringList::Iterator it;
   for ( it = uids.begin(); it != uids.end(); ++it ) {
     KABC::Addressee addr = mAddressBook->findByUid( *it );
     if ( !addr.isEmpty() ) {
       if ( !merge )
         addr.setCategories( categories );
       else {
         QStringList addrCategories = addr.categories();
         QStringList::Iterator catIt;
         for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
           if ( !addrCategories.contains( *catIt ) )
             addrCategories.append( *catIt );
         }
         addr.setCategories( addrCategories );
       }
 
       mAddressBook->insertAddressee( addr );
     }
   }
 
   if ( uids.count() > 0 )
     setModified( true );
 }
 
 void KABCore::setSearchFields( const KABC::Field::List &fields )
 {
   mIncSearchWidget->setFields( fields );
 }
 
 void KABCore::incrementalSearch( const QString& text )
 {
     mViewManager->doSearch( text, mIncSearchWidget->currentField() );
 }
 
 void KABCore::setModified()
 {
   setModified( true );
 }
 
 void KABCore::setModifiedWOrefresh()
 {
     // qDebug("KABCore::setModifiedWOrefresh() ");
     mModified = true;
     mActionSave->setEnabled( mModified );
 #ifdef DESKTOP_VERSION
   mDetails->refreshView();
 #endif
 
 }
 void KABCore::setModified( bool modified )
 {
   mModified = modified;
   mActionSave->setEnabled( mModified );
 
   if ( modified )
     mJumpButtonBar->recreateButtons();
 
   mViewManager->refreshView();
   mDetails->refreshView();
 
 }
 
 bool KABCore::modified() const
 {
   return mModified;
 }
 
 void KABCore::contactModified( const KABC::Addressee &addr )
 {
 
   Command *command = 0;
   QString uid;
 
   // check if it exists already
   KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
   if ( origAddr.isEmpty() )
     command = new PwNewCommand( mAddressBook, addr );
   else {
     command = new PwEditCommand( mAddressBook, origAddr, addr );
     uid = addr.uid();
   }
 
   UndoStack::instance()->push( command );
   RedoStack::instance()->clear();
 
   setModified( true );
 }
 
 void KABCore::newContact()
 {
 
 
   QPtrList<KABC::Resource> kabcResources = mAddressBook->resources();
 
   QPtrList<KRES::Resource> kresResources;
   QPtrListIterator<KABC::Resource> it( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = it.current() ) != 0 ) {
     ++it;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
         kresResources.append( res );
     }
   }
 
   KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this );
   resource = static_cast<KABC::Resource*>( res );
 
   if ( resource ) {
     KABC::Addressee addr;
     addr.setResource( resource );
     mEditorDialog->setAddressee( addr );
     KApplication::execDialog ( mEditorDialog );
 
   } else
     return;
 
   // mEditorDict.insert( dialog->addressee().uid(), dialog );
 
 
 }
 
 void KABCore::addEmail( QString aStr )
 {
 #ifndef KAB_EMBEDDED
   QString fullName, email;
 
   KABC::Addressee::parseEmailAddress( aStr, fullName, email );
 
   // Try to lookup the addressee matching the email address
   bool found = false;
   QStringList emailList;
   KABC::AddressBook::Iterator it;
   for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) {
     emailList = (*it).emails();
     if ( emailList.contains( email ) > 0 ) {
       found = true;
       (*it).setNameFromString( fullName );
       editContact( (*it).uid() );
     }
   }
 
   if ( !found ) {
     KABC::Addressee addr;
     addr.setNameFromString( fullName );
     addr.insertEmail( email, true );
 
     mAddressBook->insertAddressee( addr );
     mViewManager->refreshView( addr.uid() );
     editContact( addr.uid() );
   }
 #else //KAB_EMBEDDED
   qDebug("KABCore::addEmail finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::importVCard( const KURL &url, bool showPreview )
 {
   mXXPortManager->importVCard( url, showPreview );
 }
 void KABCore::importFromOL()
 {
 #ifdef _WIN32_
   KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
   idgl->exec();
   KABC::Addressee::List list = idgl->getAddressList();
   if ( list.count() > 0 ) {
     KABC::Addressee::List listNew;
     KABC::Addressee::List listExisting;
     KABC::Addressee::List::Iterator it;
     KABC::AddressBook::Iterator iter;
     for ( it = list.begin(); it != list.end(); ++it ) {
       if ( mAddressBook->findByUid((*it).uid() ).isEmpty())
 	listNew.append( (*it) );
       else
 	listExisting.append( (*it) );
     }
     if ( listExisting.count()  > 0 )
       KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
     if ( listNew.count() > 0 ) {
       pasteWithNewUid = false;
       pasteContacts( listNew );
       pasteWithNewUid = true;
     }
   }
   delete idgl;
 #endif
 }
 
 void KABCore::importVCard( const QString &vCard, bool showPreview )
 {
   mXXPortManager->importVCard( vCard, showPreview );
 }
 
 //US added a second method without defaultparameter
 void KABCore::editContact2() {
   editContact( QString::null );
 }
 
 void KABCore::editContact( const QString &uid )
 {
 
   if ( mExtensionManager->isQuickEditVisible() )
     return;
 
   // First, locate the contact entry
   QString localUID = uid;
   if ( localUID.isNull() ) {
     QStringList uidList = mViewManager->selectedUids();
     if ( uidList.count() > 0 )
       localUID = *( uidList.at( 0 ) );
   }
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
       mEditorDialog->setAddressee( addr );
       KApplication::execDialog ( mEditorDialog );
   }
 }
 
 /**
   Shows or edits the detail view for the given uid. If the uid is QString::null,
   the method will try to find a selected addressee in the view.
  */
 void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
 {
   if ( mMultipleViewsAtOnce )
   {
     editContact( uid );
   }
   else
   {
     setDetailsVisible( true );
     mActionDetails->setChecked(true);
   }
 
 }
 
 void KABCore::save()
 {
      if (syncManager->blockSave())
         return;
-    syncManager->setBlockSave(true);
     if ( !mModified )
         return;
+
+    syncManager->setBlockSave(true);
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
     "not using it. " );
    statusMessage(i18n("Saving addressbook ... "));
 #ifndef KAB_EMBEDDED
   KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
   if ( !b || !b->save() ) {
     KMessageBox::error( this, text, i18n( "Unable to Save" ) );
   }
 #else //KAB_EMBEDDED
   KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
   if ( !b || !b->save() ) {
     QMessageBox::critical( this, i18n( "Unable to Save" ), text,  i18n("Ok"));
   }
 #endif //KAB_EMBEDDED
 
   statusMessage(i18n("Addressbook saved!"));
   setModified( false );
   syncManager->setBlockSave(false);
 }
 
 void KABCore::statusMessage(QString mess , int time )
 {
     //topLevelWidget()->setCaption( mess );
     // pending setting timer to revome message
 }
 void KABCore::undo()
 {
   UndoStack::instance()->undo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::redo()
 {
   RedoStack::instance()->redo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mJumpButtonBar->show();
     else
       mJumpButtonBar->hide();
   }
   else
   {
 	// show the jumpbar only if "the details are hidden" == "viewmanager are shown"
     if (mViewManager->isVisible())
     {
       if ( visible )
         mJumpButtonBar->show();
       else
         mJumpButtonBar->hide();
 	}
 	else
 	{
       mJumpButtonBar->hide();
 	}
   }
 }
 
 
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
 }
 
 
 
 void KABCore::setDetailsVisible( bool visible )
 {
   if (visible && mDetails->isHidden())
   {
     KABC::Addressee::List addrList = mViewManager->selectedAddressees();
     if ( addrList.count() > 0 )
       mDetails->setAddressee( addrList[ 0 ] );
   }
 
   // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
   // the listview and the detailview. We do that by changing the splitbar size.
   if (mMultipleViewsAtOnce)
   {
     if ( visible )
       mDetails->show();
     else
       mDetails->hide();
   }
   else
   {
     if ( visible ) {
       mViewManager->hide();
       mDetails->show();
     }
     else {
       mViewManager->show();
       mDetails->hide();
     }
     setJumpButtonBarVisible( !visible );
   }
 
 }
 
 void KABCore::extensionChanged( int id )
 {
   //change the details view only for non desktop systems
 #ifndef DESKTOP_VERSION
 
   if (id == 0)
   {
     //the user disabled the extension.
 
     if (mMultipleViewsAtOnce)
     { // enable detailsview again
       setDetailsVisible( true );
       mActionDetails->setChecked( true );
     }
     else
     {  //go back to the listview
       setDetailsVisible( false );
       mActionDetails->setChecked( false );
       mActionDetails->setEnabled(true);
 	}
 
   }
   else
   {
     //the user enabled the extension.
     setDetailsVisible( false );
     mActionDetails->setChecked( false );
 
     if (!mMultipleViewsAtOnce)
     {
       mActionDetails->setEnabled(false);
 	}
 
     mExtensionManager->setSelectionChanged();
 
   }
 
 #endif// DESKTOP_VERSION
 
 }
 
 
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
 
   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." );
       KMessageBox::information( this, text );
     }
     QString currentuid = mEditorDialog->addressee().uid();
     mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
   }
   mViewManager->refreshView();
 //  mDetails->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) ;
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
   topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
   syncMenu = new QPopupMenu( this );
   changeMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
 
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   syncManager->setBlockSave(false);
 
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
   if ( mIsPart ) {
     mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this,
                                SLOT( sendMail() ), actionCollection(),
                                "kaddressbook_mail" );
     mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this,
                  SLOT( print() ), actionCollection(), "kaddressbook_print" );
 
   } else {
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
   }
 
 
@@ -1825,845 +1826,837 @@ void KABCore::addActionsManually()
   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 ) {
     mActionConfigShortcuts->plug( settingsMenu );
     mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     mActionKeyBindings->plug( settingsMenu );
   }
 
   settingsMenu->insertSeparator();
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
   if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
     mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
 
   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 );
       }
   }
   //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
 
  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 ) {
         PhoneNumber::List phoneNumbers = (*it).phoneNumbers();
         PhoneNumber::List::Iterator phoneIt;
         bool found = false;
         for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) {
             if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
                 if ((*phoneIt).type() - PhoneNumber::Voice ) {
                     (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
                     (*it).insertPhoneNumber( (*phoneIt) );
                     found = true;
                 }
             }
 
         }
         if ( found )
             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 other apps to show details of a contact.
  */
 void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
 {
     qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
 
     QString foundUid = QString::null;
     if ( ! uid.isEmpty() ) {
         Addressee adrr = mAddressBook->findByUid( uid );
         if (  !adrr.isEmpty() ) {
             foundUid = uid;
         }
             if ( email == "sendbacklist" ) {
                 //qDebug("ssssssssssssssssssssssend ");
                 QStringList nameList;
                 QStringList emailList;
                 QStringList uidList;
                 nameList.append(adrr.realName());
                 emailList = adrr.emails();
                 uidList.append( adrr.preferredEmail());
                 bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
                 return;
             }
         
     }
   
   if ( email == "sendbacklist" ) 
       return;
   if (foundUid.isEmpty())
   {
     //find the uid of the person first
     Addressee::List namelist;
     Addressee::List emaillist;
 
     if (!name.isEmpty())
       namelist = mAddressBook->findByName( name );
 
     if (!email.isEmpty())
       emaillist = mAddressBook->findByEmail( email );
     qDebug("count %d %d ",  namelist.count(),emaillist.count() );
     //check if we have a match in Namelist and Emaillist
     if ((namelist.count() == 0) && (emaillist.count() > 0)) {
       foundUid = emaillist[0].uid();
     }
     else if ((namelist.count() > 0) && (emaillist.count() == 0))
       foundUid = namelist[0].uid();
     else
     {
       for (int i = 0; i < namelist.count(); i++)
       {
         for (int j = 0; j < emaillist.count(); j++)
         {
           if (namelist[i] == emaillist[j])
           {
             foundUid = namelist[i].uid();
           }
         }
       }
     }
   }
   else
   {
     foundUid = uid;
   }
 
   if (!foundUid.isEmpty())
   {
    
     // raise Ka/Pi if it is in the background
 #ifndef DESKTOP_VERSION
 #ifndef KORG_NODCOP
       //QCopEnvelope e("QPE/Application/kapi", "raise()");
 #endif
 #endif
     
     mMainWindow->showMaximized();
     mMainWindow-> raise();
 
     mViewManager->setSelected( "", false);
     mViewManager->refreshView( "" );
     mViewManager->setSelected( foundUid, true );
     mViewManager->refreshView( foundUid );
 
     if ( !mMultipleViewsAtOnce )
     {
       setDetailsVisible( true );
       mActionDetails->setChecked(true);
     }
   }
 }
 
 
 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;;
     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;
-    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();
+
+    syncManager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
+
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( incCounter < er.count()) {
-        if ( ! bar.isVisible() )
+	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
-            bar.setProgress( incCounter );
+	  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 ( 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 );
                         } 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;
-    bar.setCaption (i18n("Add / remove addressees") ); 
-    bar.setTotalSteps (  el.count()  ) ;
-    bar.show();
+
+    syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count());
     incCounter = 0;
     while ( incCounter < el.count()) {
         qApp->processEvents();
-        if ( ! bar.isVisible() )
+	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
-            bar.setProgress( incCounter );
+	  syncManager->showProgressBar(incCounter);
         uid = el[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
             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 ( ! KABPrefs::instance()->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 ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
                             ++addedAddresseeR; 
                             inL.setRevision( modifiedCalendar );
                             local->insertAddressee( inL, false );
                             inR = inL;
                             inR.setResource( 0 );
                             remote->insertAddressee( inR, false );
                         }
                     }
                 }
             }
         }
         ++incCounter;
     }
     el.clear();
-    bar.hide();
+    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 ( KABPrefs::instance()->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 );
         } else {
             Addressee lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
             if ( ! lse.isEmpty() ) {
                 if ( lse.familyName().left(4) == "!E: " )
                     external = true;
             } else {
                 bool found = false;
                 AddressBook::Iterator it;
                 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                     if ( (*it).revision().date().year() > 2003 ) {
                         found = true;
                         break;
                     }
                 }
                 external = ! found;
             }
 
             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 ( KABPrefs::instance()->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("Saving remote AB ");
                     abLocal.saveAB();
                     if ( isXML ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
                     }
                 }
         }
         setModified();
         
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 #if 0
 
     if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                 storage->save();
             }
         }
         setModified();
     }
   
 #endif
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     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 );
 	qDebug("KABCore::syncExternal: why do we acces here KABPrefs and not somehow KSyncProfile? ");
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, KABPrefs::instance()->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( KABPrefs::instance()->mWriteBackFile ) {
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 
 //called by the syncmanager to indicate that the work has to marked as dirty.
 void KABCore::sync_setModified()
 {
   setModified();
 }
 
 //called by the syncmanager to ask if the dirty flag is set.
 bool KABCore::sync_isModified()
 {
   return mModified;
 }
 
 
 //called by the syncmanager to indicate that the work has to be saved.
 void KABCore::sync_save()
 {
   save();
 }
 
 
 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 87f200a..07e6761 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1,529 +1,665 @@
 /*
     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 <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 <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
   : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs), mSyncMenu(syncmenu)
 {
+    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 );
 
 }
 
 KSyncManager::~KSyncManager()
 {
-
+  delete bar;
 }
 
 
 void KSyncManager::fillSyncMenu()
 {
     if ( mSyncMenu->count() )
         mSyncMenu->clear();
     
     mSyncMenu->insertItem( i18n("Configure..."), 0 );
     mSyncMenu->insertSeparator();
     mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
     mSyncMenu->insertSeparator();
     
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
     mPrefs->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 3 ) {
         prof.clear();
-        prof << i18n("Sharp_DTM");
-        prof << i18n("Local_file");
+	prof << i18n("Sharp_DTM");
+	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","Sharp_DTM");
         config.sync();
         delete temp;
     }
     mPrefs->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
     mPrefs->mSyncProfileNames = prof;
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
-
         mSyncMenu->insertItem(  prof[i], 1000+i );
         if ( i == 2 )
             mSyncMenu->insertSeparator();
     }
     QDir app_dir;
-    if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
-        mSyncMenu->setItemEnabled( false , 1000 );
+    //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
+    if ( mTargetApp == PWMPI) {
+        mSyncMenu->removeItem( 1000 );
+    }
+    else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
+        mSyncMenu->setItemEnabled( 1000, false );
     }
     //probaly useless
     //mView->setupExternSyncProfiles();
 }
 
 void KSyncManager::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     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 (blockSave())
       return;
 
     setBlockSave(true);
 
     mCurrentSyncProfile = action - 1000 ;
     mCurrentSyncDevice = mPrefs->mSyncProfileNames[mCurrentSyncProfile] ;
     mCurrentSyncName =  mPrefs->mLocalMachineName ;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(mPrefs->mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     mPrefs->mAskForPreferences = temp->getAskForPreferences();
     mPrefs->mSyncAlgoPrefs = temp->getSyncPrefs();
     mPrefs->mWriteBackFile = temp->getWriteBackFile();
     mPrefs->mWriteBackExistingOnly = temp->getWriteBackExisting();
     mPrefs->mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         mPrefs->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     mPrefs->mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
     
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
-	  if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
+	  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() ) {
                 mPrefs->mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPrefs->mPhoneConnection = temp->getPhoneConnection( );
                 mPrefs->mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else
                 syncRemote( temp );
 
         }
     }
     delete temp;
     setBlockSave(false);
 }
 
 void KSyncManager::syncLocalFile()
 {
 
     QString fn =mPrefs->mLastSyncedLocalFile;
-
-    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), mParent );
+    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 ");
     }
 
 }
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
     bool ret = false;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
         int result = QMessageBox::warning( mParent, i18n("Warning!"),
                                            mess );
         return ret;
     }
     int result = 0;
     if ( !quick ) {
         mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( mParent, i18n("Warning!"),
                                        mess,
                                        i18n("Sync"), i18n("Cancel"), 0,
                                        0, 1 );
         if ( result )
             return false;
     }
     if ( mPrefs->mAskForPreferences )
         edit_sync_options();
     if ( result == 0 ) {
         //qDebug("Now sycing ... ");
         if ( ret = mImplementation->sync( this, fn, mPrefs->mSyncAlgoPrefs ) )
             mParent->setCaption( i18n("Synchronization successful") );
         else
             mParent->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
         if ( ! quick )
             mPrefs->mLastSyncedLocalFile = fn;
 	mImplementation->sync_setModified();
     }
     return ret;
 }
 void KSyncManager::quickSyncLocalFile()
 {
     
     if ( syncWithFile( mPrefs->mLastSyncedLocalFile, false ) ) {
         qDebug("quick syncLocalFile() successful ");
       
     }
 }
 void KSyncManager::multiSync( bool askforPrefs  )
 {
     if (blockSave())
         return;
     setBlockSave(true);
     QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
     if ( QMessageBox::information( mParent, i18n("Sync"),
                                    question,
                                    i18n("Yes"), i18n("No"),
                                    0, 0 ) != 0 ) {
         setBlockSave(false);
         mParent->setCaption(i18n("Aborted! Nothing synced!"));
         return;
     }
     mCurrentSyncDevice = i18n("Multiple profiles") ;
     mPrefs->mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         edit_sync_options();
         mPrefs->mRingSyncAlgoPrefs = mPrefs->mSyncAlgoPrefs;
     }
     mParent->setCaption(i18n("Multiple sync started.") );
     qApp->processEvents();
     int num = ringSync() ;
     if (  num > 1 )
         ringSync();
     setBlockSave(false);
     if ( num )
         mImplementation->sync_save();
     if ( num )
         mParent->setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
     else
         mParent->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 int KSyncManager::ringSync()
 {
     int syncedProfiles = 0;
     unsigned int i;
     QTime timer;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     QStringList syncProfileNames = mPrefs->mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
     mPrefs->mAskForPreferences = false;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
-        if ( temp->getIncludeInRingSyncAB() && ( i < 1 || i > 2  )) {
+
+	QString includeInRingSync;
+	switch(mTargetApp)
+	  {
+	  case (KAPI):
+	    includeInRingSync = temp->getIncludeInRingSyncAB();
+	      break;
+	  case (KOPI):
+	    includeInRingSync = temp->getIncludeInRingSync();
+	      break;
+	  case (PWMPI):
+	    includeInRingSync = temp->getIncludeInRingSyncPWM();
+	      break;
+	    default:
+	      qDebug("KSyncManager::ringSync: invalid apptype selected");
+	      break;
+	      
+	  }
+        
+	
+	if ( includeInRingSync && ( i < 1 || i > 2  )) {
             mParent->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
             // mPrefs->mAskForPreferences = temp->getAskForPreferences();
             mPrefs->mWriteBackFile = temp->getWriteBackFile();
             mPrefs->mWriteBackExistingOnly = temp->getWriteBackExisting();
             mPrefs->mWriteBackInFuture = 0;
             if ( temp->getWriteBackFuture() )
                 mPrefs->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
             mPrefs->mShowSyncSummary = false;
             mCurrentSyncDevice = syncProfileNames[i] ;
             mCurrentSyncName = mPrefs->mLocalMachineName;
             if ( i == 0 ) {
                 syncSharp();
             } else {
                 if ( temp->getIsLocalFileSync() ) {
-                    if ( syncWithFile( temp->getRemoteFileNameAB( ), true ) )
-                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
+		  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() ) {
                         mPrefs->mPhoneDevice = temp->getPhoneDevice( ) ;
                         mPrefs->mPhoneConnection = temp->getPhoneConnection( );
                         mPrefs->mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
                     } else
                         syncRemote( temp, false );
 
                 }
             }
             timer.start();
             mParent->setCaption(i18n("Multiple sync in progress ... please wait!") );
             while ( timer.elapsed () < 2000 ) {
                 qApp->processEvents();
 #ifndef _WIN32_
                 sleep (1);
 #endif
             }
 
         }
 
     }
     delete temp;
     return syncedProfiles;
 }
 
 void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 {
     QString question;
     if ( ask ) {
     question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
     if ( QMessageBox::information( mParent, i18n("Sync"),
                                    question,
                                    i18n("Yes"), i18n("No"),
                                    0, 0 ) != 0 )
         return;
     }
-    QString command = prof->getPreSyncCommandAB();
+
+    QString preCommand;
+    QString localTempFile;
+    QString postCommand;
+
+    switch(mTargetApp)
+      {
+      case (KAPI):
+	preCommand = prof->getPreSyncCommandAB();
+	postCommand = prof->getPostSyncCommandAB();
+	localTempFile = prof->getLocalTempFileAB();
+	break;
+      case (KOPI):
+	preCommand = prof->getPreSyncCommand();
+	postCommand = prof->getPostSyncCommand();
+	localTempFile = prof->getLocalTempFile();
+	break;
+      case (PWMPI):
+	preCommand = prof->getPreSyncCommandPWM();
+	postCommand = prof->getPostSyncCommandPWM();
+	localTempFile = prof->getLocalTempFilePWM();
+	break;
+      default:
+	qDebug("KSyncManager::syncRemote: invalid apptype selected");
+	break;
+      }
+
+
     int fi;
-    if ( (fi = command.find("$PWD$")) > 0 ) {
+    if ( (fi = preCommand.find("$PWD$")) > 0 ) {
         QString pwd = getPassword();
-        command = command.left( fi )+ pwd + command.mid( fi+5 );
+        preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 );
 
     }
     int maxlen = 30;
     if ( QApplication::desktop()->width() > 320 )
         maxlen += 25;
     mParent->setCaption ( i18n( "Copy remote file to local machine..." ) );
     int fileSize = 0;
-    int result = system ( command );
+    int result = system ( preCommand );
     // 0 : okay
     // 256: no such file or dir
     //
     qDebug("KO: Remote copy result(0 = okay): %d ",result );
     if ( result != 0 ) {
         unsigned int len = maxlen;
-        while ( len <  command.length() ) {
-            command.insert( len , "\n" );
+        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 (command) ;
+        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->setCaption ("");
         return;
     }
     mParent->setCaption ( i18n( "Copying succeed." ) );
     //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
-    if ( syncWithFile( prof->getLocalTempFileAB(), true ) ) {
+
+
+
+    if ( syncWithFile( localTempFile, true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
         if ( mPrefs->mWriteBackFile ) {
-            command =  prof->getPostSyncCommandAB(); 
             int fi;
-            if ( (fi = command.find("$PWD$")) > 0 ) {
+            if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                 QString pwd = getPassword();
-                command = command.left( fi )+ pwd + command.mid( fi+5 );
+                postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
             mParent->setCaption ( i18n( "Writing back file ..." ) );
-            result = system ( command );
+            result = system ( postCommand );
             qDebug("Writing back file result: %d ", result);
             if ( result != 0 ) {
                 mParent->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                 return;
             } else {
                 mParent->setCaption ( i18n( "Syncronization sucessfully completed" ) );
             }
         }
     }
     return;
 }
 
 void KSyncManager::edit_sync_options()
 {
     //mDialogManager->showSyncOptions();
     //mPrefs->mSyncAlgoPrefs 
     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 ( mPrefs->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() ) {
         mPrefs->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
     }
    
 
 }
 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();
     mPrefs->mSyncProfileNames = sp->getSyncProfileNames();
     mPrefs->mLocalMachineName = sp->getLocalMachineName ();
     fillSyncMenu();
 }
 
 void KSyncManager::syncSharp()
 {
     if ( ! syncExternalApplication("sharp") )
         qDebug("ERROR sync sharp  ");;
 }
 
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
     if (  mImplementation->sync_isModified()  )
         mImplementation->sync_save();
 
     if ( mPrefs->mAskForPreferences )
         edit_sync_options();
 
     qDebug("sync %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
 
     return syncOK;
 
 }
 
 void KSyncManager::syncPhone()
 {
     if (  mImplementation->sync_isModified()  )
         mImplementation->sync_save();
 
     qDebug("pending syncPhone(); ");
     //mView->syncPhone();
     mImplementation->sync_setModified();
 
 }
+
+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();
+}
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 389a005..9761107 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -1,119 +1,129 @@
 /*
     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>
 
 class QPopupMenu;
 class KSyncProfile;
 class KPimPrefs;
 class QWidget;
 class KSyncManager;
 class KSyncInterface;
+class QProgressBar;
 
 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() ;
 
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
 
     void fillSyncMenu();
 
     QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
+    void showProgressBar(int percentage, QString caption = QString::null, int total=100);
+    void hideProgressBar();
+    bool isProgressBarCanceled();
+
+
  public slots:
     void slotSyncMenu( int );
 
  private:
     // LR *******************************
     // sync stuff!
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;
     void quickSyncLocalFile();
     bool  syncWithFile( QString fn , bool quick );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
     bool syncExternalApplication(QString);
     void multiSync( bool askforPrefs  );
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     void edit_sync_options();
     int ringSync();
     QString  getPassword( );
 
   private slots:
     void confSync();
     // *********************
 
  private:
     bool mBlockSaveFlag;
 
 
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
     KPimPrefs* mPrefs;
     QPopupMenu* mSyncMenu;
 
-
+    QProgressBar* bar;
 
 
 
 
 
 };
 
 
 class KSyncInterface
 {
  public:
     virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
-    virtual bool syncExternal(KSyncManager* manager, QString resource) = 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;
+      }
 
     //called by the syncmanager to indicate that the work has to be marked as dirty.
     virtual void sync_setModified() = 0;
 
     //called by the syncmanager to ask if the dirty flag is set.
     virtual bool sync_isModified() = 0;
 
     //called by the syncmanager to indicate that the work has to be saved.
     virtual void sync_save() = 0;
 };
 
 
 #endif
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index ac2e66e..014e809 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -813,543 +813,553 @@ void PwM::config_slot()
 
 	PwMDocList *_dl = PwMDoc::getOpenDocList();
 	const vector<PwMDocList::listItem> *dl = _dl->getList();
 	vector<PwMDocList::listItem>::const_iterator i = dl->begin(),
 						     end = dl->end();
 	PwMDoc *doc;
 	while (i != end) {
 		doc = (*i).doc;
 		// unlock-without-mpw timeout
 		doc->timer()->start(DocTimer::id_mpwTimer);
 		// auto-lock timeout
 		doc->timer()->start(DocTimer::id_autoLockTimer);
 		++i;
 	}
 
 	const QValueList<PwM *> *ml = init->mainWndList();
 #ifndef PWM_EMBEDDED
 	QValueList<PwM *>::const_iterator i2 = ml->begin(),
 					  end2 = ml->end();
 #else
 	QValueList<PwM *>::ConstIterator i2 = ml->begin(),
 					  end2 = ml->end();
 #endif
 	PwM *pwm;
 	while (i2 != end2) {
 		pwm = *i2;
 		// reinitialize the window style.
 		if (oldStyle != newStyle)
 			pwm->curView()->initStyle(newStyle);
 		// set the new font
 		pwm->curView()->setFont(conf()->confGlobEntryFont());
 		++i2;
 	}
 }
 
 void PwM::activateMpButton(bool activate)
 {
 	managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, activate);
 }
 
 void PwM::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 }
 
 void PwM::docClosed(PwMDoc *doc)
 {
 	PARAM_UNUSED(doc);
 	PWM_ASSERT(doc == curDoc());
 	close();
 }
 
 void PwM::find_slot()
 {
 	PWM_ASSERT(curDoc());
 	if (curDoc()->isDocEmpty())
 		return;
 	if (curDoc()->isDeepLocked())
 		return;
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	FindWndImpl findWnd(view);
 	findWnd.exec();
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 }
 
 void PwM::exportToText()
 {
 	PWM_ASSERT(curDoc());
 	if (curDoc()->isDocEmpty()) {
 		KMessageBox::information(this,
 					 i18n
 					 ("Sorry, there's nothing to export.\n"
 					  "Please first add some passwords."),
 					 i18n("nothing to do"));
 		return;
 	}
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	QString fn(KFileDialog::getSaveFileName(QString::null,
 						i18n("*|plain-text file"),
 						this));
 	if (fn == "") {
 		curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 		return;
 	}
 
 	PwMerror ret = curDoc()->exportToText(&fn);
 	if (ret != e_success) {
 		KMessageBox::error(this,
 				   i18n("Error: Couldn't write to file.\n"
 					"Please check if you have permission to write "
 					"to the file in that directory."),
 				   i18n("error while writing"));
 	} else
 		showStatMsg(i18n("Successfully exported data."));
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 }
 
 bool PwM::importFromText()
 {
 	if (!isVirgin()) {
 		if (KMessageBox::questionYesNo(this,
 					       i18n("Do you want to import the data "
 					            "into the current document? (If you "
 					            "select \"no\", a new document will be "
 					            "opened.)"),
 					       i18n("import into this document?"))
 		    == KMessageBox::No) {
 			// import the data to a new window.
 			PwM *newInstance = init->createMainWnd();
 			bool ok = newInstance->importFromText();
 			if (!ok) {
 				newInstance->setForceQuit(true);
 				delete_and_null(newInstance);
 			}
 			return ok;
 		}
 	}
 
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	PwMerror ret;
 	QString path(KFileDialog::getOpenFileName(QString::null,
 						  i18n("*|PWM-exported text file"),
 						  this));
 	if (path == "")
 		goto cancelImport;
 
 	ret = curDoc()->importFromText(&path, 0);
 	if (ret == e_fileFormat) {
 		KMessageBox::error(this,
 				   i18n("Could not read file-format.\n"
 					"This seems to be _not_ a valid file "
 					"exported by PwM."),
 				   i18n("invalid file-format"));
 		goto cancelImport;
 	} else if (ret == e_invalidArg) {
 		BUG();
 		goto cancelImport;
 	} else if (ret != e_success) {
 		KMessageBox::error(this,
 				   i18n("Could not import file!\n"
 					"Do you have permission to read this file? "
 					"Do you have enough free memory?"),
 				   i18n("import failed"));
 		goto cancelImport;
 	}
 	setVirgin(false);
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 	return true;
 
 cancelImport:
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 	return false;
 }
 
 void PwM::exportToGpasman()
 {
 	PWM_ASSERT(curDoc());
 	if (curDoc()->isDocEmpty()) {
 		KMessageBox::information(this,
 					 i18n
 					 ("Sorry, there's nothing to export.\n"
 					  "Please first add some passwords."),
 					 i18n("nothing to do"));
 		return;
 	}
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	QString fn(KFileDialog::getSaveFileName(QString::null,
 						i18n("*|Gpasman or Kpasman file"),
 						this));
 	if (fn == "") {
 		curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 		return;
 	}
 
 	PwMerror ret = curDoc()->exportToGpasman(&fn);
 	if (ret != e_success) {
 		if (ret == e_noPw) {
 			curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 			return;
 		}
 		KMessageBox::error(this,
 				   i18n("Error: Couldn't write to file.\n"
 					"Please check if you have permission to write "
 					"to the file in that directory."),
 				   i18n("error while writing"));
 	} else
 		showStatMsg(i18n("Successfully exported data."));
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 }
 
 void PwM::exportToKWallet()
 {
 #ifdef CONFIG_KWALLETIF
 	if (!checkAndAskForKWalletEmu())
 		return;
 	PWM_ASSERT(curDoc());
 	if (curDoc()->isDocEmpty()) {
 		KMessageBox::information(this,
 					 i18n
 					 ("Sorry, there's nothing to export.\n"
 					  "Please first add some passwords."),
 					 i18n("nothing to do"));
 		init->initKWalletEmu();
 		return;
 	}
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	KWalletIf walletIf(this);
 	if (walletIf.kwalletExport(curDoc())) {
 		KMessageBox::information(this,
 					 i18n("Successfully exported the data of the current "
 					      "document to KWallet."),
 					 i18n("Successfully exported data."));
 		showStatMsg(i18n("Successfully exported data."));
 	}
 	init->initKWalletEmu();
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 #endif // CONFIG_KWALLETIF
 }
 
 bool PwM::importFromGpasman()
 {
 	if (!isVirgin()) {
 		if (KMessageBox::questionYesNo(this,
 					       i18n("Do you want to import the data "
 					            "into the current document? (If you "
 					            "select \"no\", a new document will be "
 					            "opened.)"),
 					       i18n("import into this document?"))
 		    == KMessageBox::No) {
 			// import the data to a new window.
 			PwM *newInstance = init->createMainWnd();
 			bool ok = newInstance->importFromGpasman();
 			if (!ok) {
 				newInstance->setForceQuit(true);
 				delete_and_null(newInstance);
 			}
 			return ok;
 		}
 	}
 
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	PwMerror ret;
 	QString path(KFileDialog::getOpenFileName(QString::null,
 						  i18n("*|Gpasman or Kpasman file"), this));
 	if (path == "")
 		goto cancelImport;
 	ret = curDoc()->importFromGpasman(&path);
 	if (ret == e_wrongPw) {
 		if (KMessageBox::questionYesNo(this,
 				 	       i18n
 					       ("This is probably the wrong master-password"
 					        "you have typed in.\n"
 					        "There is no real way to determine the "
 					        "correctness of the password in the Gpasman "
 					        "file-format. But I think this "
 					        "password ist wrong.\n"
 					        "Do you want to continue nevertheless?"),
 					       i18n("password error"))
 		    == KMessageBox::No) {
 			goto cancelImport;
 		}
 	} else if (ret != e_success) {
 		KMessageBox::error(this,
 				   i18n("Could not import file!\n"
 					"Do you have permission to read this file?"),
 				   i18n("import failed"));
 		goto cancelImport;
 	}
 	setVirgin(false);
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 	return true;
 
 cancelImport:
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 	return false;
 }
 
 #ifdef CONFIG_KWALLETIF
 bool PwM::checkAndAskForKWalletEmu()
 {
 	if (init->kwalletEmu()) {
 		/* KWallet emulation is enabled. We can't import/export
 		 * data from/to it, while emulation is active.
 		 */
 		if (KMessageBox::questionYesNo(this,
 					       i18n("KWallet emulation is enabled.\n"
 						    "You can't import or export data from/to "
 						    "the original KWallet, while the emulation "
 						    "is active.\n"
 						    "Do you want to tempoarly disable the KWallet emulation?"),
 					       i18n("Tempoarly disable KWallet emulation?"))
 		    == KMessageBox::Yes) {
 			init->initKWalletEmu(true);
 			PWM_ASSERT(!init->kwalletEmu());
 			return true;
 		}
 		return false;
 	}
 	return true;
 }
 #endif // CONFIG_KWALLETIF
 
 bool PwM::importKWallet()
 {
 #ifdef CONFIG_KWALLETIF
 	if (!checkAndAskForKWalletEmu())
 		return false;
 	KWalletIf walletIf(this);
 	if (!isVirgin()) {
 		if (KMessageBox::questionYesNo(this,
 					       i18n("Do you want to import the data "
 					            "into the current document? (If you "
 					            "select \"no\", a new document will be "
 					            "opened.)"),
 					       i18n("import into this document?"))
 		    == KMessageBox::No) {
 			// import the data to a new window.
 			PwM *newInstance = init->createMainWnd();
 			bool ok = newInstance->importKWallet();
 			if (!ok) {
 				newInstance->setForceQuit(true);
 				delete_and_null(newInstance);
 				goto exit_fail;
 			} else {
 				goto exit_ok;
 			}
 		}
 	}
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 	if (!walletIf.kwalletImport(curDoc())) {
 		curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 		showStatMsg(i18n("KWallet import failed"));
 		goto exit_fail;
 	}
 	KMessageBox::information(this,
 				 i18n("Successfully imported the KWallet data "
 				      "into the current document."),
 				 i18n("successfully imported"));
 	showStatMsg(i18n("successfully imported"));
 	setVirgin(false);
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 
 exit_ok:
 	init->initKWalletEmu();
 	return true;
 
 exit_fail:
 	init->initKWalletEmu();
 #endif // CONFIG_KWALLETIF
 	return false;
 }
 
 void PwM::print_slot()
 {
 	curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
 #ifndef PWM_EMBEDDED
 	PwMPrint p(curDoc(), this);
 	p.printNow();
 #else
 	qDebug("PwM::print_slot , PRINTING IS NOT IMPLEMENTED");
 #endif
 	curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 }
 
 void PwM::genNewCard_slot()
 {
 #ifdef CONFIG_KEYCARD
 	init->keycard()->genNewCard();
 #endif
 }
 
 void PwM::eraseCard_slot()
 {
 #ifdef CONFIG_KEYCARD
 	init->keycard()->eraseCard();
 #endif
 }
 
 void PwM::readCardId_slot()
 {
 #ifdef CONFIG_KEYCARD
 	init->keycard()->displayKey();
 #endif
 }
 
 void PwM::makeCardBackup_slot()
 {
 #ifdef CONFIG_KEYCARD
 	init->keycard()->makeBackupImage();
 #endif
 }
 
 void PwM::replayCardBackup_slot()
 {
 #ifdef CONFIG_KEYCARD
 	init->keycard()->replayBackupImage();
 #endif
 }
 
 void PwM::execLauncher_slot()
 {
 	PWM_ASSERT(curDoc());
 	if (curDoc()->isDeepLocked())
 		return;
 	unsigned int curEntryIndex;
 	if (!view->getCurEntryIndex(&curEntryIndex))
 		return;
 	bool ret = curDoc()->execLauncher(view->getCurrentCategory(),
 					  curEntryIndex);
 	if (ret)
 		showStatMsg(i18n("Executed the \"Launcher\"."));
 	else
 		showStatMsg(i18n("ERROR: Couldn't execute the \"Launcher\"!"));
 }
 
 void PwM::goToURL_slot()
 {
 	PWM_ASSERT(curDoc());
 	if (curDoc()->isDeepLocked())
 		return;
 	unsigned int curEntryIndex;
 	if (!view->getCurEntryIndex(&curEntryIndex))
 		return;
 	bool ret = curDoc()->goToURL(view->getCurrentCategory(),
 				     curEntryIndex);
 	if (ret)
 		showStatMsg(i18n("started browser with current URL."));
 	else
 		showStatMsg(i18n("ERROR: Couldn't start browser! Maybe invalid URL?"));
 }
 
 void PwM::copyToClipboard(const QString &s)
 {
 	QClipboard *cb = QApplication::clipboard();
 #ifndef PWM_EMBEDDED
 	if (cb->supportsSelection())
 		cb->setText(s, QClipboard::Selection);
 	cb->setText(s, QClipboard::Clipboard);
 #else
 	cb->setText(s);
 
 #endif
 
 }
 
 void PwM::showStatMsg(const QString &msg)
 {
 #ifndef PWM_EMBEDDED
 	KStatusBar *statBar = statusBar();
 	statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
 #else
 	qDebug("Statusbar : %s",msg.latin1());
 #endif
 }
 
 void PwM::focusInEvent(QFocusEvent *e)
 {
 	if (e->gotFocus()) {
 		emit gotFocus(this);
 	} else if (e->lostFocus()) {
 		emit lostFocus(this);
 	}
 }
 
 
 #ifdef PWM_EMBEDDED
 
 void PwM::showLicense_slot()
 {
     KApplication::showLicence();
 }
 
 void PwM::faq_slot()
 {
   KApplication::showFile( "PWM/Pi FAQ", "kdepim/pwmanager/pwmanagerFAQ.txt" );
 }
 
 void PwM::createAboutData_slot()
 {
   QString version;
 #include <../version>
     QMessageBox::about( this, "About PwManager/Pi",
                         "PwManager/Platform-independent\n"
                         "(PWM/Pi) " +version + " - " +
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
 
                         "(c) 2004 Ulf Schenk\n"
                         "(c) 2004 Lutz Rogowski\n"
                         "(c) 1997-2004, The KDE PIM Team\n"
 
 	"(c) Michael Buesch - main programming\nand current maintainer\nmbuesch@freenet.de\n"
 	"Matt Scifo - mscifo@o1.com\n"
 	"Elias Probst - elias.probst@gmx.de\n"
 	"George Staikos - staikos@kde.org\n"
 	"Matthew Palmer - mjp16@uow.edu.au\n"
         "Olivier Sessink - gpasman@nl.linux.org\n"
 	"The libgcrypt developers -\nBlowfish and SHA1 algorithms\nftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/\n"
 	"Troy Engel - tengel@sonic.net\n"
 	"Wickey - wickey@gmx.at\n"
 	"Ian MacGregor - original documentation author.\n"
  );
 }
 
 
 //this are the overwritten callbackmethods from the syncinterface
 bool PwM::sync(KSyncManager* manager, QString filename, int mode)
 {
-  return true;
-}
+  PWM_ASSERT(curDoc());
 
-bool PwM::syncExternal(KSyncManager* manager, QString resource)
-{
-  return true;
+  bool ret =  curDoc()->sync(manager, filename, mode);
+
+  if (ret == true) {
+    //US BUG: what can we call here to update the view of the current doc?
+    //mViewManager->refreshView();
+  }
+
+  return ret;
 }
 
-//called by the syncmanager to indicate that the work has to marked as dirty.
+//called by the syncmanager to indicate that the work has to be marked as dirty.
 void PwM::sync_setModified()
 {
+  PWM_ASSERT(curDoc());
+  curDoc()->sync_setModified();
 }
 
 //called by the syncmanager to ask if the dirty flag is set.
 bool PwM::sync_isModified()
 {
+  PWM_ASSERT(curDoc());
+  return curDoc()->sync_isModified();
 }
 
 //called by the syncmanager to indicate that the work has to be saved.
 void PwM::sync_save()
 {
+  PWM_ASSERT(curDoc());
+  return curDoc()->sync_save();
 }
 
 
 
 #endif
 
 
 #ifndef PWM_EMBEDDED
 #include "pwm.moc"
 #endif
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index 2fe7352..7c6bf0d 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -1,298 +1,297 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003, 2004 by Michael Buesch                            *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef __PWM_H
 #define __PWM_H
 
 
 #include <kpopupmenu.h>
 #include <klistview.h>
 #include <kmainwindow.h>
 
 #ifndef PWM_EMBEDDED
 #include <kwin.h>
 #include <kapp.h>
 #include <kdeversion.h>
 #else
 #include <ksyncmanager.h>
 #endif
 
 #include <kaction.h>
 
 #include <qglobal.h>
 
 #include "pwmview.h"
 #include "pwmexception.h"
 
 
 /** timeout for displaying a message on the status-bar (in seconds) */
 #define STATUSBAR_MSG_TIMEOUT	5
 
 
 class PwMInit;
 class KSyncManager;
 
 /** PwM is the base class of the project */
 #ifndef PWM_EMBEDDED
 //MOC_SKIP_BEGIN
 class PwM : public KMainWindow
 //MOC_SKIP_END
 #else
 class PwM : public KMainWindow, public KSyncInterface
 #endif
 {
 	Q_OBJECT
 public:
 	friend class PwMView;
 	/** construtor */
 	PwM(PwMInit *_init, PwMDoc *doc,
 	    bool virginity = true,
 	    QWidget* parent = 0, const char *name = 0);
 	/** destructor */
 	~PwM();
 
 	/** copy some text to the global clipboard */
 	static void copyToClipboard(const QString &s);
 
 	/** returns pointer to the view */
 	PwMView * curView()
 			{ return view; }
 	/** returns pointer to the currently using document. */
 	PwMDoc * curDoc()
 			{ return curView()->document(); }
 	/** open a new doc with the given filename */
 	PwMDoc * openDoc(QString filename, bool openDeepLocked = false);
 	/** show a message on the global status bar.
 	  * The message times out after some seconds.
 	  */
 	void showStatMsg(const QString &msg);
 	/** ask the user where to save the doc (if it has not been saved, yet)
 	  * and write the data to disk.
 	  */
 	bool save();
 	/** ask the user where to save the doc
 	  * and write the data to disk.
 	  */
 	bool saveAs();
 	/** force quit. Quit this window, always! Don't minimize it */
 	bool isForceQuit()
 			{ return forceQuit; }
 	/** set forceQuit */
 	void setForceQuit(bool force)
 			{ forceQuit = force; }
 	/** force minimize this window */
 	bool isForceMinimizeToTray()
 			{ return forceMinimizeToTray; }
 	/** set forceMinimizeToTray */
 	void setForceMinimizeToTray(bool force)
 			{ forceMinimizeToTray = force; }
 
 public slots:
 	/** file/new triggered */
 	void new_slot();
 	/** file/open triggered */
 //US ENH
 	void open_slot();
 	void open_slot(QString fn);
 	/** file/close triggered */
 	void close_slot();
 	/** file/quit triggered */
 	void quitButton_slot();
 	/** file/save triggered */
 	void save_slot();
 	/** file/saveAs triggered */
 	void saveAs_slot();
 	/** file/export/text triggered */
 	void exportToText();
 	/** file/export/gpasman triggered */
 	void exportToGpasman();
 	/** file/export/kwallet triggered */
 	void exportToKWallet();
 	/** file/import/text triggered */
 	bool importFromText();
 	/** file/import/gpasman triggered */
 	bool importFromGpasman();
 	/** file/import/kwallet triggered */
 	bool importKWallet();
 	/** file/print triggered */
 	void print_slot();
 	/** manage/add triggered */
 	//US ENH : changed code to run with older MOC
 	void addPwd_slot();
 	void addPwd_slot(QString *pw, PwMDoc *_doc);
 	/** manage/edit triggered */
 	//US ENH : changed code to run with older MOC
 	void editPwd_slot();
 	void editPwd_slot(const QString *category);
 	void editPwd_slot(const QString *category = 0, const int *index = 0,
 			  PwMDoc *_doc = 0);
 	/** manage/delete triggered */
 	void deletePwd_slot();
 	/** execute the "Launcher" entry */
 	void execLauncher_slot();
 	/** open browser with URL entry */
 	void goToURL_slot();
 	/** manage/changeMasterPwd triggered */
 	void changeMasterPwd_slot();
 	/** lock current document */
 	void lockWnd_slot();
 	/** deeplock current document */
 	void deepLockWnd_slot();
 	/** window/unlock triggered */
 	void unlockWnd_slot();
 	/** find item */
 	void find_slot();
 	/** configure clicked */
 	void config_slot();
 	/** (de)activate the "change master pw" button in the menu-bar */
 	void activateMpButton(bool activate = true);
 	/** generate a new chipcard */
 	void genNewCard_slot();
 	/** completely erase the current card */
 	void eraseCard_slot();
 	/** returns the ID number of the current card */
 	void readCardId_slot();
 	/** make backup image of the current card */
 	void makeCardBackup_slot();
 	/** write backup image to current card */
 	void replayCardBackup_slot();
 
 #ifdef PWM_EMBEDDED
 	void showLicense_slot();
 	void faq_slot();
 	void createAboutData_slot();
 #endif
 
 protected:
 	/** is this window virgin? */
 	bool isVirgin()
 			{ return virgin; }
 	/** add/remove virginity */
 	void setVirgin(bool v);
 	/** initialize the menubar */
 	void initMenubar();
 	/** initialize the toolbar */
 	void initToolbar();
 	/** initialize the window-metrics */
 	void initMetrics();
 	/** close-event */
 	void closeEvent(QCloseEvent *e);
 	/** creates a new PwM-ListView and returns it */
 	PwMView * makeNewListView(PwMDoc *doc);
 	/** Window hide-event */
 	void hideEvent(QHideEvent *);
 	/** is this window minimized? */
 	bool isMinimized()
 		{
 #ifndef PWM_EMBEDDED
 		  #if KDE_VERSION >= KDE_MAKE_VERSION(3, 2, 0)
 			return KWin::windowInfo(winId()).isMinimized();
 		  #else // KDE_VERSION
 			return KWin::info(winId()).isIconified();
 		  #endif // KDE_VERSION
 #else
 			return false;
 #endif
 		}
 	/** window got the focus */
 	void focusInEvent(QFocusEvent *e);
 	/** update the caption string */
 	void updateCaption();
 #ifdef CONFIG_KWALLETIF
 	/** check if kwalletemu is enabled and ask the user what to do */
 	bool checkAndAskForKWalletEmu();
 #endif // CONFIG_KWALLETIF
 
 protected slots:
 	/** doc got closed */
 	void docClosed(PwMDoc *doc);
 
 signals:
 	/** window got closed (by user or someone else) */
 	void closed(PwM *wnd);
 	/** window got the focus (was brought to foreground) */
 	void gotFocus(PwM *wnd);
 	/** window lost the focus */
 	void lostFocus(PwM *wnd);
 
 protected:
 	/** pointer to the view active in this KMainWindow */
 	PwMView *view;
 	/** pointer to the init class */
 	PwMInit *init;
 	/** has this window already lost its virginity?
 	  * Means is there an open working document
 	  */
 	bool virgin;
 	/** "file" popup-menu */
 	KPopupMenu *filePopup;
 
 	/** "manage" popup-menu */
 	KPopupMenu *managePopup;
 #ifdef CONFIG_KEYCARD
 	/** "chipcard" popup-menu */
 	KPopupMenu *chipcardPopup;
 #endif // CONFIG_KEYCARD
 	/** "view" popup-menu */
 	KPopupMenu *viewPopup;
 	/** "options" popup-menu */
 	KPopupMenu *optionsPopup;
 	/** "help" popup-menu */
 	KPopupMenu *helpPopup;
 	/** "export" popup-menu */
 	KPopupMenu *exportPopup;
 	/** "import" popup-menu */
 	KPopupMenu *importPopup;
 	/** force quit this window? */
 	bool forceQuit;
 	/** force minimize this window to the tray */
 	bool forceMinimizeToTray;
 
 
 
 
  private:
 #ifdef PWM_EMBEDDED
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
-    virtual bool syncExternal(KSyncManager* manager, QString resource);
 
     //called by the syncmanager to indicate that the work has to marked as dirty.
     virtual void sync_setModified();
     //called by the syncmanager to ask if the dirty flag is set.
     virtual bool sync_isModified();
     //called by the syncmanager to indicate that the work has to be saved.
     virtual void sync_save();
 
     // LR *******************************
     // sync stuff!
     QPopupMenu *syncPopup;
     KSyncManager* syncManager;
 #endif
 
 
 
 
 
 
 
 
 };
 
 #endif
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 1b6d36f..82fc746 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2272,515 +2272,607 @@ bool PwMDoc::goToURL(unsigned int category, unsigned int entryIndex)
 	}
 
 	browserProc.clearArguments();
 	browserProc << "konqueror" << url;
 	if (browserProc.start(KProcess::DontCare))
 		return true;
 
 	browserProc.clearArguments();
 	browserProc << "mozilla" << url;
 	if (browserProc.start(KProcess::DontCare))
 		return true;
 
 	browserProc.clearArguments();
 	browserProc << "opera" << url;
 	if (browserProc.start(KProcess::DontCare))
 		return true;
 	return false;
 }
 
 PwMerror PwMDoc::exportToText(const QString *file)
 {
 	PWM_ASSERT(file);
 	if (QFile::exists(*file)) {
 		if (!QFile::remove(*file))
 			return e_accessFile;
 	}
 	QFile f(*file);
 	if (!f.open(IO_ReadWrite))
 		return e_openFile;
 
 	if (!unlockAll_tempoary()) {
 		f.close();
 		return e_lock;
 	}
 
 	// write header
 	string header = i18n("Password table generated by\nPwM v").latin1();
 	header += PACKAGE_VER;
 	header += i18n("\non ").latin1();
 	QDate currDate = QDate::currentDate();
 	QTime currTime = QTime::currentTime();
 
 #ifndef PWM_EMBEDDED
 	header += currDate.toString("ddd MMMM d ").latin1();
 	header += currTime.toString("hh:mm:ss ").latin1();
 #else
 	QString dfs = KGlobal::locale()->dateFormatShort();
 	bool ampm = KGlobal::locale()->use12Clock();
 	KGlobal::locale()->setDateFormatShort("%A %B %d");
 	KGlobal::locale()->setHore24Format(true);
 
 	header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined);
 	header += KGlobal::locale()->formatTime(currTime, true);
 	KGlobal::locale()->setDateFormatShort(dfs);
 	KGlobal::locale()->setHore24Format(!ampm);
 
 #endif
 	header += tostr(currDate.year());
 	header += "\n==============================\n\n";
 
 
 #ifndef PWM_EMBEDDED
 	if (f.writeBlock(header.c_str(), header.length()) != (Q_LONG)header.length()) {
 		unlockAll_tempoary(true);
 		f.close();
 		return e_writeFile;
 	}
 #else
 	if (f.writeBlock(header.c_str(), header.length()) != (long)header.length()) {
 		unlockAll_tempoary(true);
 		f.close();
 		return e_writeFile;
 	}
 #endif
 	unsigned int i, numCat = numCategories();
 	unsigned int j, numEnt;
 	string exp;
 	for (i = 0; i < numCat; ++i) {
 		numEnt = numEntries(i);
 
 		exp = "\n== Category: ";
 		exp += dta[i].name;
 		exp += " ==\n";
 #ifndef PWM_EMBEDDED
 		if (f.writeBlock(exp.c_str(), exp.length()) != (Q_LONG)exp.length()) {
 				unlockAll_tempoary(true);
 				f.close();
 				return e_writeFile;
 		}
 #else
 		if (f.writeBlock(exp.c_str(), exp.length()) != (long)exp.length()) {
 				unlockAll_tempoary(true);
 				f.close();
 				return e_writeFile;
 		}
 #endif
 		for (j = 0; j < numEnt; ++j) {
 			exp = "\n-- ";
 			exp += dta[i].d[j].desc;
 			exp += " --\n";
 
 			exp += i18n("Username: ").latin1();
 			exp += dta[i].d[j].name;
 			exp += "\n";
 
 			exp += i18n("Password: ").latin1();
 			exp += dta[i].d[j].pw;
 			exp += "\n";
 
 			exp += i18n("Comment: ").latin1();
 			exp += dta[i].d[j].comment;
 			exp += "\n";
 
 			exp += i18n("URL: ").latin1();
 			exp += dta[i].d[j].url;
 			exp += "\n";
 
 			exp += i18n("Launcher: ").latin1();
 			exp += dta[i].d[j].launcher;
 			exp += "\n";
 
 #ifndef PWM_EMBEDDED
 			if (f.writeBlock(exp.c_str(), exp.length()) != (Q_LONG)exp.length()) {
 				unlockAll_tempoary(true);
 				f.close();
 				return e_writeFile;
 			}
 #else
 			if (f.writeBlock(exp.c_str(), exp.length()) != (long)exp.length()) {
 				unlockAll_tempoary(true);
 				f.close();
 				return e_writeFile;
 			}
 #endif
 		}
 	}
 	unlockAll_tempoary(true);
 	f.close();
 
 	return e_success;
 }
 
 PwMerror PwMDoc::importFromText(const QString *file, int format)
 {
 	PWM_ASSERT(file);
 	if (format == 0)
 		return importText_PwM(file);
 	else if (format == -1) {
 		// probe for all formats
 		if (importText_PwM(file) == e_success)
 			return e_success;
 		dta.clear();
 		emitDataChanged(this);
 		// add next format here...
 		return e_fileFormat;
 	}
 	return e_invalidArg;
 }
 
 PwMerror PwMDoc::importText_PwM(const QString *file)
 {
 	PWM_ASSERT(file);
 	FILE *f;
 	int tmp;
 	ssize_t ret;
 	string curCat;
 	unsigned int entriesRead = 0;
 	PwMDataItem currItem;
 	f = fopen(file->latin1(), "r");
 	if (!f)
 		return e_openFile;
 	size_t ch_tmp_size = 1024;
 	char *ch_tmp = (char*)malloc(ch_tmp_size);
 	if (!ch_tmp) {
 		fclose(f);
 		return e_outOfMem;
 	}
 
 	// - check header
 	if (getline(&ch_tmp, &ch_tmp_size, f) == -1) // skip first line.
 		goto formatError;
 	// check version-string and return version in "ch_tmp".
 	if (fscanf(f, "PwM v%s", ch_tmp) != 1) {
 		// header not recognized as PwM generated header
 		goto formatError;
 	}
 	// set filepointer behind version-string-line previously checked
 	if (getline(&ch_tmp, &ch_tmp_size, f) == -1)
 		goto formatError;
 	// skip next line containing the build-date
 	if (getline(&ch_tmp, &ch_tmp_size, f) == -1)
 		goto formatError;
 	// read header termination line
 	if (getline(&ch_tmp, &ch_tmp_size, f) == -1)
 		goto formatError;
 	if (strcmp(ch_tmp, "==============================\n"))
 		goto formatError;
 
 	// - read entries
 	do {
 		// find beginning of next category
 		do {
 			tmp = fgetc(f);
 		} while (tmp == '\n' && tmp != EOF);
 		if (tmp == EOF)
 			break;
 
 		// decrement filepos by one
 		fseek(f, -1, SEEK_CUR);
 		// read cat-name
 		if (getline(&ch_tmp, &ch_tmp_size, f) == -1)
 			goto formatError;
 		// check cat-name format
 		if (memcmp(ch_tmp, "== Category: ", 13) != 0)
 			goto formatError;
 		if (memcmp(ch_tmp + (strlen(ch_tmp) - 1 - 3), " ==", 3) != 0)
 			goto formatError;
 		// copy cat-name
 		curCat.assign(ch_tmp + 13, strlen(ch_tmp) - 1 - 16);
 
 		do {
 			// find beginning of next entry
 			do {
 				tmp = fgetc(f);
 			} while (tmp == '\n' && tmp != EOF && tmp != '=');
 			if (tmp == EOF)
 				break;
 			if (tmp == '=') {
 				fseek(f, -1, SEEK_CUR);
 				break;
 			}
 			// decrement filepos by one
 			fseek(f, -1, SEEK_CUR);
 			// read desc-line
 			if (getline(&ch_tmp, &ch_tmp_size, f) == -1)
 				goto formatError;
 			// check desc-line format
 			if (memcmp(ch_tmp, "-- ", 3) != 0)
 				goto formatError;
 			if (memcmp(ch_tmp + (strlen(ch_tmp) - 1 - 3), " --", 3) != 0)
 				goto formatError;
 			// add desc-line
 			currItem.desc.assign(ch_tmp + 3, strlen(ch_tmp) - 1 - 6);
 
 			// read username-line
 			if ((ret = getline(&ch_tmp, &ch_tmp_size, f)) == -1)
 				goto formatError;
 			if (!textExtractEntry_PwM(ch_tmp, ret, &currItem.name))
 				goto formatError;
 
 			// read pw-line
 			if ((ret = getline(&ch_tmp, &ch_tmp_size, f)) == -1)
 				goto formatError;
 			if (!textExtractEntry_PwM(ch_tmp, ret, &currItem.pw))
 				goto formatError;
 
 			// read comment-line
 			if ((ret = getline(&ch_tmp, &ch_tmp_size, f)) == -1)
 				goto formatError;
 			if (!textExtractEntry_PwM(ch_tmp, ret, &currItem.comment))
 				goto formatError;
 
 			// read URL-line
 			if ((ret = getline(&ch_tmp, &ch_tmp_size, f)) == -1)
 				goto formatError;
 			if (!textExtractEntry_PwM(ch_tmp, ret, &currItem.url))
 				goto formatError;
 
 			// read launcher-line
 			if ((ret = getline(&ch_tmp, &ch_tmp_size, f)) == -1)
 				goto formatError;
 			if (!textExtractEntry_PwM(ch_tmp, ret, &currItem.launcher))
 				goto formatError;
 
 			currItem.lockStat = true;
 			currItem.listViewPos = -1;
 			addEntry(curCat.c_str(), &currItem, true);
 			++entriesRead;
 		} while (1);
 	} while (1);
 	if (!entriesRead)
 		goto formatError;
 
 	free(ch_tmp);
 	fclose(f);
 	flagDirty();
 	return e_success;
 
       formatError:
 	free(ch_tmp);
 	fclose(f);
 	return e_fileFormat;
 }
 
 bool PwMDoc::textExtractEntry_PwM(const char *in, ssize_t in_size, string *out)
 {
 	PWM_ASSERT(in && out);
 	ssize_t i = 0, len = in_size - 1;
 	while (i < len) {
 		if (in[i] == ':')
 			break;
 		++i;
 	}
 	i += 2;
 	*out = "";
 	out->append(in + i, in_size - i - 1);
 	return true;
 }
 
 PwMerror PwMDoc::exportToGpasman(const QString *file)
 {
 	PWM_ASSERT(file);
 	GpasmanFile gp;
 	int ret;
 
 	if (!unlockAll_tempoary())
 		return e_lock;
 
 	QString gpmPassword;
 	while (1) {
 		gpmPassword = requestNewMpw(0);
 		if (gpmPassword == "") {
 			unlockAll_tempoary(true);
 			return e_noPw;
 		}
 		if (gpmPassword.length() < 4) {
 			gpmPwLenErrMsgBox();
 		} else {
 			break;
 		}
 	}
 
 	ret = gp.save_init(file->latin1(), gpmPassword.latin1());
 	if (ret != 1) {
 		unlockAll_tempoary(true);
 		return e_accessFile;
 	}
 
 	char *entry[4];
 	unsigned int numCat = numCategories(), i;
 	unsigned int numEntr, j;
 	int descLen, nameLen, pwLen, commentLen;
 	for (i = 0; i < numCat; ++i) {
 		numEntr = numEntries(i);
 		for (j = 0; j < numEntr; ++j) {
 			descLen = dta[i].d[j].desc.length();
 			nameLen = dta[i].d[j].name.length();
 			pwLen = dta[i].d[j].pw.length();
 			commentLen = dta[i].d[j].comment.length();
 			entry[0] = new char[descLen + 1];
 			entry[1] = new char[nameLen + 1];
 			entry[2] = new char[pwLen + 1];
 			entry[3] = new char[commentLen + 1];
 			strcpy(entry[0], descLen == 0 ? " " : dta[i].d[j].desc.c_str());
 			strcpy(entry[1], nameLen == 0 ? " " : dta[i].d[j].name.c_str());
 			strcpy(entry[2], pwLen == 0 ? " " : dta[i].d[j].pw.c_str());
 			strcpy(entry[3], commentLen == 0 ? " " : dta[i].d[j].comment.c_str());
 			entry[0][descLen == 0 ? descLen + 1 : descLen] = '\0';
 			entry[1][nameLen == 0 ? nameLen + 1 : nameLen] = '\0';
 			entry[2][pwLen == 0 ? pwLen + 1 : pwLen] = '\0';
 			entry[3][commentLen == 0 ? commentLen + 1 : commentLen] = '\0';
 
 			ret = gp.save_entry(entry);
 			if (ret == -1){
 				delete [] entry[0];
 				delete [] entry[1];
 				delete [] entry[2];
 				delete [] entry[3];
 				gp.save_finalize();
 				unlockAll_tempoary(true);
 				return e_writeFile;
 			}
 
 			delete [] entry[0];
 			delete [] entry[1];
 			delete [] entry[2];
 			delete [] entry[3];
 		}
 	}
 	unlockAll_tempoary(true);
 	if (gp.save_finalize() == -1)
 		return e_writeFile;
 
 	return e_success;
 }
 
 PwMerror PwMDoc::importFromGpasman(const QString *file)
 {
 	PWM_ASSERT(file);
 	QString pw = requestMpw(false);
 	if (pw == "")
 		return e_noPw;
 	GpasmanFile gp;
 	int ret, i;
 	PwMerror ret2;
 	char *entry[4];
 	PwMDataItem tmpData;
 	ret = gp.load_init(file->latin1(), pw.latin1());
 	if (ret != 1)
 		return e_accessFile;
 
 	do {
 		ret = gp.load_entry(entry);
 		if(ret != 1)
 			break;
 		tmpData.desc = entry[0];
 		tmpData.name = entry[1];
 		tmpData.pw = entry[2];
 		tmpData.comment = entry[3];
 		tmpData.lockStat = true;
 		tmpData.listViewPos = -1;
 		ret2 = addEntry(DEFAULT_CATEGORY, &tmpData, true);
 		for (i = 0; i < 4; ++i)
          		free(entry[i]);
 		if (ret2 == e_maxAllowedEntr) {
 			gp.load_finalize();
 			return e_maxAllowedEntr;
 		}
 	} while (1);
 	gp.load_finalize();
 	if (isDocEmpty())
 		return e_wrongPw; // we assume this.
 
 	flagDirty();
 	return e_success;
 }
 
 void PwMDoc::ensureLvp()
 {
 	if (isDocEmpty())
 		return;
 
 	vector< vector<PwMDataItem>::iterator > undefined;
 	vector< vector<PwMDataItem>::iterator >::iterator undefBegin,
 							  undefEnd,
 							  undefI;
 	vector<PwMCategoryItem>::iterator catBegin = dta.begin(),
 					  catEnd = dta.end(),
 					  catI = catBegin;
 	vector<PwMDataItem>::iterator entrBegin, entrEnd, entrI;
 	int lvpTop, tmpLvp;
 
 	while (catI != catEnd) {
 		lvpTop = -1;
 		undefined.clear();
 
 		entrBegin = catI->d.begin();
 		entrEnd = catI->d.end();
 		entrI = entrBegin;
 
 		while (entrI != entrEnd) {
 			tmpLvp = entrI->listViewPos;
 			if (tmpLvp == -1)
 				undefined.push_back(entrI);
 			else if (tmpLvp > lvpTop)
 				lvpTop = tmpLvp;
 			++entrI;
 		}
 		undefBegin = undefined.begin();
 		undefEnd = undefined.end();
 		undefI = undefBegin;
 		while (undefI != undefEnd) {
 			(*undefI)->listViewPos = ++lvpTop;
 			++undefI;
 		}
 		++catI;
 	}
 }
 
 QString PwMDoc::getTitle()
 {
 	/* NOTE: We have to ensure, that the returned title
 	 *       is unique and not reused somewhere else while
 	 *       this document is valid (open).
 	 */
 	QString title(getFilename());
 	if (title.isEmpty()) {
 		if (unnamedNum == 0) {
 			unnamedNum = PwMDocList::getNewUnnamedNumber();
 			PWM_ASSERT(unnamedNum != 0);
 		}
 		title = DEFAULT_TITLE;
 		title += " ";
 		title += tostr(unnamedNum).c_str();
 	}
 	return title;
 }
 
 bool PwMDoc::tryDelete()
 {
 	if (deleted)
 		return true;
 	int ret;
 	if (isDirty()) {
 		ret = dirtyAskSave(getTitle());
 		if (ret == 0) { // save to disk
 			if (!saveDocUi(this))
 				goto out_ignore;
 		} else if (ret == 1) { // don't save and delete
 			goto out_accept;
 		} else { // cancel operation
 			goto out_ignore;
 		}
 	}
 out_accept:
 	deleted = true;
 	delete this;
 	return true;
 out_ignore:
 	return false;
 }
 
+
+
+#ifdef PWM_EMBEDDED
+//US ENH: this is the magic function that syncronizes the this doc with the remote doc
+PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* syncRemote, int mode )
+{
+  bool syncOK = true;
+  int addedPasswordsLocal = 0;
+  int addedPasswordsRemote = 0;
+  int deletedPasswordsRemote = 0;
+  int deletedPasswordsLocal = 0;
+  int changedLocal = 0;
+  int changedRemote = 0;
+
+  QString mCurrentSyncName = manager->getCurrentSyncName();
+  QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
+
+
+
+
+
+
+
+
+
+  return e_success;
+}
+
+
+
+//this are the overwritten callbackmethods from the syncinterface
+bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
+{
+  QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
+
+  // construct on the stack = automatic cleanup.
+  PwMDoc syncTarget(this, "synctarget");
+
+  PwMerror err = syncTarget.openDoc(&filename, 2 /*== deeplocked*/);
+
+  if (err != e_success)
+    return false;
+  
+  qDebug("PWM file loaded %s,sync mode %d",filename.latin1(), mode );
+
+  
+  err = syncronize(manager, this, &syncTarget, mode );
+
+  if (err == e_success) {
+    if ( PWMPrefs::instance()->mWriteBackFile )	{
+      qDebug("Saving remote PWManager file");
+      err = syncTarget.saveDoc(conf()->confGlobCompression());
+      if (err != e_success)
+	return false;
+
+    }
+
+    flagDirty();
+    return true;
+  }
+  else {
+    return false;
+  }
+}
+
+//called by the syncmanager to indicate that the work has to marked as dirty.
+void PwMDoc::sync_setModified()
+{
+  flagDirty();
+}
+
+//called by the syncmanager to ask if the dirty flag is set.
+bool PwMDoc::sync_isModified()
+{
+  return isDirty();
+}
+
+//called by the syncmanager to indicate that the work has to be saved.
+void PwMDoc::sync_save()
+{
+  PwMerror ret = saveDoc(conf()->confGlobCompression());
+}
+
+#endif
+
+
+
+
+
+
+
+
 #ifndef PWM_EMBEDDED
 #include "pwmdoc.moc"
 #endif
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 193247e..ea4d687 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -1,701 +1,724 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003, 2004 by Michael Buesch                            *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 2.0 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef __PWMDOC_H
 #define __PWMDOC_H
 
 #define PWM_FILE_VER		(static_cast<char>(0x05))
 
 #define PWM_HASH_SHA1		(static_cast<char>(0x01))
 #define PWM_HASH_SHA256		(static_cast<char>(0x02))
 #define PWM_HASH_SHA384		(static_cast<char>(0x03))
 #define PWM_HASH_SHA512		(static_cast<char>(0x04))
 #define PWM_HASH_MD5		(static_cast<char>(0x05))
 #define PWM_HASH_RMD160		(static_cast<char>(0x06))
 #define PWM_HASH_TIGER		(static_cast<char>(0x07))
 
 #define PWM_CRYPT_BLOWFISH	(static_cast<char>(0x01))
 #define PWM_CRYPT_AES128	(static_cast<char>(0x02))
 #define PWM_CRYPT_AES192	(static_cast<char>(0x03))
 #define PWM_CRYPT_AES256	(static_cast<char>(0x04))
 #define PWM_CRYPT_3DES		(static_cast<char>(0x05))
 #define PWM_CRYPT_TWOFISH	(static_cast<char>(0x06))
 #define PWM_CRYPT_TWOFISH128	(static_cast<char>(0x07))
 
 #define PWM_COMPRESS_NONE	(static_cast<char>(0x00))
 #define PWM_COMPRESS_GZIP	(static_cast<char>(0x01))
 #define PWM_COMPRESS_BZIP2	(static_cast<char>(0x02))
 
 #define DEFAULT_MAX_ENTRIES	(~(static_cast<unsigned int>(0)))
 #define FILE_ID_HEADER  	"PWM_PASSWORD_FILE"
 
 
 #include "pwmexception.h"
 #include "pwmdocui.h"
 
 #include <qobject.h>
 #include <qtimer.h>
 #include <qdatetime.h>
 
 #include <kprocess.h>
 
 #ifndef PWM_EMBEDDED
 #include "configuration.h"
 #else
 #include <kapplication.h>
+#include <ksyncmanager.h>
 #endif
 
 #include <string>
 #include <vector>
 #include <utility>
 
 using std::vector;
 using std::string;
 using std::pair;
 
 /* used in findEntry() function */
 #define SEARCH_IN_DESC		(1)
 #define SEARCH_IN_NAME		(1 << 1)
 #define SEARCH_IN_PW		(1 << 2)
 #define SEARCH_IN_COMMENT	(1 << 3)
 #define SEARCH_IN_URL		(1 << 4)
 #define SEARCH_IN_LAUNCHER	(1 << 5)
 #define SEARCH_IN_ALL		(SEARCH_IN_DESC	| SEARCH_IN_NAME	|  \
 				 SEARCH_IN_PW	| SEARCH_IN_COMMENT	|  \
 				 SEARCH_IN_URL	| SEARCH_IN_LAUNCHER)
 
 /** document deeplocked. Data is out for lunch to disk */
 #define DOC_STAT_DEEPLOCKED		(1)
 /** encrypted document on disk is dirty. data has to go to disk. */
 #define DOC_STAT_DISK_DIRTY		(1 << 1)
 /** we are using a chipcard to encrypt the data */
 #define DOC_STAT_USE_CHIPCARD		(1 << 2)
 /** use "currentPw" to unlock. (This flag is set/unset by a timer) */
 #define DOC_STAT_UNLOCK_WITHOUT_PW	(1 << 3)
 
 class PwMDoc;
 class PwMView;
 class QFile;
 
 /* meta data for a PwMDataItem */
 struct PwMMetaData
 {
 	PwMMetaData()
 	 : updateInt (0)
 		{ }
 	/** creation date of the PwMDataItem to which
 	  * this meta data belongs.
 	  */
 	QDateTime	create;
 	/** becomes valid on this date */
 	QDateTime	valid;
 	/** expire date */
 	QDateTime	expire;
 	/** update date (last updated at this date) */
 	QDateTime	update;
 	/** update interval (in minutes). Time since the
 	  * last update to remind the user to update the item.
 	  * 0 disables.
 	  */
 	unsigned long updateInt;
  
   //US ENH: enhancements of the filestructure
   /* each entry gets a unique id assigned  */
   QString  uniqueid;
 
 
 	void clear()
 		{
 			create = QDateTime();
 			expire = QDateTime();
 			update = QDateTime();
 			updateInt = 0;
 			uniqueid = KApplication::randomString(8);
 		}
 	inline bool isValid() const
 		{
 			if (valid.isNull())
 				return true;
 			return (valid < QDateTime::currentDateTime());
 		}
 	inline bool isExpired() const
 		{
 			if (expire.isNull())
 				return false;
 			return (expire < QDateTime::currentDateTime());
 		}
 	inline bool isUpdateIntOver() const
 		{
 			if (updateInt == 0 ||
 			    update.isNull())
 				return false;
 			QDateTime d(update);
 			return (d.addSecs(updateInt * 60) < QDateTime::currentDateTime());
 		}
 };
 
 struct PwMDataItem
 {
 	PwMDataItem()
 	 : lockStat (true)
 	 , listViewPos (-1)
 	 , binary (false)
 	 , rev (0)
 		{ }
 
 	/** password description */
 	string	desc;
 	/** user-name */
 	string	name;
 	/** the password itself */
 	string	pw;
 	/** some comment */
 	string	comment;
 	/** an URL string */
 	string	url;
 	/** launcher. Can be executed as a system() command */
 	string	launcher;
 	/** locking status. If locked (true), pw is not emitted through getEntry() */
 	bool	lockStat;
 	/** position of this item in main "list-view"
 	  * If -1, the position is not yet specified and should be appended to the list
 	  */
 	int	listViewPos;
 	/** does this entry contain binary data? */
 	bool binary;
 	/** meta data for this data item. */
 	PwMMetaData meta;
 	/** data revision counter. This counter can be used
 	  * to easily, efficiently determine if this data item
 	  * has changed since some time.
 	  * This counter is incremented on every update.
 	  */
 	unsigned int rev;
 
 	void clear(bool clearMeta = true)
 	{
 		/* NOTE: Don't use .clear() here to be
 		 *       backward compatible with gcc-2 (Debian Woody)
 		 */
 		desc = "";
 		name = "";
 		pw = "";
 		comment = "";
 		url = "";
 		launcher = "";
 		lockStat = true;
 		listViewPos = -1;
 		binary = false;
 		if (clearMeta)
 			meta.clear();
 	}
 };
 
 struct PwMCategoryItem
 {
 	/** all PwMDataItems (all passwords) within this category */
 	vector<PwMDataItem>	d;
 	/** category name/description */
 	string			name;
 
 	void clear()
 	{
 		d.clear();
 		name = "";
 	}
 };
 
 /** "Function Object" for sort()ing PwMDataItem::listViewPos */
 class dta_lvp_greater
 {
 public:
 	bool operator() (const pair<unsigned int, unsigned int> &d1,
 			 const pair<unsigned int, unsigned int> &d2)
 	{
 		return d1.second > d2.second;
 	}
 };
 
 /** list of PwMDoc documents and it's IDs */
 class PwMDocList
 {
 public:
 	struct listItem
 	{
 		/** document filename (known as ID, here) */
 		string docId;
 		/** pointer to the document class */
 		PwMDoc *doc;
 	};
 
 	PwMDocList() {}
 
 	/** add a new item to the list */
 	void add(PwMDoc *doc, const string &id);
 	/** changes the contents of an existing item */
 	void edit(PwMDoc *doc, const string &newId);
 	/** remove the given item */
 	void del(PwMDoc *doc);
 	/** get the item at index */
 	listItem getAt(int index)
 			{ return docList[index]; }
 	/** find an entry with this id */
 	bool find(const string &id, listItem *ret = 0);
 	/** returns a copy of the list */
 	const vector<listItem>* getList() const
 			{ return &docList; }
 
 
 	/** returns a new unique number to extend the name of
 	  * an unnamed document.
 	  */
 	static unsigned int getNewUnnamedNumber()
 			{ return unnamedDocCnt++; }
 
 protected:
 	/* Hm, I think we shouldn't really use a "list" here, should we?
 	 * So I decided to actually use a vector.
 	 */
 	vector<listItem> docList;
 	/** This value is used to get a new number for yet unnamed
 	  * documents. It is incremented on every request. So it's
 	  * theoretically possible to overflow it, but... :)
 	  */
 	static unsigned int unnamedDocCnt;
 };
 
 /** implements timers for the document */
 class DocTimer : public QObject
 {
 	Q_OBJECT
 public:
 	enum TimerIDs
 	{
 		id_mpwTimer,
 		id_autoLockTimer,
 		id_metaCheckTimer
 	};
 
 public:
 	DocTimer(PwMDoc *_doc);
 	~DocTimer();
 
 	/** start the timer */
 	void start(TimerIDs timer);
 	/** stop the timer */
 	void stop(TimerIDs timer);
 	/** get the lock for a timer.
 	  * This lock is a recursive lock. When a lock is
 	  * held, the timer will be stopped and timeout is
 	  * guaranteed to not happen
 	  */
 	void getLock(TimerIDs timer);
 	/** put a recursive timer lock */
 	void putLock(TimerIDs timer);
 
 protected slots:
 	/** timeout slot for the mpw timer */
 	void mpwTimeout();
 	/** timeout slot for the autoLock timer */
 	void autoLockTimeout();
 	/** timeout slot for the metaCheck timer */
 	void metaCheckTimeout();
 
 protected:
 	/** pointer to the document associated with this timer. */
 	PwMDoc *doc;
 	/** timer object for mpw timer */
 	QTimer *mpwTimer;
 	/** timer object for the autoLock timer */
 	QTimer *autoLockTimer;
 	/** timer object for the metaCheck timer */
 	QTimer *metaCheckTimer;
 	/** lock counter for the mpw timer */
 	unsigned int mpwLock;
 	/** lock counter for the autoLock timer */
 	unsigned int autoLockLock;
 	/** lock counter for the metaCheck timer */
 	unsigned int metaCheckLock;
 };
 
 /** Document class for PwM */
-class PwMDoc : public PwMDocUi
+//US ENH: derived from KSyncInterfaces, to get called by PwM when a sync is required.
+// But PwMDoc is handling the sync by itself.
+class PwMDoc : public PwMDocUi, public KSyncInterface
+
 {
 	Q_OBJECT
 	friend class DocTimer;
 
 public:
 	/** construtor */
 	PwMDoc(QObject* parent = 0, const char *name = 0);
 	/** destructor */
 	~PwMDoc();
 
 	/** returns a pointer to a list of all open documents */
 	static PwMDocList* getOpenDocList()
 			{ return &openDocList; }
 
 	/** flag document dirty. dta changed */
 	void flagDirty()
 		{
 			setDocStatFlag(DOC_STAT_DISK_DIRTY);
 			emitDataChanged(this);
 		}
 	/** modified? */
 	bool isDirty()
 			{ return getDocStatFlag(DOC_STAT_DISK_DIRTY); }
 	/** save document to disk */
 	PwMerror saveDoc(char compress, const QString *file = 0);
 	/** read document from file.
 	  * "openLocked is must be set to either of these values:
 	  *  0 == open with all entries unlocked
 	  *  1 == open with all entries locked
 	  *  2 == open deep-locked
 	  */
 	PwMerror openDoc(const QString *file, int openLocked);
 	/** export document to ascii-textfile */
 	PwMerror exportToText(const QString *file);
 	/** export document to gpasman / kpasman file */
 	PwMerror exportToGpasman(const QString *file);
 	/** import document from ascii-textfile */
 	PwMerror importFromText(const QString *file, int format = -1);
 	/** import document from gpasman / kpasman file */
 	PwMerror importFromGpasman(const QString *file);
 	/** add new entry */
 	PwMerror addEntry(const QString &category, PwMDataItem *d,
 			  bool dontFlagDirty = false, bool updateMeta = true);
 	/** add new category. This function doesn't flag the document dirty! */
 	PwMerror addCategory(const QString &category, unsigned int *categoryIndex,
 			     bool checkIfExist = true);
 	/** rename an existing category */
 	bool renameCategory(const QString &category, const QString &newName);
 	/** rename an existing category */
 	bool renameCategory(unsigned int category, const QString &newName,
 			    bool dontFlagDirty = false);
 	/** delete an existing category */
 	bool delCategory(const QString &category);
 	/** delete an existing category */
 	bool delCategory(unsigned int category, bool dontFlagDirty = false);
 	/** returns a list of all category-names */
 	void getCategoryList(vector<string> *list);
 	/** returns a list of all category-names */
 	void getCategoryList(QStringList *list);
 	/** returns a list of all entry-descs in the given category */
 	void getEntryList(const QString &category, QStringList *list);
 	/** returns a list of all entry-descs in the given category */
 	void getEntryList(const QString &category, vector<string> *list);
 	/** returns a list of all entry-descs in the given category */
 	void getEntryList(unsigned int category, vector<string> *list);
 	/** returns a list of all entry-descs in the given category */
 	void getEntryList(unsigned int category, QStringList *list);
 	/** delete entry */
 	bool delEntry(const QString &category, unsigned int index, bool dontFlagDirty = false);
 	/** delete entry */
 	bool delEntry(unsigned int category, unsigned int index, bool dontFlagDirty = false);
 	/** edit entry */
 	bool editEntry(const QString &oldCategory, const QString &newCategory,
 		       unsigned int index, PwMDataItem *d, bool updateMeta = true);
 	/** edit entry */
 	bool editEntry(unsigned int oldCategory, const QString &newCategory,
 		       unsigned int index, PwMDataItem *d, bool updateMeta = true);
 	/** finds the category with the "name" and return it's index */
 	bool findCategory(const QString &name, unsigned int *index);
 	/** search for an entry "find" and check while searching only for
 	  * the data-fields specified by "searchIn". To set the "searchIn"
 	  * value, we may use one or more of the SEARCH_IN_* defines at
 	  * the top of this header-file. It returns the positions of all
 	  * matched entries in "foundPositions". If "breakAfterFound" is true,
 	  * the function terminates after the first occurence of the entry
 	  * and doesn't go on searching. So foundPositions->size() is never
 	  * > 1 if breakAfterFound is true.
 	  */
 	void findEntry(unsigned int category, PwMDataItem find, unsigned int searchIn,
 		       vector<unsigned int> *foundPositions, bool breakAfterFound = false,
 		       bool caseSensitive = true, bool exactWordMatch = true,
 		       bool sortByLvp = false);
 	/** see the above funtion. This function allows to set the category by name. */
 	void findEntry(const QString &category, PwMDataItem find, unsigned int searchIn,
 		       vector<unsigned int> *foundPositions, bool breakAfterFound = false,
 		       bool caseSensitive = true, bool exactWordMatch = true,
 		       bool sortByLvp = false);
 	/** returns number of entries */
 	unsigned int numEntries(const QString &category);
 	unsigned int numEntries(unsigned int category)
 			{ return dta[category].d.size(); }
 	/** returns number of categories */
 	unsigned int numCategories()
 			{ return dta.size(); }
 	/** returns the name of the category at "index" */
 	const string* getCategory(unsigned int index)
 			{ return (&(dta[index].name)); }
 	/** returns the data of item at "index".
 	  * It unlocks the entry if it's locked and unlockIfLocked is true.
 	  * If the entry is locked, but unlockIfLocked is false, it'll not return
 	  * the pw.
 	  */
 	bool getEntry(const QString &category, unsigned int index,
 		      PwMDataItem *d, bool unlockIfLocked = false);
 	bool getEntry(unsigned int category, unsigned int index,
 		      PwMDataItem *d, bool unlockIfLocked = false);
 	/** returns the comment-string by looking at the category
 	  * and the listViewPos
 	  */
 	PwMerror getCommentByLvp(const QString &category, int listViewPos,
 				 string *foundComment);
 	/** checks if a password is already available. (currentPw) */
 	bool isPwAvailable()
 			{ return (currentPw != ""); }
 	/** un/lock entry at "index". If needed, ask for password. */
 	bool lockAt(const QString &category, unsigned int index,
 		    bool lock = true);
 	bool lockAt(unsigned int category, unsigned int index,
 		    bool lock = true);
 	/** returns the lock-status at "index" */
 	bool isLocked(const QString &category, unsigned int index);
 	bool isLocked(unsigned int category, unsigned int index)
 			{ return dta[category].d[index].lockStat; }
 	/** returns the deeplock status */
 	bool isDeepLocked()
 			{ return getDocStatFlag(DOC_STAT_DEEPLOCKED); }
 	/** (un)lock all entries */
 	bool lockAll(bool lock);
 	/** unlocks all entries tempoarly.
 	  * 1st NOTE: Be very careful with this function! :)
 	  * 2nd NOTE: After you have called unlockAll_Tempoary(); ,
 	  *           please DON'T forget to call unlockAll_Tempoary(true);
 	  *           _before_ the user (or someone else) is able to change
 	  *           the document!
 	  * 3rd NOTE: Please DON'T change "dta" while the data is tempoary
 	  *           unlocked! This will cause corruption.
 	  */
 	bool unlockAll_tempoary(bool revert = false);
 	/** deep-(un)locks the document.
 	  * deep-locking writes all data to the file, deletes all data
 	  * in memory, but doesn't close the document.
 	  * deep-locking is only available, if the user previously saved
 	  * the doc to a file (with a password).
 	  * If "saveToFile" is false, it does NOT write the data to the file!
 	  */
 	PwMerror deepLock(bool lock = true, bool saveToFile = true);
 	/** is unlockable without pw? */
 	bool unlockWoPw()
 			{ return getDocStatFlag(DOC_STAT_UNLOCK_WITHOUT_PW); }
 	/** get the "currentPassword" */
 	const QString& getCurrentPw()
 			{ return currentPw; }
 	/** open a window and request the user to change the mpw */
 	void changeCurrentPw();
 	/** set the "listViewPos" variable of "dta" */
 	void setListViewPos(const QString &category, unsigned int index,
 			    int pos);
 	/** set the "listViewPos" variable of "dta" */
 	void setListViewPos(unsigned int category, unsigned int index,
 			    int pos);
 	/** get the "listViewPos" variable of "dta" */
 	int getListViewPos(const QString &category, unsigned int index);
 	/** set the maximum number of entries allowed */
 	void setMaxNumEntries(unsigned int num = DEFAULT_MAX_ENTRIES)
 			{ maxEntries = num; }
 	/** get the maximum number of entries allowed */
 	unsigned int getMaxNumEntries()
 			{ return maxEntries; }
 	/** ensure all listViewPos of all dta items are set. (are ! -1).
 	  * If there are some undefined entries, add them to the end of
 	  * the listViewPos(itions). */
 	void ensureLvp();
 	/** execute the "launcher" of this entry */
 	bool execLauncher(const QString &category, unsigned int entryIndex);
 	/** see above */
 	bool execLauncher(unsigned int category, unsigned int entryIndex);
 	/** open a browser with the URL-section of the given entry */
 	bool goToURL(const QString &category, unsigned int entryIndex);
 	/** see above */
 	bool goToURL(unsigned int category, unsigned int entryIndex);
 	/** returns true if there is no entry present in the document.
 	  * Note: The "default" Category is present everytime, so
 	  *       it's checked for it's entries.
 	  */
 	bool isDocEmpty()
 		{
 			if (numCategories() > 1)
 				return false;
 			if (numEntries(0))
 				return false;
 			return true;
 		}
 	/** returns the filename of this doc */
 	const QString& getFilename()
 			{ return filename; }
 	/** returns the title of the doc */
 	QString getTitle();
 	/** sets the list-view-pointer hold in the doc */
 	void setListViewPointer(PwMView *_listView)
 			{ listView = _listView; }
 	/** returns the list-view-pointer */
 	PwMView * getListViewPointer()
 			{ return listView; }
 	/** try to delete the doc. The user may be asked to save
 	  * the data. The user may cancel the whole operation.
 	  * false is returned, then.
 	  */
 	bool tryDelete();
 	/** is the doc deleted? (with tryDelete() ) */
 	bool isDeleted()
 			{ return deleted; }
 	/** returns the document timer object */
 	DocTimer * timer()
 			{ return _timer; }
 	/** get a lock on the dataChanged signal.
 	  * If someone is holding a lock, the signal is not emitted.
 	  */
 	void getDataChangedLock()
 			{ ++dataChangedLock; }
 	/** put the dataChanged lock */
 	void putDataChangedLock()
 			{ --dataChangedLock; }
 	/** returns the revision count of the item at cat/index */
 	unsigned int getEntryRevCnt(unsigned int category, unsigned int index)
 			{ return dta[category].d[index].rev; }
 	/** returns a const pointer to the entries meta */
 	const PwMMetaData * getEntryMeta(unsigned int category, unsigned int index)
 			{ return &(dta[category].d[index].meta); }
 	/** is the entry at "category" "index" a binary entry? */
 	bool isBinEntry(unsigned int category, unsigned int index)
 			{ return dta[category].d[index].binary; }
 
 public slots:
 	/** wrapper for PwMTray */
 	void _deepUnlock();
 
 signals:
 	/** the data of the document has changed and must be updated
 	  * in all views.
 	  * NOTE: use emitDataChanged(PwMDoc *document) to emit this signal!
 	  */
 	void dataChanged(PwMDoc *document);
 	/** the document class is going to close. This signal may be
 	  * used to nofify all views, that the user closed the document,
 	  * so the views can go down, too.
 	  */
 	void docClosed(PwMDoc *document);
 	/** somebody just opened the document */
 	void docOpened(PwMDoc *document);
 	/** this document object just got created */
 	void docCreated(PwMDoc *document);
 
 public:
 	/** emit the dataChanged signal after checking for a lock */
 	void emitDataChanged(PwMDoc *document)
 		{
 			if (!dataChangedLock)
 				emit dataChanged(document);
 		}
 
 protected:
 	/** current file for this doc */
 	QString filename;
 	/** holds all data */
 	vector<PwMCategoryItem> dta;
 	/** maximum number of entries */
 	unsigned int maxEntries;
 	/** currently used password to encrypt data */
 	QString currentPw;
 	/** current global document status flags */
 	unsigned int curDocStat;
 	/** browser process for goToURL() */
 	KProcess browserProc;
 	/** pointer to the list-view, using this document.
 	  * As there can only be one list-view per doc, we
 	  * don't need a list here.
 	  */
 	PwMView *listView;
 	/** unnamedNum is used to store the "unnamed counter"
 	  * for this document, while it's unnamed. If it's 0,
 	  * we have to get a new unique one.
 	  */
 	unsigned int unnamedNum;
 	/** is this doc going to be deleted (executing in destructor context) */
 	bool deleted;
 	/** document timer */
 	DocTimer *_timer;
 	/** lock counter for the "dataChanged" signal */
 	unsigned int dataChangedLock;
 
 	/** list of all open documents */
 	static PwMDocList openDocList;
 
 protected:
 	/** serialize "dta" and return it in "d". */
 	bool serializeDta(string *d);
 	/** de-serialize "d" and overwrite "dta" */
 	bool deSerializeDta(const string *d, bool entriesLocked);
 	/** write header to file */
 	PwMerror writeFileHeader(char keyHash, char dataHash, char crypt, char compress,
 				 QString *pw, QFile *f);
 	/** write data-hash to file */
 	PwMerror writeDataHash(char dataHash, string *d, QFile *f);
 	/** check header. Read header info and verify key-hash and filever.
 	  * returns length of header in "headerLength" */
 	PwMerror checkHeader(char *cryptAlgo, QString *pw, char *compress,
 			     unsigned int *headerLength, char *dataHashType,
 			     string *dataHash, QFile *f);
 	/** check the data-hash */
 	PwMerror checkDataHash(char dataHashType, const string *dataHash, const string *dataStream);
 	/** encrypt data "d" and write to "filename" */
 	PwMerror encrypt(string *d, const QString *pw, QFile *f, char algo);
 	/** read data from file beginning at "pos", decrypt and return it */
 	PwMerror decrypt(string *d, unsigned int pos, const QString *pw, char algo, QFile *f);
 	/** compress the data */
 	bool compressDta(string *d, char algo);
 	/** uncompress the data */
 	bool decompressDta(string *d, char algo);
 	/** internal import function for a text-file generated by PwM.
 	  * If this is not a valid PwM-exported file, it returns e_fileFormat */
 	PwMerror importText_PwM(const QString *file);
 	/** PwM-text-import helper function to extract the name/pw/comment out
 	  * of one entry-line */
 	bool textExtractEntry_PwM(const char *in, ssize_t in_size, string *out);
 	/** compare two strings */
 	bool compareString(const string &s1, const string &s2, bool caseSensitive,
 			   bool exactWordMatch);
 	/** clears all document-data */
 	void clearDoc();
 	/** delete all empty categories */
 	void delAllEmptyCat(bool dontFlagDirty);
 	/** set a document status flag */
 	void setDocStatFlag(unsigned int statFlag)
 			{ curDocStat |= statFlag; }
 	/** unset a document status flag */
 	void unsetDocStatFlag(unsigned int statFlag)
 			{ curDocStat &= ~statFlag; }
 	/** get a document status flag */
 	bool getDocStatFlag(unsigned int statFlag) const
 			{ return (curDocStat & statFlag); }
 	/** set the "currentPassword" */
 	void setCurrentPw(const QString &pw)
 		{
 			currentPw = pw;
 			setDocStatFlag(DOC_STAT_DISK_DIRTY);
 		}
 	/** make a backup-copy of the given file */
 	bool backupFile(const QString &filePath);
 	/** copy a file from src to dst */
 	bool copyFile(const QString &src, const QString &dst);
+
+
+ public:
+#ifdef PWM_EMBEDDED
+	//US ENH: this is the magic function that syncronizes the local doc with the remote doc.
+	PwMerror syncronize(KSyncManager* manager, PwMDoc* syncLocal, PwMDoc* syncRemote, int mode );
+
+
+	//the following methods are the overwritten callbackmethods from the syncinterface
+	virtual bool sync(KSyncManager* manager, QString filename, int mode);
+
+	//called by the syncmanager to indicate that the work has to be marked as dirty.
+	virtual void sync_setModified();
+	//called by the syncmanager to ask if the dirty flag is set.
+	virtual bool sync_isModified();
+	//called by the syncmanager to indicate that the work has to be saved.
+	virtual void sync_save();
+#endif
+
 };
 
 #endif