final changes for addressbook sync config dialog

19 files changed, 446 insertions, 448 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 20310a0..c61b387 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -1,622 +1,622 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 /*US
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
 */
 #include <qptrlist.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include "addressbook.h"
 #include "resource.h"
 
 //US #include "addressbook.moc"
 
 using namespace KABC;
 
 struct AddressBook::AddressBookData
 {
   Addressee::List mAddressees;
   Addressee::List mRemovedAddressees;
   Field::List mAllFields;
   KConfig *mConfig;
   KRES::Manager<Resource> *mManager;
 //US  ErrorHandler *mErrorHandler;
 };
 
 struct AddressBook::Iterator::IteratorData
 {
   Addressee::List::Iterator mIt;
 };
 
 struct AddressBook::ConstIterator::ConstIteratorData
 {
   Addressee::List::ConstIterator mIt;
 };
 
 AddressBook::Iterator::Iterator()
 {
   d = new IteratorData;
 }
 
 AddressBook::Iterator::Iterator( const AddressBook::Iterator &i )
 {
   d = new IteratorData;
   d->mIt = i.d->mIt;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator=( const AddressBook::Iterator &i )
 {
   if( this == &i ) return *this; // guard against self assignment
   delete d; // delete the old data the Iterator was completely constructed before
   d = new IteratorData;
   d->mIt = i.d->mIt;
   return *this;
 }
 
 AddressBook::Iterator::~Iterator()
 {
   delete d;
 }
 
 const Addressee &AddressBook::Iterator::operator*() const
 {
   return *(d->mIt);
 }
 
 Addressee &AddressBook::Iterator::operator*()
 {
   return *(d->mIt);
 }
 
 Addressee *AddressBook::Iterator::operator->()
 {
   return &(*(d->mIt));
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator++()
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator++(int)
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator--()
 {
   (d->mIt)--;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator--(int)
 {
   (d->mIt)--;
   return *this;
 }
 
 bool AddressBook::Iterator::operator==( const Iterator &it )
 {
   return ( d->mIt == it.d->mIt );
 }
 
 bool AddressBook::Iterator::operator!=( const Iterator &it )
 {
   return ( d->mIt != it.d->mIt );
 }
 
 
 AddressBook::ConstIterator::ConstIterator()
 {
   d = new ConstIteratorData;
 }
 
 AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i )
 {
   d = new ConstIteratorData;
   d->mIt = i.d->mIt;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i )
 {
   if( this  == &i ) return *this; // guard for self assignment
   delete d; // delete the old data because the Iterator was really constructed before
   d = new ConstIteratorData;
   d->mIt = i.d->mIt;
   return *this;
 }
 
 AddressBook::ConstIterator::~ConstIterator()
 {
   delete d;
 }
 
 const Addressee &AddressBook::ConstIterator::operator*() const
 {
   return *(d->mIt);
 }
 
 const Addressee* AddressBook::ConstIterator::operator->() const
 {
   return &(*(d->mIt));
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++()
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int)
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--()
 {
   (d->mIt)--;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int)
 {
   (d->mIt)--;
   return *this;
 }
 
 bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
 {
   return ( d->mIt == it.d->mIt );
 }
 
 bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 {
   return ( d->mIt != it.d->mIt );
 }
 
 
 AddressBook::AddressBook()
 {
   init(0, "contact");
 }
 
 AddressBook::AddressBook( const QString &config )
 {
   init(config, "contact");
 }
 
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
   init(config, family);
 
 }
 
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
   d = new AddressBookData;
   if (config != 0) {
-    d->mConfig = new KConfig( config );
+    d->mConfig = new KConfig( locateLocal("config", config) );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
   }
   else {
     d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
   }
 
 //US  d->mErrorHandler = 0;
   d->mManager = new KRES::Manager<Resource>( family, false );
   d->mManager->readConfig( d->mConfig );
 }
 
 AddressBook::~AddressBook()
 {
   delete d->mConfig; d->mConfig = 0;
   delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
   delete d; d = 0;
 }
 
 bool AddressBook::load()
 {
 
 
   clear();
 
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
       error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
     }
 
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
   for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
     (*addrIt).setChanged( false );
 
   return ok;
 }
 
 bool AddressBook::save( Ticket *ticket )
 {
   kdDebug(5700) << "AddressBook::save()"<< endl;
 
   if ( ticket->resource() ) {
     deleteRemovedAddressees();
 
     return ticket->resource()->save( ticket );
   }
 
   return false;
 }
 
 AddressBook::Iterator AddressBook::begin()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::begin() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::Iterator AddressBook::end()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.end();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::end() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.end();
   return it;
 }
 
 void AddressBook::clear()
 {
   d->mAddressees.clear();
 }
 
 Ticket *AddressBook::requestSaveTicket( Resource *resource )
 {
   kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
 
   if ( !resource )
   {
     qDebug("AddressBook::requestSaveTicket no resource" );
     resource = standardResource();
   }
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( (*it) == resource ) {
       if ( (*it)->readOnly() || !(*it)->isOpen() )
         return 0;
       else
         return (*it)->requestSaveTicket();
     }
   }
 
   return 0;
 }
 
 void AddressBook::insertAddressee( const Addressee &a )
 {
   Addressee::List::Iterator it;
   for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
       bool changed = false;
       Addressee addr = a;
       if ( addr != (*it) )
         changed = true;
 
       (*it) = a;
       if ( (*it).resource() == 0 )
         (*it).setResource( standardResource() );
 
       if ( changed ) {
         (*it).setRevision( QDateTime::currentDateTime() );
         (*it).setChanged( true );
       }
 
       return;
     }
   }
   d->mAddressees.append( a );
   Addressee& addr = d->mAddressees.last();
   if ( addr.resource() == 0 )
     addr.setResource( standardResource() );
 
   addr.setChanged( true );
 }
 
 void AddressBook::removeAddressee( const Addressee &a )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
       removeAddressee( it );
       return;
     }
   }
 }
 
 void AddressBook::removeAddressee( const Iterator &it )
 {
   d->mRemovedAddressees.append( (*it) );
   d->mAddressees.remove( it.d->mIt );
 }
 
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
       return it;
     }
   }
   return end();
 }
 
 Addressee AddressBook::findByUid( const QString &uid )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( uid == (*it).uid() ) {
       return *it;
     }
   }
   return Addressee();
 }
 
 Addressee::List AddressBook::allAddressees()
 {
   return d->mAddressees;
 }
 
 Addressee::List AddressBook::findByName( const QString &name )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( name == (*it).name() ) {
       results.append( *it );
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
   Addressee::List results;
   QStringList mailList;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     mailList = (*it).emails();
     for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
       if ( email == (*ite) ) {
         results.append( *it );
       }
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByCategory( const QString &category )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( (*it).hasCategory( category) ) {
       results.append( *it );
     }
   }
 
   return results;
 }
 
 void AddressBook::dump() const
 {
   kdDebug(5700) << "AddressBook::dump() --- begin ---" << endl;
 
   ConstIterator it;
   for( it = begin(); it != end(); ++it ) {
     (*it).dump();
   }
 
   kdDebug(5700) << "AddressBook::dump() ---  end  ---" << endl;
 }
 
 QString AddressBook::identifier()
 {
   QStringList identifier;
 
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( !(*it)->identifier().isEmpty() )
       identifier.append( (*it)->identifier() );
   }
 
   return identifier.join( ":" );
 }
 
 Field::List AddressBook::fields( int category )
 {
   if ( d->mAllFields.isEmpty() ) {
     d->mAllFields = Field::allFields();
   }
 
   if ( category == Field::All ) return d->mAllFields;
 
   Field::List result;
   Field::List::ConstIterator it;
   for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) {
     if ( (*it)->category() & category ) result.append( *it );
   }
 
   return result;
 }
 
 bool AddressBook::addCustomField( const QString &label, int category,
                                   const QString &key, const QString &app )
 {
   if ( d->mAllFields.isEmpty() ) {
     d->mAllFields = Field::allFields();
   }
 //US  QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
   QString a = app.isNull() ? KGlobal::getAppName() : app;
 
   QString k = key.isNull() ? label : key;
 
   Field *field = Field::createCustomField( label, category, k, a );
 
   if ( !field ) return false;
 
   d->mAllFields.append( field );
 
   return true;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
 {
   if (!ab.d) return s;
 
   return s << ab.d->mAddressees;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
 {
   if (!ab.d) return s;
 
   s >> ab.d->mAddressees;
 
   return s;
 }
 
 bool AddressBook::addResource( Resource *resource )
 {
   if ( !resource->open() ) {
     kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl;
     return false;
   }
 
   resource->setAddressBook( this );
 
   d->mManager->add( resource );
   return true;
 }
 
 bool AddressBook::removeResource( Resource *resource )
 {
   resource->close();
 
   if ( resource == standardResource() )
     d->mManager->setStandardResource( 0 );
 
   resource->setAddressBook( 0 );
 
   d->mManager->remove( resource );
   return true;
 }
 
 QPtrList<Resource> AddressBook::resources()
 {
   QPtrList<Resource> list;
 
 //  qDebug("AddressBook::resources() 1");
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     list.append( *it );
 
   return list;
 }
 
 /*US
 void AddressBook::setErrorHandler( ErrorHandler *handler )
 {
   delete d->mErrorHandler;
   d->mErrorHandler = handler;
 }
 */
 
 void AddressBook::error( const QString& msg )
 {
 /*US
   if ( !d->mErrorHandler ) // create default error handler
     d->mErrorHandler = new ConsoleErrorHandler;
 
   if ( d->mErrorHandler )
     d->mErrorHandler->error( msg );
   else
     kdError(5700) << "no error handler defined" << endl;
 */
     kdDebug(5700) << "msg" << endl;
     qDebug(msg);
 }
 
 void AddressBook::deleteRemovedAddressees()
 {
   Addressee::List::Iterator it;
   for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) {
     Resource *resource = (*it).resource();
     if ( resource && !resource->readOnly() && resource->isOpen() )
       resource->removeAddressee( *it );
   }
 
   d->mRemovedAddressees.clear();
 }
 
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 29f1e3a..eccd482 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -1,365 +1,365 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 #include <qregexp.h>
 #include <qtimer.h>
 #include <qwidget.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 //US #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 
 #include "addressbook.h"
 
 #include "formatfactory.h"
 
 #include "resourcedirconfig.h"
 #include "stdaddressbook.h"
 
 //US
 #include <qdir.h>
 
 #include "resourcedir.h"
 #include "syncprefwidget.h"
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 
 //US  void *init_kabc_dir()
   void *init_microkabc_dir()
   {
-    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidget>();
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidgetContainer>();
   }
 #ifndef _WIN32_
 }
 #endif
 
 ResourceDir::ResourceDir( const KConfig *config, bool syncable  )
     : Resource( config, syncable )
 {
   QString path;
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
 //US     path = config->readEntry( "FilePath" );
      path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
 //US     mFormatName = config->readEntry( "FileFormat" );
      mFormatName = cfg->readEntry( "FileFormat", "vcard" );
   } else {
     path = StdAddressBook::directoryName();
     mFormatName = "vcard";
   }
 
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
     mFormat = factory->format( mFormatName );
   }
 
 /*US
 //US  qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
 */
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
 
   setPath( path );
 }
 
 ResourceDir::~ResourceDir()
 {
   delete mFormat;
   mFormat = 0;
 }
 
 void ResourceDir::writeConfig( KConfig *config )
 {
     config->setGroup( "Resource_" + identifier() );
   Resource::writeConfig( config );
 
   config->writeEntry( "FilePath", mPath );
   config->writeEntry( "FileFormat", mFormatName );
 }
 
 Ticket *ResourceDir::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mPath ) ) {
     kdDebug(5700) << "ResourceDir::requestSaveTicket(): Unable to lock path '"
                   << mPath << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceDir::doOpen()
 {
   QDir dir( mPath );
   if ( !dir.exists() ) { // no directory available
     return dir.mkdir( dir.path() );
   } else {
     QString testName = dir.entryList( QDir::Files )[0];
     if ( testName.isNull() || testName.isEmpty() ) // no file in directory
       return true;
 
     QFile file( mPath + "/" + testName );
     if ( file.open( IO_ReadOnly ) )
       return true;
 
     if ( file.size() == 0 )
       return true;
 
     bool ok = mFormat->checkFormat( &file );
     file.close();
     return ok;
   }
 }
 
 void ResourceDir::doClose()
 {
 }
 
 bool ResourceDir::load()
 {
   kdDebug(5700) << "ResourceDir::load(): '" << mPath << "'" << endl;
 
   QDir dir( mPath );
   QStringList files = dir.entryList( QDir::Files );
 
   QStringList::Iterator it;
   bool ok = true;
   for ( it = files.begin(); it != files.end(); ++it ) {
     QFile file( mPath + "/" + (*it) );
 
     if ( !file.open( IO_ReadOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
       ok = false;
       continue;
     }
 
     if ( !mFormat->loadAll( addressBook(), this, &file ) )
       ok = false;
 
     file.close();
   }
 
   return ok;
 }
 
 bool ResourceDir::save( Ticket *ticket )
 {
   kdDebug(5700) << "ResourceDir::save(): '" << mPath << "'" << endl;
 
   AddressBook::Iterator it;
   bool ok = true;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     if ( (*it).resource() != this || !(*it).changed() )
       continue;
 
     QFile file( mPath + "/" + (*it).uid() );
     if ( !file.open( IO_WriteOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
       continue;
     }
 
     mFormat->save( *it, &file );
 
     // mark as unchanged
     (*it).setChanged( false );
 
     file.close();
   }
 
   delete ticket;
   unlock( mPath );
 
   return ok;
 }
 
 bool ResourceDir::lock( const QString &path )
 {
   kdDebug(5700) << "ResourceDir::lock()" << endl;
 
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" );
   KURL url(p);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if ( QFile::exists( lockName ) ) return false;
 
   QString lockUniqueName;
   lockUniqueName = p + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
 
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceDir::unlock( const QString &path )
 {
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locate( "data", "kabc/lock/" + p + ".lock" );
   KURL url(p);
   QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   ::unlink( QFile::encodeName( lockName ) );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceDir::setPath( const QString &path )
 {
   mDirWatch.stopScan();
   mDirWatch.removeDir( mPath );
 
   mPath = path;
 
   mDirWatch.addDir( mPath, true );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event
 //US  pathChanged();
 
 }
 
 QString ResourceDir::path() const
 {
   return mPath;
 }
 
 void ResourceDir::setFormat( const QString &format )
 {
   mFormatName = format;
 
   if ( mFormat )
     delete mFormat;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 /*US
 qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
 */
 
 }
 
 QString ResourceDir::format() const
 {
   return mFormatName;
 }
 
 void ResourceDir::pathChanged()
 {
   if ( !addressBook() )
     return;
 
   QString text( i18n( "Dir resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mPath ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 }
 
 void ResourceDir::removeAddressee( const Addressee& addr )
 {
     QFile::remove( mPath + "/" + addr.uid() );
 }
 
 void ResourceDir::cleanUp()
 {
   unlock( mPath );
 }
 
 //US #include "resourcedir.moc"
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index d98efc8..da2e4d7 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -1,399 +1,389 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 #include "formatfactory.h"
 
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 
 #include "resourcefile.h"
 #include "syncprefwidget.h"
 
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 
 //US  void *init_kabc_file()
   void *init_microkabc_file()
   {
-    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidget>();
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidgetContainer>();
   }
 #ifndef _WIN32_
 }
 #endif
 
 ResourceFile::ResourceFile( const KConfig *config, bool syncable )
   : Resource( config, syncable ) , mFormat( 0 )
 {
-  QString fileName, formatName;
+  QString fileName, formatName, default_fileName;
+
+  if (syncable == true)
+    default_fileName = "/home/polo/kdepim/apps/kabc/localfile.vcf";
+  else
+    default_fileName = StdAddressBook::fileName();
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
-    fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() );
+    fileName = cfg->readEntry( "FileName", default_fileName );
     formatName = cfg->readEntry( "FileFormat", "vcard" );
-//  qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() );
   } else {
-    fileName = StdAddressBook::fileName();
+    fileName = default_fileName;
     formatName = "vcard";
-//  qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() );
   }
 
   init( fileName, formatName );
 }
 
 ResourceFile::ResourceFile( const QString &fileName, bool syncable ,
                             const QString &formatName )
   : Resource( 0, syncable )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName, formatName );
 }
 
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
   mFormatName = formatName;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
     mFormat = factory->format( mFormatName );
   }
 
-/*US
-//US  qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
-  if (mFormatName == "vcard") {
-    mFormat = new VCardFormatPlugin2();
-//    qDebug("ResourceFile::init format VCardFormatPlugin2");
-  }
-  else if (mFormatName == "binary") {
-    mFormat = new BinaryFormat();
-//    qDebug("ResourceFile::init format BinaryFormat");
-  }
-  else
-    qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
-*/
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceFile::~ResourceFile()
 {
   delete mFormat;
   mFormat = 0;
 }
 
 void ResourceFile::writeConfig( KConfig *config )
 {
 
     config->setGroup( "Resource_" + identifier() );
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", mFileName );
   config->writeEntry( "FileFormat", mFormatName );
 
 //    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
 
 }
 
 Ticket *ResourceFile::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mFileName ) ) {
     kdDebug(5700) << "ResourceFile::requestSaveTicket(): Unable to lock file '"
                   << mFileName << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceFile::doOpen()
 {
   QFile file( mFileName );
 
   if ( !file.exists() ) {
     // try to create the file
     bool ok = file.open( IO_WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
     if ( !file.open( IO_ReadWrite ) )
       return false;
 
     if ( file.size() == 0 ) {
       file.close();
       return true;
     }
 
     bool ok = mFormat->checkFormat( &file );
     file.close();
 
     return ok;
   }
 }
 
 void ResourceFile::doClose()
 {
 }
 
 bool ResourceFile::load()
 {
 
 
   QFile file( mFileName );
   if ( !file.open( IO_ReadOnly ) ) {
     addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) );
     return false;
   }
 
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
 
   return mFormat->loadAll( addressBook(), this, &file );
 }
 
 bool ResourceFile::save( Ticket *ticket )
 {
 //    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
 
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 
 /*US we use a simpler method to create a backupfile
 
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
   {
     mFormat->saveAll( addressBook(), this, saveFile.file() );
     ok = saveFile.close();
   }
 */
 
 //US ToDo: write backupfile
   QFile info;
   info.setName( mFileName );
   bool ok = info.open( IO_WriteOnly );
   if ( ok ) {
     mFormat->saveAll( addressBook(), this, &info );
 
     info.close();
     ok = true;
   }
   else {
 
   }
 
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
 
   delete ticket;
   unlock( mFileName );
 
   return ok;
 
   qDebug("ResourceFile::save has to be changed");
   return true;
 }
 
 bool ResourceFile::lock( const QString &fileName )
 {
 
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
 
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
    result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceFile::unlock( const QString &fileName )
 {
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceFile::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
 
   mFileName = fileName;
 
 
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event
 //US  fileChanged();
 }
 
 QString ResourceFile::fileName() const
 {
   return mFileName;
 }
 
 void ResourceFile::setFormat( const QString &format )
 {
   mFormatName = format;
   delete mFormat;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 /*US
 //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard") {
     mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else if (mFormatName == "binary") {
     mFormat = new BinaryFormat();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else
     qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
 */
 
 }
 
 QString ResourceFile::format() const
 {
   return mFormatName;
 }
 
 void ResourceFile::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
 
   QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 }
 
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
   QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
   QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
   QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
 }
 
 void ResourceFile::cleanUp()
 {
   unlock( mFileName );
 }
 
 //US #include "resourcefile.moc"
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 198e80a..17f115d 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -1,432 +1,432 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kstringhandler.h>
 
 #include <stdlib.h>
 
 #include "resourceldap.h"
 #include "resourceldapconfig.h"
 #include "syncprefwidget.h"
 
 using namespace KABC;
 
 extern "C"
 {
 //US  void *init_kabc_ldap()
   void *init_microkabc_ldap()
   {
-    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidget>();
+    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidgetContainer>();
   }
 }
 
 void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value );
 
 
 ResourceLDAP::ResourceLDAP( const KConfig *config, bool syncable )
   : Resource( config, syncable ), mPort( 389 ), mLdap( 0 )
 {
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     mUser = cfg->readEntry( "LdapUser" );
     mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) );
     mDn = cfg->readEntry( "LdapDn" );
     mHost = cfg->readEntry( "LdapHost" );
     mPort = cfg->readNumEntry( "LdapPort", 389 );
     mFilter = cfg->readEntry( "LdapFilter" );
     mAnonymous = cfg->readBoolEntry( "LdapAnonymous" );
 
     QStringList attributes = cfg->readListEntry( "LdapAttributes" );
     for ( uint pos = 0; pos < attributes.count(); pos += 2 )
       mAttributes.insert( attributes[ pos ], attributes[ pos + 1 ] );
   }
 
   /**
     If you want to add new attributes, append them here, add a
     translation string in the ctor of AttributesDialog and
     handle them in the load() method below.
     These are the default values from
    */
   if ( mAttributes.count() == 0 ) {
     mAttributes.insert( "commonName", "cn" );
     mAttributes.insert( "formattedName", "displayName" );
     mAttributes.insert( "familyName", "sn" );
     mAttributes.insert( "givenName", "givenName" );
     mAttributes.insert( "mail", "mail" );
     mAttributes.insert( "mailAlias", "" );
     mAttributes.insert( "phoneNumber", "telephoneNumber" );
     mAttributes.insert( "uid", "uid" );
   }
 }
 
 void ResourceLDAP::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 
   config->writeEntry( "LdapUser", mUser );
   config->writeEntry( "LdapPassword", KStringHandler::obscure( mPassword ) );
   config->writeEntry( "LdapDn", mDn );
   config->writeEntry( "LdapHost", mHost );
   config->writeEntry( "LdapPort", mPort );
   config->writeEntry( "LdapFilter", mFilter );
   config->writeEntry( "LdapAnonymous", mAnonymous );
 
   QStringList attributes;
   QMap<QString, QString>::Iterator it;
   for ( it = mAttributes.begin(); it != mAttributes.end(); ++it )
     attributes << it.key() << it.data();
 
   config->writeEntry( "LdapAttributes", attributes );
 }
 
 Ticket *ResourceLDAP::requestSaveTicket()
 {
   if ( !addressBook() ) {
 	  kdDebug(5700) << "no addressbook" << endl;
     return 0;
   }
 
   return createTicket( this );
 }
 
 bool ResourceLDAP::doOpen()
 {
   if ( mLdap )
 	  return false;
 
   if ( !mPort )
 	  mPort = 389;
 
   mLdap = ldap_init( mHost.local8Bit(), mPort );
   if ( !mLdap ) {
 	  addressBook()->error( i18n( "Unable to connect to server '%1' on port '%2'" ).arg( mHost ).arg( mPort ) );
 	  return false;
   }
 
   if ( !mUser.isEmpty() && !mAnonymous ) {
 	  if ( ldap_simple_bind_s( mLdap, mUser.local8Bit(), mPassword.local8Bit() ) != LDAP_SUCCESS ) {
 	    addressBook()->error( i18n( "Unable to bind to server '%1'" ).arg( mHost ) );
       return false;
     }
 
     kdDebug(5700) << "ResourceLDAP: bind to server successfully" << endl;
   } else {
     if ( ldap_simple_bind_s( mLdap, NULL, NULL ) != LDAP_SUCCESS ) {
       addressBook()->error( i18n( "Unable to bind anonymously to server '%1'" ).arg( mHost ) );
       return false;
     }
 
     kdDebug( 5700 ) << "ResourceLDAP: bind anonymously to server successfully" << endl;
   }
 
   int deref = LDAP_DEREF_ALWAYS;
   if ( ldap_set_option( mLdap, LDAP_OPT_DEREF, (void *) &deref ) != LDAP_OPT_SUCCESS ) {
     kdDebug(5700) << "ResourceLDAP: can't set 'deref' option" << endl;
     return false;
   }
 
   if ( ldap_set_option( mLdap, LDAP_OPT_REFERRALS, LDAP_OPT_ON ) != LDAP_OPT_SUCCESS ) {
     kdDebug(5700) << "ResourceLDAP: can't set 'referrals' option" << endl;
     return false;
   }
 
   return true;
 }
 
 void ResourceLDAP::doClose()
 {
   if ( ldap_unbind_s( mLdap ) != LDAP_SUCCESS ) {
     kdDebug(5700) << "ResourceLDAP: can't unbind from server" << endl;
     return;
   }
 
   mLdap = 0;
 }
 
 bool ResourceLDAP::load()
 {
   LDAPMessage *res;
   LDAPMessage *msg;
   BerElement *track;
   char *names;
   char **values;
 
   char **LdapSearchAttr = new char*[ mAttributes.count() + 1 ];
 
   QMap<QString, QString>::Iterator it;
   int i = 0;
   for ( it = mAttributes.begin(); it != mAttributes.end(); ++it ) {
     if ( !it.data().isEmpty() ) {
       unsigned int len = it.data().utf8().length();
       LdapSearchAttr[ i ] = new char[ len+1 ];
       memcpy( LdapSearchAttr[ i ], it.data().utf8(), len );
       LdapSearchAttr[ i ][ len ] = 0;
       ++i;
     }
   }
   LdapSearchAttr[ i ] = 0;
 
   QString filter = mFilter;
   if ( filter.isEmpty() )
     filter = "cn=*";
 
   int result;
   if ( ( result = ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, QString( "(%1)" ).arg( filter ).local8Bit(),
          LdapSearchAttr, 0, &res ) != LDAP_SUCCESS ) ) {
     addressBook()->error( i18n( "Unable to search on server '%1': %2" )
                           .arg( mHost )
                           .arg( ldap_err2string( result ) ) );
 
     for ( i = 0; LdapSearchAttr[ i ]; ++i )
       delete [] LdapSearchAttr[ i ];
     delete [] LdapSearchAttr;
 
     return false;
   }
 
   for ( msg = ldap_first_entry( mLdap, res ); msg; msg = ldap_next_entry( mLdap, msg ) ) {
     Addressee addr;
     addr.setResource( this );
     for ( names = ldap_first_attribute( mLdap, msg, &track ); names; names = ldap_next_attribute( mLdap, msg, track ) ) {
       values = ldap_get_values( mLdap, msg, names );
       for ( int i = 0; i < ldap_count_values( values ); ++i ) {
         QString name = QString::fromUtf8( names ).lower();
         QString value = QString::fromUtf8( values[ i ] );
 
         if ( name == mAttributes[ "commonName" ].lower() ) {
           if ( !addr.formattedName().isEmpty() ) {
             QString fn = addr.formattedName();
             addr.setNameFromString( value );
             addr.setFormattedName( fn );
           } else
             addr.setNameFromString( value );
         } else if ( name == mAttributes[ "formattedName" ].lower() ) {
           addr.setFormattedName( value );
         } else if ( name == mAttributes[ "givenName" ].lower() ) {
           addr.setGivenName( value );
         } else if ( name == mAttributes[ "mail" ].lower() ) {
           addr.insertEmail( value, true );
         } else if ( name == mAttributes[ "mailAlias" ].lower() ) {
           addr.insertEmail( value, false );
         } else if ( name == mAttributes[ "phoneNumber" ].lower() ) {
           PhoneNumber phone;
           phone.setNumber( value );
           addr.insertPhoneNumber( phone );
           break; // read only the home number
         } else if ( name == mAttributes[ "familyName" ].lower() ) {
           addr.setFamilyName( value );
         } else if ( name == mAttributes[ "uid" ].lower() ) {
           addr.setUid( value );
         }
       }
       ldap_value_free( values );
     }
     ber_free( track, 0 );
 
     addressBook()->insertAddressee( addr );
   }
 
   ldap_msgfree( res );
 
   for ( i = 0; LdapSearchAttr[ i ]; ++i )
     delete [] LdapSearchAttr[ i ];
   delete [] LdapSearchAttr;
 
   return true;
 }
 
 bool ResourceLDAP::save( Ticket * )
 {
   AddressBook::Iterator it;
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     if ( (*it).resource() == this && (*it).changed() ) {
       LDAPMod **mods = NULL;
 
       addModOp( &mods, "objectClass", "organizationalPerson" );
       addModOp( &mods, "objectClass", "person" );
       addModOp( &mods, "objectClass", "Top" );
       addModOp( &mods, mAttributes[ "commonName" ].utf8(), (*it).assembledName() );
       addModOp( &mods, mAttributes[ "formattedName" ].utf8(), (*it).formattedName() );
       addModOp( &mods, mAttributes[ "givenName" ].utf8(), (*it).givenName() );
       addModOp( &mods, mAttributes[ "familyName" ].utf8(), (*it).familyName() );
       addModOp( &mods, mAttributes[ "uid" ].utf8(), (*it).uid() );
 
       QStringList emails = (*it).emails();
       QStringList::ConstIterator mailIt;
       bool first = true;
       for ( mailIt = emails.begin(); mailIt != emails.end(); ++mailIt ) {
         if ( first ) {
           addModOp( &mods, mAttributes[ "mail" ].utf8(), (*mailIt) );
           first = false;
         } else
           addModOp( &mods, mAttributes[ "mailAlias" ].utf8(), (*mailIt) );
       }
 
       PhoneNumber number = (*it).phoneNumber( PhoneNumber::Home );
       addModOp( &mods, mAttributes[ "phoneNumber" ].utf8(), number.number() );
 
       QString dn = "cn=" + (*it).assembledName() + "," + mDn;
 
       int retval;
       if ( (retval = ldap_add_s( mLdap, dn.local8Bit(), mods )) != LDAP_SUCCESS )
          addressBook()->error( i18n( "Unable to modify '%1' on server '%2'" ).arg( (*it).uid() ).arg( mHost ) );
 
       ldap_mods_free( mods, 1 );
 
       // mark as unchanged
       (*it).setChanged( false );
     }
   }
 
   return true;
 }
 
 void ResourceLDAP::removeAddressee( const Addressee &addr )
 {
   LDAPMessage *res;
   LDAPMessage *msg;
 
   QString filter = QString( "(&(uid=%1)(%2))" ).arg( addr.uid() ).arg( mFilter );
 
   kdDebug(5700) << "ldap:removeAddressee" << filter << endl;
 
   ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, filter.local8Bit(),
       0, 0, &res );
 
   for ( msg = ldap_first_entry( mLdap, res ); msg; msg = ldap_next_entry( mLdap, msg ) ) {
     char *dn = ldap_get_dn( mLdap, msg );
     kdDebug(5700) << "found " << dn << endl;
     if ( ldap_delete_s( mLdap, dn ) != LDAP_SUCCESS )
       addressBook()->error( i18n( "Unable to delete '%1' on server '%2'" ).arg( dn ).arg( mHost ) );
     ldap_memfree( dn );
   }
 
   ldap_msgfree( res );
 }
 
 void ResourceLDAP::setUser( const QString &user )
 {
   mUser = user;
 }
 
 QString ResourceLDAP::user() const
 {
   return mUser;
 }
 
 void ResourceLDAP::setPassword( const QString &password )
 {
   mPassword = password;
 }
 
 QString ResourceLDAP::password() const
 {
   return mPassword;
 }
 
 void ResourceLDAP::setDn( const QString &dn )
 {
   mDn = dn;
 }
 
 QString ResourceLDAP::dn() const
 {
   return mDn;
 }
 
 void ResourceLDAP::setHost( const QString &host )
 {
   mHost = host;
 }
 
 QString ResourceLDAP::host() const
 {
   return mHost;
 }
 
 void ResourceLDAP::setPort( int port )
 {
   mPort = port;
 }
 
 int ResourceLDAP::port() const
 {
   return mPort;
 }
 
 void ResourceLDAP::setFilter( const QString &filter )
 {
   mFilter = filter;
 }
 
 QString ResourceLDAP::filter() const
 {
   return mFilter;
 }
 
 void ResourceLDAP::setIsAnonymous( bool value )
 {
   mAnonymous = value;
 }
 
 bool ResourceLDAP::isAnonymous() const
 {
   return mAnonymous;
 }
 
 void ResourceLDAP::setAttributes( const QMap<QString, QString> &attributes )
 {
   mAttributes = attributes;
 }
 
 QMap<QString, QString> ResourceLDAP::attributes() const
 {
   return mAttributes;
 }
 
 void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value )
 {
   if ( value.isNull() )
     return;
 
   LDAPMod	**mods;
 
   mods = *pmods;
 
   uint i = 0;
   if ( mods != 0 )
     for ( ; mods[ i ] != 0; ++i );
 
   if (( mods = (LDAPMod **)realloc( mods, (i + 2) * sizeof( LDAPMod * ))) == 0 ) {
     kdError() << "ResourceLDAP: realloc" << endl;
     return;
   }
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 9dfd473..4b811e9 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -1,348 +1,348 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 //US #include "formatfactory.h"
 //US #include <qpe/qpeapplication.h>
 
 #include <opie/ocontactaccess.h>
 #include <opie/ocontactaccessbackend_xml.h>
 
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
 #include "syncprefwidget.h"
 
 #include "opieconverter.h"
 
 #include "resourceopie.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_opie()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidgetContainer>();
   }
 }
 
 ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
   : Resource( config, syncable ), mAccess(0), mConverter (0)
 {
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     fileName = cfg->readEntry( "FileName", fileName );
 
   }
 
   init( fileName );
 }
 
 ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
   init( fileName );
 }
 
 void ResourceOpie::init( const QString &fileName )
 {
   qDebug("ResourceOpie::init()");
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceOpie::~ResourceOpie()
 {
   if (mConverter != 0)
     delete mConverter;
 
   if(mAccess != 0)
     delete mAccess;
 }
 
 void ResourceOpie::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", fileName() );
 }
 
 Ticket *ResourceOpie::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
 
   qDebug("ResourceOpie::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( fileName() ) ) {
     kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
                   << fileName() << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceOpie::doOpen()
 {
   qDebug("ResourceOpie::doOpen: %s", fileName().latin1());
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", fileName() );
   mAccess = new OContactAccess("KDEPim/Pi", 0l, backend, false);
 
   if ( !mAccess ) {
     qDebug("Unable to load file() %s", fileName().latin1());
     return false;
   }
 
   mAccess->setReadAhead( 32 ); // Use ReadAhead-Cache if available
 
 
   if (mConverter == 0)
   {
     mConverter = new OpieConverter();
     bool res = mConverter->init();
     if ( !res )
     {
       qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
       delete mAccess;
       mAccess = 0;
       return false;
     }
   }
 
 
 
   return true;
 }
 
 void ResourceOpie::doClose()
 {
   qDebug("ResourceOpie::doClose: %s", fileName().latin1());
 
   if(mAccess)
   {
     delete mAccess;
     mAccess = 0;
   }
   // it seems so, that deletion of access deletes backend as well
   //delete backend;
 
   return;
 
 }
 
 
 bool ResourceOpie::load()
 {
   qDebug("ResourceOpie::load: %s", fileName().latin1());
 
   bool res = false;
 
   OContactAccess::List::Iterator it;
   OContactAccess::List allList = mAccess->allRecords();
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     const OContact c = (*it);
 
     KABC::Addressee addressee;
 
     res = mConverter->opieToAddressee( c, addressee );
 
     if ( !addressee.isEmpty() && res )
     {
       addressee.setResource( this );
       addressBook()->insertAddressee( addressee );
     }
 
   }
 
 
   return true;
 }
 
 bool ResourceOpie::save( Ticket *ticket )
 {
   qDebug("ResourceOpie::save: %s", fileName().latin1());
 
 
 
   KABC::AddressBook::Iterator it;
   bool res;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     OContact c;
     KABC::Addressee addressee = (*it);
 
     res = mConverter->addresseeToOpie( *it, c );
     if (res == true)
     {
       res = mAccess->add(c);
       if (res == false)
         qDebug("Unable to append Contact %s", c.fullName().latin1());
     }
     else
     {
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
 
   mAccess->save();
 
   delete ticket;
   unlock( fileName() );
 
   return true;
 
 }
 
 bool ResourceOpie::lock( const QString &lockfileName )
 {
   qDebug("ResourceOpie::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName ))
   {
     qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1());
     return false;
   }
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceOpie::unlock( const QString &fileName )
 {
   qDebug("ResourceOpie::unlock() %s", fileName.latin1());
 
   QString fn = fileName;
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceOpie::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( fileName() );
 
   Resource::setFileName( newFileName );
 
   mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 
 }
 
 
 void ResourceOpie::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
   QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 
   load();
   addressBook()->emitAddressBookChanged();
 }
 
 void ResourceOpie::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceOpie::cleanUp()
 {
 //  qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
 
   unlock( fileName() );
 }
 
 
 //US #include "resourceopie.moc"
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 5565580..93a4d33 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -1,319 +1,319 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 #include <qpe/pim/addressbookaccess.h>
 
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
 #include "syncprefwidget.h"
 
 #include "resourceqtopia.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_qtopia()
   {
-    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidgetContainer>();
   }
 }
 
 ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
   : Resource( config, syncable ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
   init( fileName );
 }
 
 ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
   init( fileName );
 }
 
 void ResourceQtopia::init( const QString &fileName )
 {
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceQtopia::~ResourceQtopia()
 {
   if (mConverter != 0)
     delete mConverter;
 
   if(mAccess != 0)
     delete mAccess;
 }
 
 void ResourceQtopia::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
 Ticket *ResourceQtopia::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
   qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( fileName() ) ) {
     kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
                   << fileName() << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceQtopia::doOpen()
 {
   qDebug("ResourceQtopia::doOpen(): %s", fileName().latin1());
 
   mAccess = new AddressBookAccess();
 
   if ( !mAccess ) {
     qDebug("Unable to load file() %s", fileName().latin1());
     return false;
   }
 
 
   if (mConverter == 0)
   {
     mConverter = new QtopiaConverter();
     bool res = mConverter->init();
     if ( !res )
     {
 	  QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
       qDebug(msg);
       delete mAccess;
       mAccess = 0;
       return false;
     }
   }
 
   return true;
 }
 
 void ResourceQtopia::doClose()
 {
   qDebug("ResourceQtopia::doClose: %s", fileName().latin1());
 
   if(mAccess)
   {
     delete mAccess;
     mAccess = 0;
   }
   // it seems so, that deletion of access deletes backend as well
   //delete backend;
 
   return;
 }
 
 bool ResourceQtopia::load()
 {
   qDebug("ResourceQtopia::load: %s", fileName().latin1());
 
   AddressBookIterator it(*mAccess);
   const PimContact* contact;
   bool res;
 
   for (contact=it.toFirst(); it.current(); ++it)
   {
     contact = it.current();
 
     KABC::Addressee addressee;
 
     res = mConverter->qtopiaToAddressee( (*contact), addressee );
 
     if ( !addressee.isEmpty() && res )
     {
       addressee.setResource( this );
       addressBook()->insertAddressee( addressee );
     }
   }
 
   return true;
 }
 
 bool ResourceQtopia::save( Ticket *ticket )
 {
   qDebug("ResourceQtopia::save: %s", fileName().latin1());
 
 
   KABC::AddressBook::Iterator it;
   bool res;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     PimContact c;
     KABC::Addressee addressee = (*it);
 
     res = mConverter->addresseeToQtopia( *it, c );
     if (res == true)
     {
       mAccess->addContact(c);
 //      if (res == false)
 //        qDebug("Unable to append Contact %s", c.fullName().latin1());
     }
     else
     {
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
 
 //  mAccess->addressBookUpdated();
 
   delete ticket;
   unlock( fileName() );
 
   return true;
 }
 
 bool ResourceQtopia::lock( const QString &lockfileName )
 {
   qDebug("ResourceQtopia::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName ))
   {
     qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1());
     return false;
   }
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceQtopia::unlock( const QString &fileName )
 {
   qDebug("ResourceQtopia::unlock() %s", fileName.latin1());
 
   QString fn = fileName;
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceQtopia::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( fileName() );
 
   Resource::setFileName( newFileName );
 
   mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 }
 
 
 void ResourceQtopia::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
   QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 }
 
 void ResourceQtopia::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceQtopia::cleanUp()
 {
   unlock( fileName() );
 }
 
 //US #include "resourceqtopia.moc"
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 70c3718..b63df0c 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -1,337 +1,337 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2004 Ulf Schenk
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 #include <sl/slzdb.h>
 
 
 #include "resourcesharpdtmconfig.h"
 #include "resourcesharpdtm.h"
 
 #include "syncprefwidget.h"
 
 #include "stdaddressbook.h"
 
 #include "sharpdtmconverter.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_sharpdtm()
   {
-    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidget>();
+    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidgetContainer>();
   }
 }
 
 ResourceSharpDTM::ResourceSharpDTM( const KConfig *config, bool syncable  )
   : Resource( config, syncable ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
 
   QString fileName = SlZDataBase::addressbookFileName();
   init( fileName );
 }
 
 ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
   init( fileName );
 }
 
 void ResourceSharpDTM::init( const QString &fileName )
 {
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceSharpDTM::~ResourceSharpDTM()
 {
   if (mConverter != 0)
     delete mConverter;
 
   if(mAccess != 0)
     delete mAccess;
 }
 
 void ResourceSharpDTM::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
 Ticket *ResourceSharpDTM::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceSharpDTM::requestSaveTicket()" << endl;
 
   qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( fileName() ) ) {
     kdDebug(5700) << "ResourceSharpDTM::requestSaveTicket(): Unable to lock file '"
                   << fileName() << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceSharpDTM::doOpen()
 {
   qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
 
   // the last parameter in the SlZDataBase constructor means "readonly"
   mAccess = new SlZDataBase(fileName(),
                         SlZDataBase::addressbookItems(),
                         NULL, true);
 
   if ( !mAccess ) {
     qDebug("Unable to load file() %s", fileName().latin1());
     return false;
   }
 
   if (mConverter == 0)
   {
     mConverter = new SharpDTMConverter();
     bool res = mConverter->init();
     if ( !res )
     {
 	  QString msg("Unable to initialize sharp converter. Most likely a problem with the category file");
 
       qDebug(msg);
       delete mAccess;
       mAccess = 0;
       return false;
     }
   }
 
  return true;
 }
 
 void ResourceSharpDTM::doClose()
 {
   qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
 
   if(mAccess)
   {
     delete mAccess;
     mAccess = 0;
   }
   // it seems so, that deletion of access deletes backend as well
   //delete backend;
 
   return;
 }
 
 bool ResourceSharpDTM::load()
 {
   qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
 
   bool res = false;
 
   CardId id;
 
   for (bool res=mAccess->first(); res == true; res=mAccess->next())
   {
     id = mAccess->cardId();
 
     KABC::Addressee addressee;
 
     res = mConverter->sharpToAddressee( id, mAccess, addressee );
 
     if ( !addressee.isEmpty() && res )
     {
       addressee.setResource( this );
       addressBook()->insertAddressee( addressee );
     }
   }
 
   return true;
 }
 
 bool ResourceSharpDTM::save( Ticket *ticket )
 {
   qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
 
 
   KABC::AddressBook::Iterator it;
   bool res;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     CardId id = 0;	// 0 means new card
     KABC::Addressee addressee = (*it);
 
     res = mAccess->startEditCard(id);
     if (res == true)
     {
       res = mConverter->addresseeToSharp( *it, mAccess, id  );
       if (res == true)
       {
         res = mAccess->finishEditCard(&id);
         if (res == false)
           qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
       }
       else
       {
         qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1());
         mAccess->cancelEditCard();
       }
     }
     else
     {
       qDebug("Unable to add new card. Addressee: %s", addressee.formattedName().latin1());
     }
 
   }
 
 //US  mAccess->save();
 
   delete ticket;
   unlock( fileName() );
 
   return true;
 }
 
 bool ResourceSharpDTM::lock( const QString &lockfileName )
 {
   qDebug("ResourceSharpDTM::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceSharpDTM::lock()" << endl;
 
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName ))
   {
     qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName());
     return false;
   }
 
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceSharpDTM::unlock( const QString &fileName )
 {
   qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1());
 
   QString fn = fileName;
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceSharpDTM::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( fileName() );
 
   Resource::setFileName( newFileName );
 
   mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 
 }
 
 void ResourceSharpDTM::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
   QString text( i18n( "Sharp DTM resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 }
 
 void ResourceSharpDTM::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceSharpDTM::cleanUp()
 {
   unlock( fileName() );
 }
 
 
 
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index 2f03927..d39fd6a 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -1,139 +1,144 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kdebug.h>
 
 #include <ksyncprofile.h>
 
 #include "resource.h"
 
 using namespace KABC;
 
 Resource::Resource( const KConfig *config, bool syncable )
     : KRES::Resource( config ), mAddressBook( 0 ), mSyncProfile( 0 )
 {
   if(syncable == true) {
     mSyncProfile = new KSyncProfile( identifier() );
     mSyncProfile->setName(resourceName());
     mSyncProfile->readConfig( (KConfig *)config );
   }
 }
 
 Resource::~Resource()
 {
   if (mSyncProfile != 0) {
     delete mSyncProfile;
   }
 }
 
 void Resource::writeConfig( KConfig *config )
 {
   KRES::Resource::writeConfig( config );
 
   if(mSyncProfile != 0)
     mSyncProfile->writeConfig( config );
 }
 
 
 void Resource::setAddressBook( AddressBook *ab )
 {
   mAddressBook = ab;
 }
 
 AddressBook *Resource::addressBook()
 {
   return mAddressBook;
 }
 
 bool Resource::doOpen()
 {
   return true;
 }
 
 void Resource::doClose()
 {
 }
 
 Ticket *Resource::requestSaveTicket()
 {
   return 0;
 }
 
 bool Resource::load()
 {
   return true;
 }
 
 bool Resource::save( Ticket * )
 {
   return false;
 }
 
 Ticket *Resource::createTicket( Resource *resource )
 {
   return new Ticket( resource );
 }
 
 void Resource::removeAddressee( const Addressee& )
 {
   // do nothing
 }
 
 void Resource::cleanUp()
 {
   // do nothing
 }
 
 bool Resource::isSyncable() const
 {
   return (mSyncProfile != 0);
 }
 
+KSyncProfile* Resource::getSyncProfile()
+{
+  return mSyncProfile;
+}
+
 
 QString Resource::fileName() const
 {
   return mFileName;
 }
 
 void Resource::setFileName( const QString &fileName )
 {
   mFileName = fileName;
 }
 
 /**
  * Set the name of resource.You can override this method,
  * but also remember to call Resource::setResourceName().
  */
 void Resource::setResourceName( const QString &name )
 {
 	KRES::Resource::setResourceName(name);
     if(mSyncProfile != 0) {
       mSyncProfile->setName( name );
     }
 
 }
 
diff --git a/kabc/resource.h b/kabc/resource.h
index 7d42f81..2024d2d 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -1,169 +1,171 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_RESOURCE_H
 #define KABC_RESOURCE_H
 
 #include <kresources/resource.h>
 
 
 #include "addressbook.h"
 
 class KSyncProfile;
 
 namespace KABC {
 
 /**
  * @short Helper class for handling coordinated save of address books.
  *
  * This class is used as helper class for saving address book.
  * @see requestSaveTicket(), save().
  */
 class Ticket
 {
     friend class Resource;
   public:
     Resource *resource() { return mResource; }
 
   private:
     Ticket( Resource *resource ) : mResource( resource ) {}
 
     Resource *mResource;
 };
 
 /**
  * @internal
  */
 class Resource : public KRES::Resource
 {
 private:
   /**
    * make this constructor private to force everybody to use the other one
    */
   Resource( const KConfig *config);
 
 public:
   /**
    * Constructor
    */
   Resource( const KConfig *config, bool syncable );
 
   /**
    * Destructor.
    */
   virtual ~Resource();
 
   /**
    * Sets the address book of the resource.
    */
   void setAddressBook( AddressBook* );
 
   /**
    * Returns a pointer to the addressbook.
    */
   AddressBook *addressBook();
 
   /**
    * Writes the resource specific config to file.
    */
   virtual void writeConfig( KConfig *config );
 
   /**
    * Open the resource and returns if it was successfully
    */
   virtual bool doOpen();
 
 
   /**
    * Request a ticket, you have to pass through @ref save() to
    * allow locking.
    */
   virtual Ticket *requestSaveTicket();
 
   /**
    * Load all addressees to the addressbook
    */
   virtual bool load();
 
   /**
    * Save all addressees to the addressbook.
    *
    * @param ticket The ticket you get by @ref requestSaveTicket()
    */
   virtual bool save( Ticket *ticket );
 
   /**
    * Removes a addressee from resource. This method is mainly
    * used by record-based resources like LDAP or SQL.
    */
   virtual void removeAddressee( const Addressee& addr );
 
 
   /**
    * This method is called by an error handler if the application
    * crashed
    */
   virtual void cleanUp();
 
   /**
    * Set name of file to be used for saving.
    */
   virtual void setFileName( const QString & );
 
   /**
    * Return name of file used for loading and saving the address book.
    */
   virtual QString fileName() const;
 
 
   virtual bool isSyncable() const;
 
+  virtual KSyncProfile* getSyncProfile();
+
   /**
    * Set the name of resource.You can override this method,
    * but also remember to call Resource::setResourceName().
    */
   virtual void setResourceName( const QString &name );
 
 
 
 protected:
   Ticket *createTicket( Resource * );
   virtual void doClose();
 
 private:
   AddressBook *mAddressBook;
   KSyncProfile *mSyncProfile;
   QString mFileName;
 
 };
 
 
 }
 
 
 
 #endif
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 1e00cc6..760820e 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -1,228 +1,226 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qdir.h>
 #include "resource.h"
 #include <kresources/manager.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"
 
 using namespace KABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
 bool StdAddressBook::mAutomaticSave = true;
 
 static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 QString StdAddressBook::fileName()
 {
   return locateLocal( "data", "kabc/std.vcf" );
 }
 
 QString StdAddressBook::directoryName()
 {
   return locateLocal( "data", "kabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()
 {
   StdAddressBook::self()->cleanUp();
 }
 
 StdAddressBook *StdAddressBook::self()
 {
  
   if ( !mSelf )
   { 
       QString appdir = StdAddressBook::setTempAppDir();
 
   kdDebug(5700) << "StdAddressBook::self()" << endl;
 // US im am not sure why I have to use the other format here??
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook );
 #else //KAB_EMBEDDED
     addressBookDeleter.setObject( mSelf, new StdAddressBook );
 #endif //KAB_EMBEDDED  
     KStandardDirs::setAppDir( appdir );  
   }
 
   return mSelf;
 }
 
 QString StdAddressBook::setTempAppDir()
 {
     QString appDIR = KStandardDirs::appDir();
 #ifdef DESKTOP_VERSION
     QString appdir = QDir::homeDirPath();
       if ( appdir.right(1) == "\\" ||   appdir.right(1) == "/" )
           appdir += "kaddressbook/";
       else
           appdir += "/kaddressbook/";
       KStandardDirs::setAppDir( QDir::convertSeparators( appdir ));
 #else
       QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook";
       
       KStandardDirs::setAppDir( appdir );  
 #endif
 
     return appDIR;
 }
 StdAddressBook *StdAddressBook::self( bool onlyFastResources )
 {
  
    if ( !mSelf )
   { 
       QString appdir =StdAddressBook::setTempAppDir();
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) );
 #else //KAB_EMBEDDED
     addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) );
 #endif //KAB_EMBEDDED 
     KStandardDirs::setAppDir( appdir );  
   }
   return mSelf;
 }
 
 StdAddressBook::StdAddressBook()
-//US  : AddressBook( "kabcrc" )
-  : AddressBook( locateLocal( "config", "kabcrc") )
+  : AddressBook( "kabcrc" )
 {
   
   init( false );
 }
 
 StdAddressBook::StdAddressBook( bool onlyFastResources )
-//US  : AddressBook( "kabcrc" )
-  : AddressBook( locateLocal( "config", "kabcrc") )
+  : AddressBook( "kabcrc" )
 {
   
   init( onlyFastResources );
 }
 
 StdAddressBook::~StdAddressBook()
 {
   if ( mAutomaticSave )
     save();
 }
 
 void StdAddressBook::init( bool )
 {
   KRES::Manager<Resource> *manager = resourceManager();
   KRES::Manager<Resource>::ActiveIterator it;
 
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     (*it)->setAddressBook( this );
     if ( !(*it)->open() )
       error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
   }
   
   Resource *res = standardResource();
   if ( !res ) {
     res = manager->createResource( "file" );
     if ( res )
     {
       addResource( res );
     }
     else
         qDebug(" No resource available!!!");
   }
 
   setStandardResource( res );
   manager->writeConfig();
 
   load();
 }
 
 bool StdAddressBook::save()
 {
   kdDebug(5700) << "StdAddressBook::save()" << endl;
 
   bool ok = true;
   AddressBook *ab = self();
 
   ab->deleteRemovedAddressees();
 
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = ab->resourceManager();
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = ab->requestSaveTicket( *it );
 //        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         ab->error( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
       if ( !ab->save( ticket ) )
         ok = false;
     }
   }
   
   return ok;
 }
 
 void StdAddressBook::close()
 {
 //US destructObject is not defined on my system???. Is setObject(0) the same ???
 //US  addressBookDeleter.destructObject();
   addressBookDeleter.setObject(0);
   
 }
 
 void StdAddressBook::setAutomaticSave( bool enable )
 {
   mAutomaticSave = enable;
 }
 
 bool StdAddressBook::automaticSave()
 {
   return mAutomaticSave;
 }
 
 // should get const for 4.X
 Addressee StdAddressBook::whoAmI()
 {
 //US  KConfig config( "kabcrc" );
   KConfig config( locateLocal("config", "kabcrc") );
   config.setGroup( "General" );
 
   return findByUid( config.readEntry( "WhoAmI" ) );
 }
 
 void StdAddressBook::setWhoAmI( const Addressee &addr )
 {
 //US  KConfig config( "kabcrc" );
   KConfig config( locateLocal("config", "kabcrc") );
   config.setGroup( "General" );
 
   config.writeEntry( "WhoAmI", addr.uid() );
 }
diff --git a/kabc/syncprefwidget.cpp b/kabc/syncprefwidget.cpp
index 51a8040..a2bde72 100644
--- a/kabc/syncprefwidget.cpp
+++ b/kabc/syncprefwidget.cpp
@@ -1,495 +1,410 @@
 /*
     This file is part of KABC for platform independent KDE tools.
 	Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 $Id$
 */
 
-/*US
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qlineedit.h>
-#include <qfont.h>
-#include <qslider.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qcombobox.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qspinbox.h>
-#include <qdatetime.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qpushbutton.h>
-#include <qstrlist.h>
-#include <qapplication.h>
-
-#include <kcolorbutton.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kfontdialog.h>
-#include <kmessagebox.h>
-#include <kcolordialog.h>
-#include <kiconloader.h>
-#include <kemailsettings.h>
-#include <kstandarddirs.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
-
-#include <kurlrequester.h>
-#include <klineedit.h>
-#include <libkdepim/ksyncprofile.h>
-
-
-#include "koprefs.h"
-
-#include "kosyncprefsdialog.h"
-#include "koglobals.h"
-*/
 
 #include <qlayout.h>
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
+#include <qscrollview.h>
+#include <qcombobox.h>
 
 
 #include <klocale.h>
 #include <kdialog.h>
 
-
+#include "ksyncprofile.h"
+#include "resource.h"
 #include "syncprefwidget.h"
 
 
-SyncPrefWidget::SyncPrefWidget(QWidget *parent) :
-  KRES::SyncWidget(parent)
+SyncPrefWidget_Settings::SyncPrefWidget_Settings(QWidget *parent, const char *name) :
+  KRES::SyncWidget(parent, name)
 {
-
-//US  setCaption( i18n("Synchronization Preferences"));
-
-//US  mSyncProfiles.setAutoDelete( true );
    init();
 }
 
 
-SyncPrefWidget::~SyncPrefWidget()
+SyncPrefWidget_Settings::~SyncPrefWidget_Settings()
 {
 }
 
-//US #include <qlayout.h>
-//US #include <qscrollview.h>
-void SyncPrefWidget::init()
+void SyncPrefWidget_Settings::init()
 {
-  QLabel * lab;
-  QPushButton* button;
-
-/*US
-  //QFrame *page = addPage(i18n("Sync Prefs"),0,0);
-  QVBox * mainbox = new QVBox( this );
-   QScrollView* sv = new QScrollView( mainbox );
-   QHBoxLayout * lay = new QHBoxLayout( this );
-   lay->addWidget( mainbox );
-   QHBox * b_box = new QHBox( mainbox );
-*/
-/*US
-   QPushButton* button = new QPushButton( i18n("Ok"), b_box );
-   connect ( button, SIGNAL( clicked()), this, SLOT (slotOK() ) );
-   button = new QPushButton( i18n("Cancel"), b_box );
-   connect ( button, SIGNAL( clicked()), this, SLOT (reject() ) );
-*/
-   //QBoxLayout * sl = new QVBoxLayout(this );
-   //sl->addWidget ( sv );
-/*US
-   sv->setResizePolicy ( QScrollView::AutoOneFit );
-   QFrame *topFrame = new QFrame ( sv );
-   sv->addChild( topFrame );
-   mSetupSyncAlgTab = topFrame;
-   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
-   topLayout->setSpacing(spacingHint());
-   topLayout->setMargin(marginHint());
-*/
-//US new code for the layout
   QGridLayout *topLayout = new QGridLayout( this, 6,2 );
   topLayout->setMargin( KDialog::marginHint() );
   topLayout->setSpacing( KDialog::spacingHint() );
 
-   //lab = new QLabel(i18n("Sync settings not yet implemented. DO NOT USE!"), topFrame);
    int iii = 0;
-   //topLayout->addMultiCellWidget(lab , iii,iii,0,1);
-   //++iii;
-
-/*US
-   mMyMachineName = new QLineEdit(topFrame);
-   lab = new QLabel(mMyMachineName, i18n("Local device name:"), topFrame);
-   topLayout->addWidget(lab ,iii,0);
-   topLayout->addWidget(mMyMachineName,iii,1);
-   ++iii;
-
-   QHBox* buttonbox = new QHBox( topFrame);
-   topLayout->addMultiCellWidget(buttonbox, iii,iii,0,1);
-   ++iii;
-   button = new QPushButton( i18n("New profile"), buttonbox );
-   connect ( button, SIGNAL( clicked()), this, SLOT (newProfile() ) );
-
-   button = new QPushButton( i18n("Clone profile"), buttonbox );
-   connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) );
-
-   button = new QPushButton( i18n("Delete profile"), buttonbox );
-   connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) );
-
-   mProfileBox = new QComboBox(topFrame);
-   mProfileBox->setEditable ( true );
-   connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) );
-   connect ( mProfileBox, SIGNAL(  textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) );
-
-   lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame);
-   topLayout->addWidget(lab ,iii,0);
-   topLayout->addWidget(mProfileBox, iii,1);
-   ++iii;
-*/
    mIncludeInRing = new QCheckBox( i18n("Include in multiple sync"), this   );
    topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1);
    ++iii;
 
    mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), this   );
    topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
    ++iii;
-    QButtonGroup* gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), this);
-   topLayout->addMultiCellWidget(gr, iii,iii,0,1);
-   ++iii;
-   loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
-   rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
-   newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
-   ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
-   f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr );
-   f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr );
-   // both = new QRadioButton ( i18n("Take both on conflict"), gr );
 
    mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), this   );
    topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
    ++iii;
 
    mWriteBackExisting= new QCheckBox( i18n("Write back existing entries only"), this   );
    topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
    ++iii;
 
-   mWriteBackFile = new QCheckBox( i18n("Write back file"), this   );
+  mWriteBackFile = new QCheckBox( i18n("Write back synced data"), this   );
    topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
    ++iii;
 
-   mIsNotLocal = new QCheckBox( i18n("Remote file (w down/upload command)"), this   );
-   topLayout->addMultiCellWidget(mIsNotLocal, iii,iii,0,1);
-   connect (mIsNotLocal, SIGNAL( checked(bool)), this, SLOT (kindChanged(bool) ) );
-/*US
-   proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), this);
-   gr = proGr;
-   topLayout->addMultiCellWidget(gr, iii,iii,0,1);
-   ++iii;
-   mIsLocal = new QRadioButton ( i18n("Local file"), gr );
-   mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
-   connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
-*/
+}
 
-/*US
-   localFileWidget = new QVBox( topFrame);
-   topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
-   ++iii;
-   QHBox* temphb = new QHBox( localFileWidget );
-   lab = new QLabel( i18n("Local file:"), temphb);
-   mRemoteFile = new QLineEdit(localFileWidget);
+void SyncPrefWidget_Settings::loadSettings( KRES::Resource *res )
+{
+  KABC::Resource* resource = (KABC::Resource*)( res );
+  KSyncProfile* prof = resource->getSyncProfile();
 
-   button = new QPushButton( i18n("Choose..."), temphb );
-   connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
-*/
-   QHBox* temphb;
+  if (prof == 0)
+  {
+    qDebug("SyncPrefWidget_Settings::loadSettings: something is wrong, because resource does have no syncprofile" );
+    return;
+  }
 
-   remoteFileWidget = new QVBox( this);
-   topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
-   ++iii;
-   lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
-   mRemotePrecommand = new QLineEdit(remoteFileWidget);
+  mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
+  mAskForPreferences->setChecked( prof->getAskForPreferences());
+  mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
+  mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
+  mWriteBackFile->setChecked( prof->getWriteBackFile());
+}
 
-   lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
-   mLocalTempFile = new QLineEdit(remoteFileWidget);
+void SyncPrefWidget_Settings::saveSettings( KRES::Resource *res )
+{
+  KABC::Resource* resource = (KABC::Resource*)( res );
+  KSyncProfile* prof = resource->getSyncProfile();
 
+  if (prof == 0)
+  {
+    qDebug("SyncPrefWidget_Settings::saveSettings: something is wrong, because resource does have no syncprofile" );
+    return;
+  }
 
-   lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
-   mRemotePostcommand = new QLineEdit(remoteFileWidget);
+  prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
+  prof->setAskForPreferences( mAskForPreferences->isChecked());
+  prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
+  prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
+  prof->setWriteBackFile( mWriteBackFile->isChecked());
+}
 
-   lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
-   temphb = new QHBox( remoteFileWidget );
-   button = new QPushButton( i18n("ssh/scp"), temphb );
-   connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
-   button = new QPushButton( i18n("ftp"), temphb );
-   connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
-   lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
 
+/***********************************************************************
+ *
+ *
+ **********************************************************************/
 
-}
-/*US
-void SyncPrefWidget::slotOK()
+SyncPrefWidget_Conflict::SyncPrefWidget_Conflict(QWidget *parent, const char *name) :
+  KRES::SyncWidget(parent, name)
 {
-    if ( mMyMachineName->text() == "undefined" ) {
-        KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
-        return;
-    }
-    int i;
-    for (i = 0; i < mSyncProfileNames.count(); ++ i) {
-        if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1  ) {
-            KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
-            return;
-        }
-    }
-    usrWriteConfig();
-    QDialog::accept();
+  init();
 }
-void SyncPrefWidget::accept()
+
+
+SyncPrefWidget_Conflict::~SyncPrefWidget_Conflict()
 {
-    slotOK();
 }
-void KOSyncPrefsDialog::chooseFile()
+
+void SyncPrefWidget_Conflict::init()
 {
-    QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
+  QGridLayout *topLayout = new QGridLayout( this, 6,2 );
+  topLayout->setMargin( KDialog::marginHint() );
+  topLayout->setSpacing( KDialog::spacingHint() );
 
-    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
-    if ( fn == "" )
-        return;
-    mRemoteFile->setText( fn );
+  int iii = 0;
+
+  QButtonGroup* gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("In case of conflicts"), this);
+  topLayout->addMultiCellWidget(gr, iii,iii,0,1);
+  ++iii;
+  loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
+  rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
+  newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
+  ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
+  f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr );
+  f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr );
+   // both = new QRadioButton ( i18n("Take both on conflict"), gr );
 }
 
-void KOSyncPrefsDialog::textChanged( const QString &  s )
+void SyncPrefWidget_Conflict::loadSettings( KRES::Resource *res )
 {
-    if ( mProfileBox->count() == 0 )
-        return;
-    if ( currentSelection < 3 ) {
-        //KMessageBox::error(this,i18n("This profil name\ncannot be edited!\n"),i18n("KO/Pi config error"));
-        mProfileBox->blockSignals( true );
-        mProfileBox->setCurrentItem(mProfileBox-> currentItem ());
-        mProfileBox->blockSignals( false );
+  KABC::Resource* resource = (KABC::Resource*)( res );
+  KSyncProfile* prof = resource->getSyncProfile();
+
+  if (prof == 0)
+  {
+    qDebug("SyncPrefWidget_Conflict::loadSettings: something is wrong, because resource does have no syncprofile" );
         return;
     }
-    //qDebug("cur i %d ",mProfileBox-> currentItem () );
-    mProfileBox->changeItem ( s, mProfileBox-> currentItem () ) ;
-    KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
-    prof->setName( s );
-    mSyncProfileNames[mProfileBox-> currentItem ()] = s;
-}
-void KOSyncPrefsDialog::profileChanged( int item )
-{
-    //qDebug("KOSyncPrefsDialog::profileChanged %d ", item );
-    KSyncProfile* prof;
-    saveProfile();
-    currentSelection = item;
-    prof = mSyncProfiles.at(item) ;
-    mRemotePrecommand->setText(prof->getPreSyncCommand());
-    mRemotePostcommand->setText(prof->getPostSyncCommand());
-    mLocalTempFile->setText(prof->getLocalTempFile());
-    mRemoteFile->setText(prof->getRemoteFileName()) ;
-    mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
-    mAskForPreferences->setChecked( prof->getAskForPreferences());
-    mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
-    mWriteBackFile->setChecked( prof->getWriteBackFile());
-    mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
 
     switch ( prof->getSyncPrefs() ) {
     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;
     }
-    mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
-    mIsNotLocal->setChecked(!prof->getIsLocalFileSync());
-    proGr->setEnabled( item > 2 );
-    if ( item < 3 ) {
-        localFileWidget->setEnabled(false);
-        remoteFileWidget->setEnabled(false);
-
-    } else
-        kindChanged( prof->getIsLocalFileSync() );
 }
 
-void KOSyncPrefsDialog::fillSSH()
+void SyncPrefWidget_Conflict::saveSettings( KRES::Resource *res )
 {
-    mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
-    mLocalTempFile->setText("/tmp/mycalendar.ics" );
-    mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
+  KABC::Resource* resource = (KABC::Resource*)( res );
+  KSyncProfile* prof = resource->getSyncProfile();
+
+  if (prof == 0)
+  {
+    qDebug("SyncPrefWidget_Conftlict::saveSettings: something is wrong, because resource does have no syncprofile" );
+    return;
 }
-void KOSyncPrefsDialog::fillFTP()
+
+  int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
+  prof->setSyncPrefs( syncprefs );
+
+}
+
+
+/***********************************************************************
+ *
+ *
+ **********************************************************************/
+
+SyncPrefWidget_Remote::SyncPrefWidget_Remote(QWidget *parent, const char *name) :
+  KRES::SyncWidget(parent, name)
 {
-    mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" );
-    mLocalTempFile->setText("/tmp/mycalendar.ics" );
-    mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
+  init();
+}
+
 
+SyncPrefWidget_Remote::~SyncPrefWidget_Remote()
+{
 }
-void KOSyncPrefsDialog::kindChanged( bool b )
+
+void SyncPrefWidget_Remote::init()
 {
+  QLabel * lab;
+  QPushButton* button;
+
+
+  QGridLayout *topLayout = new QGridLayout( this, 6,2 );
+  topLayout->setMargin( KDialog::marginHint() );
+  topLayout->setSpacing( KDialog::spacingHint() );
+
+  int iii = 0;
+
+  QButtonGroup* gr;
+
+  QButtonGroup *proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), this);
+  gr = proGr;
+  topLayout->addMultiCellWidget(gr, iii,iii,0,1);
+  ++iii;
+  mProfileKind = new QComboBox( gr );
+
+  mProfileKind->insertItem( i18n("Local file"), Local );
+  mProfileKind->insertItem( i18n("Remote file (w down/upload cmd)"),Remote );
+  mProfileKind->insertItem( i18n("Mobile device (cell phone)"), Mobile );
+
+  connect( mProfileKind, SIGNAL( activated( int ) ),
+           this, SLOT (kindChanged( int ) ) );
 
-   localFileWidget->setEnabled(b);
-   remoteFileWidget->setEnabled(!b);
+
+  QHBox* temphb;
+
+  remoteFileWidget = new QVBox( this);
+  topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
+  ++iii;
+  lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
+  mRemotePrecommand = new QLineEdit(remoteFileWidget);
+
+  lab = new QLabel( i18n("Local temp file (=Location):"), remoteFileWidget);
+  mLocalTempFile = new QLineEdit(remoteFileWidget);
+  mLocalTempFile->setEnabled(false);
+
+
+  lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
+  mRemotePostcommand = new QLineEdit(remoteFileWidget);
+
+  lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
+  temphb = new QHBox( remoteFileWidget );
+  button = new QPushButton( i18n("ssh/scp"), temphb );
+  connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
+  button = new QPushButton( i18n("ftp"), temphb );
+  connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
+  lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
 
 }
-void KOSyncPrefsDialog::deleteProfile()
+
+void SyncPrefWidget_Remote::loadSettings( KRES::Resource *res )
+{
+  KABC::Resource* resource = (KABC::Resource*)( res );
+  KSyncProfile* prof = resource->getSyncProfile();
+
+  if (prof == 0)
 {
-    //qDebug("KOSyncPrefsDialog::deleteProfile() ");
-    if ( currentSelection >= 0 ) {
-        if ( currentSelection < 3 ) {
-            KMessageBox::error(this,i18n("This profil cannot be deleted!\n"),i18n("KO/Pi config error"));
+    qDebug("SyncPrefWidget_Remote::loadSettings: something is wrong, because resource does have no syncprofile" );
             return;
         }
-        KSyncProfile* temp = mSyncProfiles.at(currentSelection);
-        mSyncProfiles.remove( temp );
-        mSyncProfileNames.remove( mSyncProfileNames.at( currentSelection ));
-        insertProfiles();
+
+  int val;
+
+  if (prof->getIsPhoneSync())
+  	val = Mobile;
+  else if (!prof->getIsLocalFileSync())
+  	val = Remote;
+  else // default value
+  	val = Local;
+
+  mProfileKind->setCurrentItem( val );
+  kindChanged( val );
+
+
+  mRemotePrecommand->setText(prof->getPreSyncCommand());
+  mLocalTempFile->setText(resource->fileName());
+  mRemotePostcommand->setText(prof->getPostSyncCommand());
     }
+
+void SyncPrefWidget_Remote::saveSettings( KRES::Resource *res )
+{
+  KABC::Resource* resource = (KABC::Resource*)( res );
+  KSyncProfile* prof = resource->getSyncProfile();
+
+  if (prof == 0)
+  {
+    qDebug("SyncPrefWidget_Remote::saveSettings: something is wrong, because resource does have no syncprofile" );
+    return;
 }
 
-void KOSyncPrefsDialog::saveProfile()
+  int val = mProfileKind->currentItem();
+
+  if (val == Mobile)
+  {
+    prof->setIsLocalFileSync(true);
+    prof->setIsPhoneSync(true);
+  }
+  else if (val == Remote)
 {
-    KSyncProfile* prof;
-    if ( currentSelection >= 0 ) {
-        prof = mSyncProfiles.at(currentSelection) ;
+    prof->setIsLocalFileSync(false);
+    prof->setIsPhoneSync(false);
+  }
+  else // default value is Local
+  {
+    prof->setIsLocalFileSync(true);
+    prof->setIsPhoneSync(false);
+  }
+
+
         prof->setPreSyncCommand( mRemotePrecommand->text());
+//US  prof->setLocalTempFile( mLocalTempFile->text());
         prof->setPostSyncCommand( mRemotePostcommand->text() );
-        prof->setLocalTempFile( mLocalTempFile->text());
-        prof->setRemoteFileName( mRemoteFile->text() );
-        prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
-        prof->setAskForPreferences( mAskForPreferences->isChecked());
-        prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
-        prof->setWriteBackFile( mWriteBackFile->isChecked());
-        prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
-        int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
-        prof->setSyncPrefs( syncprefs);
-        prof->setIsLocalFileSync( mIsLocal->isChecked() );
     }
 
-}
 
-void KOSyncPrefsDialog::insertProfiles()
-{
-    int curItem = mProfileBox->currentItem();
-    mProfileBox->blockSignals( true );
-    mProfileBox->clear();
-    mProfileBox->insertStringList (mSyncProfileNames );
-    int item = mSyncProfileNames.count() -1;
-    if ( curItem >= 0 &&  mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
-        mProfileBox->setCurrentItem( curItem );
-    else if ( item >= 0 ) {
-        mProfileBox->setCurrentItem( item );
-    }
-    currentSelection = -1;
-    if ( mSyncProfileNames.count() > 0 ) {
-        //qDebug(" profileChanged( mProfileBox->currentItem()  ");
-        profileChanged( mProfileBox->currentItem() );
-        currentSelection = mProfileBox->currentItem();
-    }
-    mProfileBox->blockSignals( false );
-}
-
-void KOSyncPrefsDialog::addProfile ( KSyncProfile* temp )
+void SyncPrefWidget_Remote::fillSSH()
 {
-    saveProfile();
-    mSyncProfiles.append( temp );
-    mSyncProfileNames << temp->getName();
-    insertProfiles();
-    int last = mProfileBox->count() -1;
-    mProfileBox->blockSignals( true );
-    mProfileBox->setCurrentItem( last );
-    mProfileBox->blockSignals( false );
-    profileChanged(last);
-}
-void KOSyncPrefsDialog::newProfile()
+  QString location = mLocalTempFile->text();
+
+    mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/"+location + " " + location );
+//US    mLocalTempFile->setText("/tmp/mycalendar.ics" );
+    mRemotePostcommand->setText("scp " + location + " zaurus@192.168.0.65:/home/zaurus/kdepim/"+location );
+}
+
+void SyncPrefWidget_Remote::fillFTP()
 {
-    addProfile ( new KSyncProfile () );
+  QString location = mLocalTempFile->text();
+
+    mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/" + location );
+//US    mLocalTempFile->setText("/tmp/mycalendar.ics" );
+    mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/"+location+ " " + location);
+
 }
 
-void KOSyncPrefsDialog::cloneProfile()
+
+void SyncPrefWidget_Remote::kindChanged( int newKind )
 {
-    if ( currentSelection >= 0 )
-        addProfile (mSyncProfiles.at(currentSelection)->clone()) ;
-    else
-        newProfile();
+
+  if (newKind == Mobile)
+    remoteFileWidget->setEnabled(false);
+  else if (newKind == Remote)
+    remoteFileWidget->setEnabled(true);
+  else // default value is local
+    remoteFileWidget->setEnabled(false);
+
 }
 
+/***********************************************************************
+ *
+ *
+ **********************************************************************/
 
-void KOSyncPrefsDialog::usrReadConfig()
+
+SyncPrefWidgetContainer::SyncPrefWidgetContainer()
+  : SyncWidgetContainer()
 {
-    KConfig *config = KOGlobals::config();
-    config->setGroup("SyncProfiles");
-    mSyncProfileNames = KOPrefs::instance()->mSyncProfileNames;
-    int i;
-    KSyncProfile* temp ;
-    mSyncProfiles.clear();
-    for ( i = 0; i < mSyncProfileNames.count();++i ) {
-        temp = new KSyncProfile ();
-        temp->setName( mSyncProfileNames[i] );
-        temp->readConfig( config );
-        mSyncProfiles.append( temp );
     }
-    insertProfiles();
-    mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
+
+KRES::SyncWidget* SyncPrefWidgetContainer::generateSettingsTab(QWidget *parent = 0, const char *name = 0)
+{
+  return new SyncPrefWidget_Settings(parent, name);
 }
 
+KRES::SyncWidget* SyncPrefWidgetContainer::generateConflictsTab(QWidget *parent = 0, const char *name = 0)
+{
+  return new SyncPrefWidget_Conflict(parent, name);
+}
 
-void KOSyncPrefsDialog::usrWriteConfig()
+KRES::SyncWidget* SyncPrefWidgetContainer::generateRemoteTab(QWidget *parent = 0, const char *name = 0)
 {
-    saveProfile();
-    if ( currentSelection >= 0 )
-        profileChanged(currentSelection);
-    KConfig *config = KOGlobals::config();
-    config->setGroup("SyncProfiles");
-    KSyncProfile* prof = mSyncProfiles.first();
-    while ( prof ) {
-        prof->writeConfig(config);
-        prof = mSyncProfiles.next();
-    }
-    KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
-    KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
-    config->writeEntry("SyncProfileNames",&mSyncProfileNames);
+  return new SyncPrefWidget_Remote(parent, name);
 }
-*/
+
diff --git a/kabc/syncprefwidget.h b/kabc/syncprefwidget.h
index 3709d78..b20a68e 100644
--- a/kabc/syncprefwidget.h
+++ b/kabc/syncprefwidget.h
@@ -1,121 +1,139 @@
 /*
     This file is part of KABC/Pi.
     Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 $Id$
 */
 
 #ifndef _SYNCPREFWIDGET_H
 #define _SYNCPREFWIDGET_H
 
 #include <kresources/syncwidget.h>
 
-/*US
-//#include <qframe.h>
-//#include <qdict.h>
-#include <qvbox.h>
-#include <qhbox.h>
-//#include <qcolor.h>
-//#include <qlistview.h>
-
-#include <kdialogbase.h>
-
-#include <libkdepim/kprefsdialog.h>
-*/
-
-//US class KColorButton;
-//US class QSpinBox;;
 class QRadioButton;
 class QCheckBox;
 class QVBox;
-//US class QSlider;
-//US class KURLRequester;
-//US class QComboBox;
+class QComboBox;
 class QLineEdit;
-//US class QStringList;
-//US class KSyncProfile;
+class KRES::Resource;
 
-
-/** Dialog to change the korganizer configuration.
-  */
-class SyncPrefWidget : public KRES::SyncWidget
+class SyncPrefWidget_Settings : public KRES::SyncWidget
 {
     Q_OBJECT
   public:
-    SyncPrefWidget(QWidget *parent=0);
-    ~SyncPrefWidget();
-//US    void usrReadConfig();
+    SyncPrefWidget_Settings(QWidget *parent=0, const char *name = 0 );
+    ~SyncPrefWidget_Settings();
 
   public slots:
-  protected slots:
-//US      void accept();
-//US      void deleteProfile();
-//US      void newProfile();
-//US      void cloneProfile();
-//US      void kindChanged(bool);
-//US      void fillSSH();
-//US      void fillFTP();
-//US      void textChanged( const QString & );
-//US      void profileChanged( int );
-//US      void chooseFile();
-//US      void slotOK();
+    virtual void loadSettings( KRES::Resource *resource );
+    virtual void saveSettings( KRES::Resource *resource );
 
-  protected:
-//US    void usrWriteConfig();
 
+  protected:
     void init();
 
   private:
+    QCheckBox* mIncludeInRing;
+    QCheckBox* mWriteBackFile;
+    QCheckBox* mWriteBackExisting;
+    QCheckBox* mAskForPreferences;
+    QCheckBox* mShowSummaryAfterSync;
+};
 
 
-//US    int currentSelection;
-//US    QPtrList<KSyncProfile> mSyncProfiles;
-//US    QStringList mSyncProfileNames;
-//US    QLineEdit * mMyMachineName;
-//US    QComboBox * mProfileBox;
-//US    QRadioButton* mIsLocal;
-    QCheckBox* mIsNotLocal;
-    QCheckBox* mIncludeInRing;
-//US    void addProfile ( KSyncProfile* );
-//US    void insertProfiles();
-//US    void saveProfile();
-//US    QButtonGroup* proGr;
 
+class SyncPrefWidget_Conflict : public KRES::SyncWidget
+{
+    Q_OBJECT
+  public:
+    SyncPrefWidget_Conflict(QWidget *parent=0, const char *name = 0 );
+    ~SyncPrefWidget_Conflict();
+
+  public slots:
+    virtual void loadSettings( KRES::Resource *resource );
+    virtual void saveSettings( KRES::Resource *resource );
+
+  protected:
+    void init();
+
+  private:
     QRadioButton* loc, *rem, *newest, *ask, *f_loc,* f_rem, *both;
+};
+
+
+
+
+class SyncPrefWidget_Remote : public KRES::SyncWidget
+{
+    Q_OBJECT
+  public:
+    SyncPrefWidget_Remote(QWidget *parent=0, const char *name = 0 );
+    ~SyncPrefWidget_Remote();
+
+  enum Types {
+    Local = 0,
+    Remote = 1,
+    Mobile =2
+  };
+
+
+  public slots:
+    virtual void loadSettings( KRES::Resource *resource );
+    virtual void saveSettings( KRES::Resource *resource );
 
+  protected slots:
+    void fillSSH();
+    void fillFTP();
+    void kindChanged( int newKind );
+
+  protected:
+    void init();
 
+  private:
+    QComboBox* mProfileKind;
     QLineEdit * mRemotePostcommand;
     QLineEdit * mRemotePrecommand;
     QLineEdit * mRemoteFile;
     QLineEdit * mLocalTempFile;
-//US    QWidget* mSetupSyncAlgTab;
-
-//US    QVBox* localFileWidget;
     QVBox* remoteFileWidget;
-    QCheckBox* mWriteBackFile;
-    QCheckBox* mWriteBackExisting;
-    QCheckBox* mAskForPreferences;
-    QCheckBox* mShowSummaryAfterSync;
 };
 
+
+
+
+
+class SyncPrefWidgetContainer : public KRES::SyncWidgetContainer
+{
+  Q_OBJECT
+
+public:
+  SyncPrefWidgetContainer();
+
+	  virtual KRES::SyncWidget* generateSettingsTab(QWidget *parent, const char *name);
+	  virtual KRES::SyncWidget* generateConflictsTab(QWidget *parent, const char *name);
+	  virtual KRES::SyncWidget* generateRemoteTab(QWidget *parent, const char *name);
+};
+
+
+
 #endif
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index 90febca..f8240f9 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -1,195 +1,241 @@
 /*
     This file is part of libkresources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
+#include <qvbox.h>
 
 #include <qcheckbox.h>
+#include <qscrollview.h>
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
 #include <klineedit.h>
 
 #include "factory.h"
 #include "configwidget.h"
 #include "configdialog.h"
 #include "syncwidget.h"
 
 using namespace KRES;
 
 ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
     Resource* resource, const char *name )
   : KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ),
-    Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget(0), mResource( resource ), mPersistentReadOnly(false)
+    Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget_Settings(0), mSyncWidget_Conflicts(0),mSyncWidget_Remote(0), mResource( resource ), mPersistentReadOnly(false)
 {
 
   Factory *factory = Factory::self( resourceFamily );
 
 //US  resize( 250, 240 );
   resize( KMIN(KGlobal::getDesktopWidth(), 250), KMIN(KGlobal::getDesktopHeight(), 240));
 
-//US  QFrame *main = makeMainWidget();
-  QFrame *main = plainPage();
+  QFrame *main;
+
+  if (!mResource->isSyncable())
+    main = plainPage();
+  else
+    main = addPage("Profile");
 
   QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() );
 
+
   QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main );
   generalGroupBox->layout()->setSpacing( spacingHint() );
   generalGroupBox->setTitle( i18n( "General Settings" ) );
 
   new QLabel( mResource->isSyncable()?i18n( "Profile Name:" ):i18n( "Name:" ), generalGroupBox );
 
   mName = new KLineEdit( generalGroupBox );
 
   if (!mResource->isSyncable()) {
   	mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox );
     mReadOnly->setChecked( mResource->readOnly() );
   }
 
   mName->setText( mResource->resourceName() );
 
   mainLayout->addWidget( generalGroupBox );
 
   QGroupBox *resourceGroupBox = new QGroupBox( 2, Qt::Horizontal,  main );
   resourceGroupBox->layout()->setSpacing( spacingHint());
   resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
                               .arg( factory->typeName( resource->type() ) ) );
   mainLayout->addWidget( resourceGroupBox );
 
   mainLayout->addStretch();
 
   mConfigWidget = factory->configWidget( resource->type(), resourceGroupBox );
   if ( mConfigWidget ) {
     connect( mConfigWidget, SIGNAL( setReadOnly( bool ) ),
         SLOT( setReadOnly( bool ) ) );
     connect( mConfigWidget, SIGNAL( setPersistentReadOnly( bool ) ),
         SLOT( setPersistentReadOnly( bool ) ) );
     mConfigWidget->setInEditMode( false );
     mConfigWidget->loadSettings( mResource );
     mConfigWidget->show();
 
   }
 
   if (mResource->isSyncable())
   {
-    QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal,  main );
-    syncGroupBox->layout()->setSpacing( spacingHint());
-    syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) );
-    mainLayout->addWidget( syncGroupBox );
+    SyncWidgetContainer* c = factory->syncWidgetContainer( resource->type() );
 
-    mainLayout->addStretch();
+    QFrame* syncPage = addPage("Settings");
+  	QVBoxLayout *syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
+    mSyncWidget_Settings = c->generateSettingsTab(syncPage);
+    syncLayout->addWidget( mSyncWidget_Settings );
+
+    syncPage = addPage("Conflicts");
+  	syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
+    mSyncWidget_Conflicts = c->generateConflictsTab(syncPage);
+    syncLayout->addWidget( mSyncWidget_Conflicts );
+
+    syncPage = addPage("Remote");
+  	syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
+    mSyncWidget_Remote = c->generateRemoteTab(syncPage);
+    syncLayout->addWidget( mSyncWidget_Remote );
+
+
+    mSyncWidget_Settings->setInEditMode( false );
+    mSyncWidget_Settings->loadSettings( mResource );
+    mSyncWidget_Settings->show();
 
-    mSyncWidget = factory->syncWidget( resource->type(), syncGroupBox );
+    mSyncWidget_Conflicts->setInEditMode( false );
+    mSyncWidget_Conflicts->loadSettings( mResource );
+    mSyncWidget_Conflicts->show();
+
+    mSyncWidget_Remote->setInEditMode( false );
+    mSyncWidget_Remote->loadSettings( mResource );
+    mSyncWidget_Remote->show();
+
+    delete c;
+
+//    QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal,  syncPage );
+//    syncGroupBox->layout()->setSpacing( spacingHint());
+//    syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) );
+//    syncLayout->addWidget( syncGroupBox );
+
+//    syncLayout->addStretch();
+/*US
+    mSyncWidget = factory->syncWidget( resource->type(), syncPage );
+    syncLayout->addWidget( mSyncWidget );
     if ( mSyncWidget ) {
       mSyncWidget->setInEditMode( false );
       mSyncWidget->loadSettings( mResource );
       mSyncWidget->show();
     }
+    */
   }
 
 
 
 
   connect( mName, SIGNAL( textChanged(const QString &)),
       SLOT( slotNameChanged(const QString &)));
 
   slotNameChanged( mName->text() );
 
 //US  setMinimumSize( 400, 250 );
   setMinimumSize( KMIN(KGlobal::getDesktopWidth(), 400), KMIN(KGlobal::getDesktopHeight(), 250));
 
 }
 
 void ConfigDialog::setInEditMode( bool value )
 {
   if ( mConfigWidget )
     mConfigWidget->setInEditMode( value );
 
-  if ( mSyncWidget )
-    mSyncWidget->setInEditMode( value );
+  if ( mSyncWidget_Settings )
+    mSyncWidget_Settings->setInEditMode( value );
+  if ( mSyncWidget_Conflicts )
+    mSyncWidget_Conflicts->setInEditMode( value );
+  if ( mSyncWidget_Remote )
+    mSyncWidget_Remote->setInEditMode( value );
 
 }
 
 void ConfigDialog::slotNameChanged( const QString &text)
 {
   enableButtonOK( !text.isEmpty() );
 }
 
 void ConfigDialog::setReadOnly( bool value )
 {
   if (!mResource->isSyncable()) {
 
     if (mPersistentReadOnly == false)
       mReadOnly->setChecked( value );
     else
       mReadOnly->setChecked( true );
   }
 }
 
 void ConfigDialog::setPersistentReadOnly( bool value )
 {
   if (!mResource->isSyncable()) {
 
     mPersistentReadOnly = value;
 
     if (value == true)
       setReadOnly( true );
 
     mReadOnly->setEnabled( !value );
   }
 }
 
 void ConfigDialog::accept()
 {
   if ( mName->text().isEmpty() ) {
     KMessageBox::sorry( this, mResource->isSyncable()?i18n( "Please enter a profile name" ):i18n( "Please enter a resource name" ) );
     return;
   }
 
   mResource->setResourceName( mName->text() );
   if (!mResource->isSyncable())
     mResource->setReadOnly( mReadOnly->isChecked() );
 
   if ( mConfigWidget ) {
     // First save generic information
     // Also save setting of specific resource type
     mConfigWidget->saveSettings( mResource );
   }
 
-  if ( mSyncWidget ) {
-    // First save generic information
-    // Also save setting of specific resource type
-    mSyncWidget->saveSettings( mResource );
-  }
+  if ( mSyncWidget_Settings )
+    mSyncWidget_Settings->saveSettings( mResource );
+  if ( mSyncWidget_Conflicts )
+    mSyncWidget_Conflicts->saveSettings( mResource );
+  if ( mSyncWidget_Remote )
+    mSyncWidget_Remote->saveSettings( mResource );
 
 
   KDialog::accept();
 }
 
 //US #include "configdialog.moc"
diff --git a/microkde/kresources/configdialog.h b/microkde/kresources/configdialog.h
index b629347..63cd4e9 100644
--- a/microkde/kresources/configdialog.h
+++ b/microkde/kresources/configdialog.h
@@ -1,65 +1,67 @@
 /*
     This file is part of libkresources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KRESOURCES_CONFIGDIALOG_H
 #define KRESOURCES_CONFIGDIALOG_H
 
 #include <kdialogbase.h>
 
 class KLineEdit;
 class QCheckBox;
 class KButtonBox;
 
 namespace KRES {
   class Resource;
   class ConfigWidget;
   class SyncWidget;
 
 class ConfigDialog : public KDialogBase
 {
     Q_OBJECT
   public:
     // Resource=0: create new resource
     ConfigDialog( QWidget *parent, const QString& resourceFamily,
 	          Resource* resource, const char *name = 0);
 
     void setInEditMode( bool value );
 
   protected slots:
     void accept();
     void setReadOnly( bool value );
     void setPersistentReadOnly( bool value );
     void slotNameChanged( const QString &text);
 
   private:
     ConfigWidget *mConfigWidget;
-    SyncWidget *mSyncWidget;
+    SyncWidget *mSyncWidget_Settings;
+    SyncWidget *mSyncWidget_Conflicts;
+    SyncWidget *mSyncWidget_Remote;
     Resource* mResource;
 
     KLineEdit *mName;
     QCheckBox *mReadOnly;
 //US add a persistent readonly flag. We need that for opie and qtopia addressbooks.
     bool mPersistentReadOnly;
 };
 
 }
 
 #endif
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index 2fe021d..1a3a22c 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -1,545 +1,554 @@
 /*
     This file is part of libkresources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qgroupbox.h>
 #include <qinputdialog.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <klistview.h>
 #include <kbuttonbox.h>
 //US #include <ktrader.h>
 
 #include "resource.h"
 #include "configdialog.h"
 
 #include "configpage.h"
 
 //US
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <kglobal.h>
 
 using namespace KRES;
 
 const QString ConfigPage::syncfamily = "syncprofiles";
 
 
 class ConfigViewItem : public QCheckListItem
 {
   public:
     ConfigViewItem( QListView *parent, Resource* resource ) :
       QCheckListItem( parent, resource->resourceName(), CheckBox ),
       mResource( resource ),
       mIsStandard( false )
     {
       setText( 1, mResource->type() );
       setOn( mResource->isActive() );
     }
 
     void setStandard( bool value )
     {
       setText( 2, ( value ? i18n( "Yes" ) : QString::null ) );
       mIsStandard = value;
     }
 
     bool standard() const { return mIsStandard; }
     bool readOnly() const { return mResource->readOnly(); }
 
     Resource *resource() { return mResource; }
 
   private:
     Resource* mResource;
 
     bool mIsStandard;
 };
 
 ConfigPage::ConfigPage( QWidget *parent, const char *name )
   : QWidget( parent, name ),
     mCurrentManager( 0 ),
     mCurrentConfig( 0 )
 {
   setCaption( i18n( "Resource Configuration" ) );
 
   QVBoxLayout *mainLayout = new QVBoxLayout( this );
 
   QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->layout()->setSpacing( 6 );
   groupBox->layout()->setMargin( 11 );
   QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 );
 
 //US  mFamilyCombo = new KComboBox( false, groupBox );
   mFamilyCombo = new KComboBox( groupBox );
   groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 );
 
   mListView = new KListView( groupBox );
   mListView->setAllColumnsShowFocus( true );
   mListView->addColumn( i18n( "Name" ) );
   mListView->addColumn( i18n( "Type" ) );
   mListView->addColumn( i18n( "Standard" ) );
 
 //US  groupBoxLayout->addWidget( mListView, 1, 0 );
   groupBoxLayout->addMultiCellWidget( mListView, 1, 1, 0, 1 );
 
 
   mAddButton = new QPushButton( i18n( "&Add..." ), this );
   groupBoxLayout->addWidget( mAddButton, 2, 0 );
   mRemoveButton = new QPushButton( i18n( "&Remove" ), this );
   groupBoxLayout->addWidget( mRemoveButton, 2, 1 );
   mEditButton = new QPushButton( i18n( "&Edit..." ), this );
   groupBoxLayout->addWidget( mEditButton, 3, 0 );
   mStandardButton = new QPushButton( i18n( "&Use as Standard" ), this );
   groupBoxLayout->addWidget( mStandardButton, 3, 1 );
 
   mRemoveButton->setEnabled( false );
   mEditButton->setEnabled( false );
   mStandardButton->setEnabled( false );
 
 
   connect( mAddButton, SIGNAL( clicked() ), SLOT(slotAdd()) );
   connect( mRemoveButton, SIGNAL( clicked() ), SLOT(slotRemove()) );
   connect( mEditButton, SIGNAL( clicked() ), SLOT(slotEdit()) );
   connect( mStandardButton, SIGNAL( clicked() ), SLOT(slotStandard()) );
 
 
   mainLayout->addWidget( groupBox );
 
   connect( mFamilyCombo, SIGNAL( activated( int ) ),
            SLOT( slotFamilyChanged( int ) ) );
   connect( mListView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionChanged() ) );
   connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
            SLOT( slotItemClicked( QListViewItem * ) ) );
 
   mLastItem = 0;
 
 //US  mConfig = new KConfig( "kcmkresourcesrc" );
   mConfig = new KConfig( locateLocal( "config", "kcmkresourcesrc")   );
   mConfig->setGroup( "General" );
 
   load();
 }
 
 ConfigPage::~ConfigPage()
 {
   QValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
     (*it).mManager->removeListener( this );
     delete (*it).mManager;
     delete (*it).mConfig;
   }
 
   mConfig->writeEntry( "CurrentFamily", mFamilyCombo->currentItem() );
   delete mConfig;
   mConfig = 0;
 }
 
 void ConfigPage::load()
 {
   kdDebug(5650) << "ConfigPage::load()" << endl;
 
   mListView->clear();
 
 //US we remove the dynamic pluginloader, and set the one family we need (contact) manually.
 
 //US  KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin" );
 //US  KTrader::OfferList::ConstIterator it;
 //US  for ( it = plugins.begin(); it != plugins.end(); ++it ) {
 //US    QVariant tmp = (*it)->property( "X-KDE-ResourceFamily" );
 //US    QString family = tmp.toString();
   QStringList families;
   families << "contact" << syncfamily;
 
 
   for ( QStringList::Iterator it = families.begin(); it != families.end(); ++it )
   {
     QString family = (*it);
     if ( !family.isEmpty() ) {
       if ( !mFamilyMap.contains( family ) ) {
         mCurrentManager = new Manager<Resource>( family, (family == syncfamily) );
         if ( mCurrentManager ) {
           mFamilyMap.append( family );
           mCurrentManager->addListener( this );
 
           ResourcePageInfo info;
           info.mManager = mCurrentManager;
           QString configDir = KGlobal::dirs()->saveLocation( "config" );
           //QString configDir = KStandardDirs::appDir() + "/config";
           if ( family == "contact" && QFile::exists( configDir + "/kabcrc" ) ) {
             info.mConfig = new KConfig( locateLocal( "config", "kabcrc" ) );
           } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) {
             info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) );
+          } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) {
+            info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) );
           } else {
             QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) );
             info.mConfig = new KConfig( configFile );
           }
           info.mManager->readConfig( info.mConfig );
 
           mInfoMap.append( info );
         }
       }
     }
   }
   mCurrentManager = 0;
 
   mFamilyCombo->insertStringList( mFamilyMap );
 
   int currentFamily = mConfig->readNumEntry( "CurrentFamily", 0 );
   mFamilyCombo->setCurrentItem( currentFamily );
   slotFamilyChanged( currentFamily );
 }
 
 void ConfigPage::save()
 {
   saveResourceSettings();
 
   QValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
     (*it).mManager->writeConfig( (*it).mConfig );
 
   emit changed( false );
 }
 
 void ConfigPage::defaults()
 {
 }
 
 void ConfigPage::slotFamilyChanged( int pos )
 {
   if ( pos < 0 || pos >= (int)mFamilyMap.count() )
     return;
 
   saveResourceSettings();
 
   mFamily = mFamilyMap[ pos ];
 
 //US  qDebug("ConfigPage::slotFamilyChanged 4 family=%s", mFamily.latin1());
 
   mCurrentManager = mInfoMap[ pos ].mManager;
   mCurrentConfig = mInfoMap[ pos ].mConfig;
 
   if ( !mCurrentManager )
     kdDebug(5650) << "ERROR: cannot create ResourceManager<Resource>( mFamily )" << endl;
 
   mListView->clear();
 
   if ( mCurrentManager->isEmpty() ) {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.1 mCurrentManager=%ul", mCurrentManager );
 
     defaults();
   }
 
   Resource *standardResource = mCurrentManager->standardResource();
 
 //US    qDebug("ConfigPage::slotFamilyChanged 4.4 resourcename=%s", standardResource->resourceName().latin1());
 
 
   Manager<Resource>::Iterator it;
   for ( it = mCurrentManager->begin(); it != mCurrentManager->end(); ++it ) {
     ConfigViewItem *item = new ConfigViewItem( mListView, *it );
     if ( *it == standardResource )
       item->setStandard( true );
   }
 
   if ( mListView->childCount() == 0 ) {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.5 ");
 
     defaults();
     emit changed( true );
     mCurrentManager->writeConfig( mCurrentConfig );
   } else {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.6 ");
 
     if ( !standardResource ) {
       KMessageBox::sorry( this, i18n( "There is no standard resource!<br> Please select one." ) );
 
 //US    qDebug("ConfigPage::slotFamilyChanged 4.7" );
 
     }
 
     emit changed( false );
   }
 }
 
 void ConfigPage::slotAdd()
 {
   if ( !mCurrentManager )
     return;
 
   QStringList types = mCurrentManager->resourceTypeNames();
   QStringList descs = mCurrentManager->resourceTypeDescriptions();
   bool ok = false;
 
   QString desc;
 
   if (mFamily == syncfamily)
   {
   	desc = QInputDialog::getItem( i18n( "Sync Configuration" ),
-                    i18n( "Please select resource type for new sync profile:" ), descs, 0,
+                    i18n( "Select resource type for the new sync profile:" ), descs, 0,
                     false, &ok, this );
   }
   else
   {
     desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
-                    i18n( "Please select type of the new resource:" ), descs, 0,
+                    i18n( "Select type of the new resource:" ), descs, 0,
                     false, &ok, this );
   }
 
   if ( !ok )
     return;
 
   QString type = types[ descs.findIndex( desc ) ];
 
   // Create new resource
   Resource *resource = mCurrentManager->createResource( type );
   if ( !resource ) {
     KMessageBox::error( this, i18n("Unable to create resource of type '%1'.")
                               .arg( type ) );
     return;
   }
 
+  if (mFamily == syncfamily)
+  {
+  	resource->setResourceName( type + "-syncprofile" );
+  }
+  else
+  {
   resource->setResourceName( type + "-resource" );
+  }
 
   ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" );
 
   if ( dlg.exec() ) {
     mCurrentManager->add( resource );
 
     ConfigViewItem *item = new ConfigViewItem( mListView, resource );
 
     mLastItem = item;
 
     // if there are only read-only resources we'll set this resource
     // as standard resource
     if ( !resource->readOnly() ) {
       bool onlyReadOnly = true;
       QListViewItem *it = mListView->firstChild();
       while ( it != 0 ) {
         ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it );
         if ( !confIt->readOnly() && confIt != item )
           onlyReadOnly = false;
 
         it = it->itemBelow();
       }
 
       if ( onlyReadOnly )
         item->setStandard( true );
     }
 
     emit changed( true );
   } else {
     delete resource;
     resource = 0;
   }
 }
 
 void ConfigPage::slotRemove()
 {
   if ( !mCurrentManager )
     return;
 
   QListViewItem *item = mListView->currentItem();
   ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item );
 
   if ( !confItem )
     return;
 
   if ( confItem->standard() ) {
     KMessageBox::sorry( this, i18n( "You cannot remove your standard resource!\n Please select a new standard resource first." ) );
     return;
   }
 
   mCurrentManager->remove( confItem->resource() );
 
   if ( item == mLastItem )
     mLastItem = 0;
 
   mListView->takeItem( item );
   delete item;
 
   emit changed( true );
 }
 
 void ConfigPage::slotEdit()
 {
   if ( !mCurrentManager )
     return;
 
   QListViewItem *item = mListView->currentItem();
   ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
   if ( !configItem )
     return;
 
   Resource *resource = configItem->resource();
 
   ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" );
 
   if ( dlg.exec() ) {
     configItem->setText( 0, resource->resourceName() );
     configItem->setText( 1, resource->type() );
 
     if ( configItem->standard() && configItem->readOnly() ) {
       KMessageBox::sorry( this, i18n( "You cannot use a read-only<br> resource as standard!" ) );
       configItem->setStandard( false );
     }
 
     mCurrentManager->resourceChanged( resource );
     emit changed( true );
   }
 }
 
 void ConfigPage::slotStandard()
 {
   if ( !mCurrentManager )
     return;
 
   ConfigViewItem *item = static_cast<ConfigViewItem*>( mListView->currentItem() );
   if ( !item )
     return;
 
   if ( item->readOnly() ) {
     KMessageBox::sorry( this, i18n( "You cannot use a read-only<br>resource as standard!" ) );
     return;
   }
 
   if ( !item->isOn() ) {
     KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) );
     return;
   }
 
   QListViewItem *it = mListView->firstChild();
   while ( it != 0 ) {
     ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it );
     if ( configItem->standard() )
       configItem->setStandard( false );
     it = it->itemBelow();
   }
 
   item->setStandard( true );
   mCurrentManager->setStandardResource( item->resource() );
    emit changed( true );
 
 }
 
 void ConfigPage::slotSelectionChanged()
 {
   bool state = ( mListView->currentItem() != 0 );
 
   mRemoveButton->setEnabled( state );
   mEditButton->setEnabled( state );
   mStandardButton->setEnabled( state );
 }
 
 void ConfigPage::resourceAdded( Resource* resource )
 {
   qDebug("ConfigPage::resourceAdded  : %s", resource->resourceName().latin1());
   kdDebug(5650) << "ConfigPage::resourceAdded( " << resource->resourceName() << " )" << endl;
   ConfigViewItem *item = new ConfigViewItem( mListView, resource );
 
   // FIXME: this sucks. This should be in the config file,
   // or application-dependent, in which case it's always Off
   item->setOn( false );
 
   mLastItem = item;
 
   emit changed( true );
 }
 
 void ConfigPage::resourceModified( Resource* resource )
 {
   qDebug("ConfigPage::resourceModified  : %s", resource->resourceName().latin1());
   kdDebug(5650) << "ConfigPage::resourceModified( " << resource->resourceName() << " )" << endl;
 }
 
 void ConfigPage::resourceDeleted( Resource* resource )
 {
   qDebug("ConfigPage::resourceDeleted  : %s", resource->resourceName().latin1());
   kdDebug(5650) << "ConfigPage::resourceDeleted( " << resource->resourceName() << " )" << endl;
 }
 
 void ConfigPage::slotItemClicked( QListViewItem *item )
 {
   ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item );
   if ( !configItem ) return;
 
   if ( configItem->standard() && !configItem->isOn() ) {
     KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) );
     configItem->setOn( true );
     return;
   }
 
   if ( configItem->isOn() != configItem->resource()->isActive() ) {
     emit changed( true );
   }
 }
 
 void ConfigPage::saveResourceSettings()
 {
   qDebug("ConfigPage::saveResourceSettings() begin");
 
   if ( mCurrentManager ) {
 
     QListViewItem *item = mListView->firstChild();
     while ( item ) {
       ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
 
       // check if standard resource
       if ( configItem->standard() && !configItem->readOnly() &&
            configItem->isOn() ) {
 
         mCurrentManager->setStandardResource( configItem->resource() );
       }
 
       // check if active or passive resource
       configItem->resource()->setActive( configItem->isOn() );
 
       item = item->nextSibling();
     }
     mCurrentManager->writeConfig( mCurrentConfig );
 
     if ( !mCurrentManager->standardResource() )
       KMessageBox::sorry( this, i18n( "There is no valid standard resource!<br>Please select one which is neither read-only nor inactive." ) );
   }
 
     qDebug("ConfigPage::saveResourceSettings() end");
 
 }
 
 //US #include "configpage.moc"
 
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 7a5c2f6..e44fce3 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -1,289 +1,289 @@
 /*
     This file is part of libkresources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 //#ifndef DESKTOP_VERSION
 #include <klibloader.h>
 //#endif
 #include <qfile.h>
 
 #include "resource.h"
 #include "factory.h"
 
 using namespace KRES;
 
 QDict<Factory> *Factory::mSelves = 0;
 static KStaticDeleter< QDict<Factory> > staticDeleter;
 
 Factory *Factory::self( const QString& resourceFamily)
 {
 
 
   Factory *factory = 0;
   if ( !mSelves )
   {
     mSelves = staticDeleter.setObject( new QDict<Factory> );
   }
 
   factory = mSelves->find( resourceFamily );
 
   if ( !factory ) {
     factory = new Factory( resourceFamily);
     mSelves->insert( resourceFamily, factory );
   }
 
   return factory;
 }
 
 Factory::Factory( const QString& resourceFamily) :
   mResourceFamily( resourceFamily )
 {
 //US so far we have three types available for resourceFamily "contact"
 // and that are "file", "dir", "ldap"
 /*US
 
   KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", QString( "[X-KDE-ResourceFamily] == '%1'" )
                                                 .arg( resourceFamily ) );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     QVariant type = (*it)->property( "X-KDE-ResourceType" );
     if ( !type.toString().isEmpty() )
       mTypeMap.insert( type.toString(), *it );
   }
 */
 
 //US new
   PluginInfo* info = new PluginInfo;
   info->library = "microkabc_file";
   info->nameLabel = i18n( "file" );
   info->descriptionLabel = i18n( "Choose one file" );
   mTypeMap.insert( "file", info );
 
   info = new PluginInfo;
   info->library = "microkabc_dir";
   info->nameLabel = i18n( "dir" );
   info->descriptionLabel = i18n( "Choose a directory with may files" );
   mTypeMap.insert( "dir", info );
 
   info = new PluginInfo;
   info->library = "microkabc_ldap";
   info->nameLabel = i18n( "ldap" );
   info->descriptionLabel = i18n( "No description available" );
   mTypeMap.insert( "ldap", info );
 
   //US add opie plugin only, if the library exists.
   QString libname = "microkabc_opie";
   QString path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
   if ( !path.isEmpty() )
   {
     info = new PluginInfo;
     info->library = libname;
     info->nameLabel = i18n( "opie" );
     info->descriptionLabel = i18n( "Opie PIM Addressbook." );
     mTypeMap.insert( "opie", info );
   }
 
   //US add qtopia plugin only, if the library exists.
   libname = "microkabc_qtopia";
   path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
   if ( !path.isEmpty() )
   {
     info = new PluginInfo;
     info->library = libname;
     info->nameLabel = i18n( "qtopia" );
     info->descriptionLabel = i18n( "Qtopia PIM Addressbook." );
     mTypeMap.insert( "qtopia", info );
   }
 
   //US add sharp plugin only, if the library exists.
   libname = "microkabc_sharpdtm";
   path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
   if ( !path.isEmpty() )
   {
     info = new PluginInfo;
     info->library = libname;
     info->nameLabel = i18n( "sharp" );
     info->descriptionLabel = i18n( "Sharp DTM Addressbook." );
     mTypeMap.insert( "sharp", info );
   }
 
 
 }
 
 Factory::~Factory()
 {
 }
 
 QStringList Factory::typeNames() const
 {
 //US method QMap::keys() not available yet. SO collect the data manually
 //US return mTypeMap.keys();
 
   QStringList result;
 
   QMap<QString, PluginInfo*>::ConstIterator it;
   for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) {
     result << it.key().latin1();
 //    qDebug("Factory::typeNames() : %s ", it.key().latin1());
 
   }
   return result;
 }
 
 ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
 {
   if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return 0;
 
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
   PluginInfo* pi = mTypeMap[ type ];
   KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
   if ( !factory ) {
     qDebug("KRES::Factory::configWidget(): Factory creation failed for library %s", pi->library.latin1());
     kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl;
     return 0;
   }
 
   PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
 
   if ( !pluginFactory ) {
     qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1());
     kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl;
     return 0;
   }
 
   ConfigWidget *wdg = pluginFactory->configWidget( parent );
   if ( !wdg ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
       qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
     return 0;
   }
   return wdg;
 
 }
 
-SyncWidget *Factory::syncWidget( const QString& type, QWidget *parent )
+SyncWidgetContainer *Factory::syncWidgetContainer( const QString& type )
 {
   if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return 0;
 
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
   PluginInfo* pi = mTypeMap[ type ];
   KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
   if ( !factory ) {
     qDebug("KRES::Factory::syncWidget(): Factory creation failed for library %s", pi->library.latin1());
     kdDebug() << "KRES::Factory::syncWidget(): Factory creation failed" << endl;
     return 0;
   }
 
   PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
 
   if ( !pluginFactory ) {
     qDebug("KRES::Factory::syncWidget(): no plugin factory for library %s", pi->library.latin1());
     kdDebug() << "KRES::Factory::syncWidget(): no plugin factory." << endl;
     return 0;
   }
 
-  SyncWidget *wdg = pluginFactory->syncWidget( parent );
+  SyncWidgetContainer *wdg = pluginFactory->syncWidgetContainer( );
   if ( !wdg ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
       qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
     return 0;
   }
   return wdg;
 
 }
 
 
 QString Factory::typeName( const QString &type ) const
 {
   if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return QString();
 
 
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  return ptr->name();
   PluginInfo* pi = mTypeMap[ type ];
   return pi->nameLabel;
 
 }
 
 QString Factory::typeDescription( const QString &type ) const
 {
   if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return QString();
 
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  return ptr->comment();
   PluginInfo* pi = mTypeMap[ type ];
   return pi->descriptionLabel;
 }
 
 Resource *Factory::resource( const QString& type, const KConfig *config, bool syncable )
 {
 
 
   if ( type.isEmpty() || !mTypeMap.contains( type ) )
     return 0;
 
 /*US load the lib not dynamicly. !!
   KService::Ptr ptr = mTypeMap[ type ];
   KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
   if ( !factory ) {
     kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl;
     return 0;
   }
 */
   PluginInfo* pi = mTypeMap[ type ];
   KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
   if ( !factory ) {
     qDebug("KRES::Factory::resource(): Factory creation failed for library %s", pi->library.latin1());
     kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl;
     return 0;
   }
 
   PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
 
   if ( !pluginFactory ) {
     qDebug("KRES::Factory::resource(): no plugin factory for library %s", pi->library.latin1());
     kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl;
     return 0;
   }
 
   Resource *resource = pluginFactory->resource( config, syncable );
   if ( !resource ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
       qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
     return 0;
   }
 
   resource->setType( type );
 
   return resource;
 }
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h
index a265bc8..0e4231b 100644
--- a/microkde/kresources/factory.h
+++ b/microkde/kresources/factory.h
@@ -1,136 +1,139 @@
 /*
     This file is part of libkresources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KRESOURCES_FACTORY_H
 #define KRESOURCES_FACTORY_H
 
 #include <qdict.h>
 #include <qstring.h>
 
 #include <kconfig.h>
 
 
 #include "resource.h"
 
 namespace KRES {
 
+class SyncWidgetContainer;
+class ConfigWidget;
+
 //US
 struct PluginInfo
 {
   QString library;
   QString nameLabel;
   QString descriptionLabel;
 };
 
 
 /**
  * Class for loading resource plugins.
  * Do not use this class directly. Use ResourceManager instead
  *
  * Example:
  *
  * <pre>
  * KABC::Factory<Calendar> *factory = KABC::Factory<Calendar>::self();
  *
  * QStringList list = factory->resources();
  * QStringList::Iterator it;
  * for ( it = list.begin(); it != list.end(); ++it ) {
  *   Resource<Calendar> *resource = factory->resource( (*it),
  *        KABC::StdAddressBook::self(), 0 );
  *   // do something with resource
  * }
  * </pre>
  */
 class Factory
 {
   public:
 
 
     /**
      * Returns the global resource factory.
      */
     static Factory *self( const QString& resourceFamily );
 
     ~Factory();
 
     /**
      * Returns the config widget for the given resource type,
      * or a null pointer if resource type doesn't exist.
      *
      * @param type   The type of the resource, returned by @ref resources()
      * @param resource The resource to be editted.
      * @param parent The parent widget
      */
     ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 );
 
     /**
      * Returns the sync widget for the given resource type,
      * or a null pointer if resource type doesn't exist,
      * or a null pointer if resource does not support syncing.
      *
      * @param type   The type of the resource, returned by @ref resources()
      * @param resource The resource to be editted.
      * @param parent The parent widget
      */
-    SyncWidget *syncWidget( const QString& type, QWidget *parent = 0 );
+    SyncWidgetContainer *syncWidgetContainer( const QString& type );
 
     /**
      * Returns a pointer to a resource object or a null pointer
      * if resource type doesn't exist.
      *
      * @param type   The type of the resource, returned by @ref resources()
      * @param ab     The address book, the resource should belong to
      * @param config The config object where the resource get it settings from, or 0 if a new resource should be created.
      * @param syncable If the resource should support syncing capabilities.
      */
     Resource *resource( const QString& type, const KConfig *config, bool syncable );
 
     /**
      * Returns a list of all available resource types.
      */
     QStringList typeNames() const;
 
     /**
      * Returns the name for a special type.
      */
     QString typeName( const QString &type ) const;
 
     /**
      * Returns the description for a special type.
      */
     QString typeDescription( const QString &type ) const;
 
   protected:
     Factory( const QString& resourceFamily);
 
   private:
     static QDict<Factory> *mSelves;
 
     QString mResourceFamily;
 //US    QMap<QString, KService::Ptr> mTypeMap;
 //US lets store the pluginfo struct as value instead of a KService
     QMap<QString, PluginInfo*> mTypeMap;
 };
 
 }
 #endif
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index c9202c9..580b5d1 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -1,416 +1,416 @@
 /*
     This file is part of libkresources
 
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KRESOURCES_RESOURCE_H
 #define KRESOURCES_RESOURCE_H
 
 //US
 #ifdef QT_THREAD_SUPPORT
 #include <qmutex.h>
 #endif //QT_THREAD_SUPPORT
 
 #include <qvaluelist.h>
 #include <qwidget.h>
 
 #include <qobject.h>
 
 #include <klibloader.h>
 
 class KConfig;
 
 namespace KRES {
 
 class ConfigWidget;
-class SyncWidget;
+class SyncWidgetContainer;
 
 /**
  * @internal
  * @libdoc The KDE Resource library
  *
  * NOTE: this library is NOT (YET?) PUBLIC. Do not publish this
  * interface, it is in constant flux.
  *
  * The KDE Resource framework can be used to manage resources of
  * different types, organized in families. The Resource framework
  * is currently used for addressbook resources in libkabc and for
  * calendar resources in libkcal.
  *
  * When you want to use the framework for a new family, you need to
  * <ul><li>Define a name for your resource family</li>
  * <li>subclass Resource and add the fields and method that are needed
  * in your application</li>
  * <li>If needed, override the doOpen() and doClose() methods.
  * <li> Provide a configuration possibility for resources in your
  * new family. You can use @ref ResourcesConfigPage to easily create a
  * KControl applet</li>
  * <li>In your application, you can use @ref ResourceManager to keep track
  * of the resources in your family, and you can use @ref ResourceSelectDialog
  * to let the user select a single resource.</li>
  * </ul>
  *
  * When you want to add a new resource type to an existing resource family,
  * you need to
  * <ul><li>Further subclass the family-specific Resource to implement
  * resource type-specific operation</li>
  * <li>Subclass ResourceConfigWidget to provide a configuration widget
  * for your new resource type</li>
  * <li>Provide a .desktop file so that the new resource type can be found
  * automatically by the ResourceManager</li>
  * </ul>
  *
  * Example:
  *
 <B>resourceexample.h</B>:
 <pre>
 #include <kconfig.h>
 #include <kresources/resource.h>
 
 class ResourceExample : public KRES::ResourceExample
 {
 public:
   ResourceExample( const KConfig * );
   ~ResourceCalendarExchange();
   void writeConfig( KConfig *config );
 private:
   QString mLocation;
   QString mPassword;
 }
 </pre>
 <B>resourceexample.cpp</B>:
 <pre>
 #include <kconfig.h>
 
 #include "resourceexample.h"
 
 ResourceExample::ResourceExample( const KConfig *config )
     : Resource( config )
 {
   if ( config ) {
     mLocation = config->readEntry( "Location" );
     mPassword = KStringHandler::obscure( config->readEntry( "Password" ) );
   } else {
     mLocation = ""; // Or some sensible default
     mPassword = "";
   }
 }
 
 void ResourceExample::writeConfig( KConfig *config )
 {
   KRES::Resource::writeConfig( config );
   config->writeEntry( "Location", mLocation );
   config->writeEntry( "Password", KStringHandler::obscure( mPassword ) );
 }
 
 extern "C"
 {
   KRES::ResourceExample *config_widget( QWidget *parent ) {
     return new ResourceExampleConfig( parent, "Configure Example Resource" );
   }
 
   KRES::Resource *resource( const KConfig *config ) {
     return new ResourceExample( config );
   }
 }
 </pre>
 * <B>resourceexampleconfig.h</B>:
 <pre>
 #include <klineedit.h>
 #include <kresources/resourceconfigwidget.h>
 
 #include "resourceexample.h"
 
 class ResourceExampleConfig : public KRES::ResourceConfigWidget
 {
   Q_OBJECT
 
 public:
   ResourceExampleConfig( QWidget* parent = 0, const char* name = 0 );
 
 public slots:
   virtual void loadSettings( KRES::Resource *resource);
   virtual void saveSettings( KRES::Resource *resource );
 
 private:
   KLineEdit* mLocationEdit;
   KLineEdit* mPasswordEdit;
 };
 </pre>
 * <B>resourceexampleconfig.cpp</B>:
 <pre>
 #include <qlayout.h>
 #include <qlabel.h"
 #include <kresources/resourceconfigwidget.h>
 #include "resourceexample.h"
 #include "resourceexampleconfig.h"
 
 ResourceExampleConfig::ResourceExampleConfig( QWidget* parent,  const char* name )
     : KRES::ResourceConfigWidget( parent, name )
 {
   resize( 245, 115 );
   QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
 
   QLabel *label = new QLabel( i18n( "Location:" ), this );
   mHostEdit = new KLineEdit( this );
   mainLayout->addWidget( label, 1, 0 );
   mainLayout->addWidget( mHostEdit, 1, 1 );
 
   label = new QLabel( i18n( "Password:" ), this );
   mPasswordEdit = new KLineEdit( this );
   mPasswordEdit->setEchoMode( QLineEdit::Password );
   mainLayout->addWidget( label, 2, 0 );
   mainLayout->addWidget( mPasswordEdit, 2, 1 );
 }
 
 void ResourceExampleConfig::loadSettings( KRES::Resource *resource )
 {
   ResourceExample* res = dynamic_cast<ResourceExample *>( resource );
   if (res) {
     mHostEdit->setText( res->host() );
     mPasswordEdit->setText( res->password() );
   } else
     kdDebug(5700) << "ERROR: ResourceExampleConfig::loadSettings(): no ResourceExample, cast failed" << endl;
 }
 
 void ResourceExampleConfig::saveSettings( KRES::Resource *resource )
 {
   ResourceExample* res = dynamic_cast<ResourceExample *>( resource );
   if (res) {
     res->setHost(mHostEdit->text());
     res->setPassword(mPasswordEdit->text());
   } else
     kdDebug(5700) << "ERROR: ResourceExampleConfig::saveSettings(): no ResourceExample, cast failed" << endl;
 }
 </pre>
 * <B>resourceexample.desktop</B>:
 <pre>
 [Desktop Entry]
 Type=Service
 
 [Misc]
 Encoding=UTF-8
 Name=Example Resource
 
 [Plugin]
 Type=exchange
 X-KDE-Library=resourceexample
 </pre>
 * <B>Makefile.am</B>
 <pre>
 kde_module_LTLIBRARIES = resourceexample.la
 
 resourceexample_la_SOURCES = resourceexample.cpp resourceexampleconfig.cpp
 resourceexample_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
 resourceexample_la_LIBADD= -lkderesources
 
 linkdir= $(kde_datadir)/resources/family
 link_DATA= resourceexample.desktop
 </pre>
  *
  *
  */
 
 /**
  * A @ref Resource  is a ...
  *
  * A subclass should reimplement at least the constructor and the
  * @ref writeConfig method.
  *
    */
 class Resource : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QValueList<Resource *> List;
 
     /**
      * Constructor. Construct resource from config.
      * @param config Configuration to read persistence information from.
      *               If config==0, create object using default settings.
      */
     Resource( const KConfig* config );
 
     /**
      * Destructor.
      */
     virtual ~Resource();
 
     /**
      * Write configuration information for this resource to a configuration
      * file. If you override this method, remember to call Resource::writeConfig
      * or Terrible Things(TM) will happen.
      * @param config Configuration to write persistence information to.
      */
     virtual void writeConfig( KConfig* config );
 
     /**
      * Open this resource, if it not already open. Increase the open
      * count of this object, and open the resource by calling @ref doOpen().
      * This method may block while another thread is concurrently opening
      * or closing the resource.
      *
      * Returns true if the resource was already opened or if it was opened
      * successfully; returns false if the resource was not opened successfully.
      */
     bool open();
 
     /**
      * Decrease the open count of this object, and if the count reaches
      * zero, close this resource by calling @ref doClose().
      * This method may block while another thread is concurrently closing
      * or opening the resource.
      */
     void close();
 
     /**
      * Returns whether the resource is open or not.
      */
     bool isOpen() const;
 
     /**
      * Returns a unique identifier. The identifier is unique for this resource.
      * It is created when the resource is first created, and it is retained
      * in the resource family configuration file for this resource.
      * @return This resource's identifier
      */
     QString identifier() const;
 
     /**
      * Returns the type of this resource.
      */
     QString type() const;
 
     /**
      * Mark the resource as read-only. You can override this method,
      * but also remember to call Resource::setReadOnly().
      */
     virtual void setReadOnly( bool value );
 
     /**
      * Returns, if the resource is read-only.
      */
     virtual bool readOnly() const;
 
     /**
      * Set the name of resource.You can override this method,
      * but also remember to call Resource::setResourceName().
      */
     virtual void setResourceName( const QString &name );
 
     /**
      * Returns the name of resource.
      */
     virtual QString resourceName() const;
 
 
 
   	virtual bool isSyncable() const = 0;
 
 
     /**
       Sets, if the resource is active.
     */
     void setActive( bool active );
 
     /**
       Return true, if the resource is active.
     */
     bool isActive() const;
 
     friend class Factory;
     friend class ManagerImpl;
 
     /**
       Print resource information as debug output.
     */
     virtual void dump() const;
 
 
   protected:
     /**
      * Open this resource. When called, the resource must be in
      * a closed state.
      *
      * Returns true if the resource was opened successfully;
      * returns false if the resource was not opened successfully.
      *
      * The result of this call can be accessed later by @ref isOpen()
      */
     virtual bool doOpen() { return true; }
 
     /**
      * Close this resource. Pre-condition: resource is open.
      * Post-condition: resource is closed.
      */
     virtual void doClose() {}
 
     void setIdentifier( const QString& identifier );
     void setType( const QString& type );
 
   private:
     class ResourcePrivate;
     ResourcePrivate *d;
 };
 
 class PluginFactoryBase : public KLibFactory
 {
   public:
     virtual Resource *resource( const KConfig *config, bool syncable ) = 0;
 
     virtual ConfigWidget *configWidget( QWidget *parent ) = 0;
 
-    virtual SyncWidget *syncWidget( QWidget *parent ) = 0;
+    virtual SyncWidgetContainer *syncWidgetContainer() = 0;
 
   protected:
     virtual QObject* createObject( QObject*, const char*, const char*,
                                    const QStringList & )
     {
       return 0;
     }
 };
 
 template<class TR,class TC, class TS>
 class PluginFactory : public PluginFactoryBase
 {
   public:
     Resource *resource( const KConfig *config, bool syncable )
     {
       return new TR( config, syncable );
     }
 
     ConfigWidget *configWidget( QWidget *parent )
     {
       return new TC( parent );
     }
 
-    virtual SyncWidget *syncWidget( QWidget *parent )
+    SyncWidgetContainer *syncWidgetContainer()
     {
-      return new TS( parent );
+      return new TS();
     }
 
 };
 
 
 
 }
 
 #endif
diff --git a/microkde/kresources/syncwidget.h b/microkde/kresources/syncwidget.h
index e94252c..6632b69 100644
--- a/microkde/kresources/syncwidget.h
+++ b/microkde/kresources/syncwidget.h
@@ -1,62 +1,72 @@
 /*
     This file is part of libkresources.
     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 KRESOURCES_SYNCWIDGET_H
 #define KRESOURCES_SYNCWIDGET_H
 
 #include <qwidget.h>
 
 #include <kconfig.h>
 
 #include "resource.h"
 
 namespace KRES {
 
 class SyncWidget : public QWidget
 {
   Q_OBJECT
 
 public:
   SyncWidget( QWidget *parent = 0, const char *name = 0 );
 
   /**
     Sets the widget to 'edit' mode. Reimplement this method if you are
     interested in the mode change (to disable some GUI element for
     example). By default the widget is in 'create new' mode.
    */
   virtual void setInEditMode( bool value );
 
 public slots:
   virtual void loadSettings( Resource *resource );
   virtual void saveSettings( Resource *resource );
 
 signals:
 //US  void setReadOnly( bool value );
 //US  void setPersistentReadOnly( bool value );
 
 
 protected:
 //US  Resource* mResource;
 };
 
+class SyncWidgetContainer : public QObject
+{
+  Q_OBJECT
+
+public:
+  virtual SyncWidget* generateSettingsTab(QWidget *parent = 0, const char *name = 0) = 0;
+  virtual SyncWidget* generateConflictsTab(QWidget *parent = 0, const char *name = 0) = 0;
+  virtual SyncWidget* generateRemoteTab(QWidget *parent = 0, const char *name = 0) = 0;
+};
+
 }
 #endif