changes that resources support writing and syncing

8 files changed, 146 insertions, 211 deletions

diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 598d4fc..62a66eb 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -4,5 +4,5 @@ TARGET = microkabc
 
 
-INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include
+INCLUDEPATH += . .. ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index d978e61..29f1e3a 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -58,5 +58,5 @@ $Id$
 
 #include "resourcedir.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 using namespace KABC;
@@ -72,5 +72,5 @@ __declspec(dllexport)
   void *init_microkabc_dir()
   {
-    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidget>();
   }
 #ifndef _WIN32_
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 361b36b..d98efc8 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -52,5 +52,5 @@ $Id$
 
 #include "resourcefile.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 
@@ -67,5 +67,5 @@ __declspec(dllexport)
   void *init_microkabc_file()
   {
-    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidget>();
   }
 #ifndef _WIN32_
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 4b9dede..198e80a 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -37,5 +37,5 @@ $Id$
 #include "resourceldap.h"
 #include "resourceldapconfig.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 using namespace KABC;
@@ -46,5 +46,5 @@ extern "C"
   void *init_microkabc_ldap()
   {
-    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidget>();
   }
 }
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 1222242..5559827 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -51,5 +51,5 @@ $Id$
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 #include "opieconverter.h"
@@ -62,5 +62,5 @@ extern "C"
   void *init_microkabc_opie()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>();
   }
 }
@@ -77,6 +77,4 @@ ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
   }
 
-//  qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
-
   init( fileName );
 }
@@ -85,5 +83,4 @@ ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
-//  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
   init( fileName );
 }
@@ -96,7 +93,5 @@ void ResourceOpie::init( const QString &fileName )
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
-
   setFileName( fileName );
-
 }
 
@@ -108,5 +103,4 @@ ResourceOpie::~ResourceOpie()
   if(mAccess != 0)
     delete mAccess;
-
 }
 
@@ -252,14 +246,8 @@ bool ResourceOpie::lock( const QString &lockfileName )
   qDebug("ResourceOpie::lock: %s", fileName().latin1());
 
-
-//  qDebug("ResourceOpie::lock() %s", fileName.latin1());
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
   QString fn = lockfileName;
 
-//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" );
@@ -303,8 +291,4 @@ void ResourceOpie::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" );
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index dc88272..4a35f19 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -50,5 +50,5 @@ $Id$
 
 #include "qtopiaconverter.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 #include "resourceqtopia.h"
@@ -59,5 +59,5 @@ extern "C"
   void *init_microkabc_qtopia()
   {
-    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>();
   }
 }
@@ -68,5 +68,4 @@ ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-
   init( fileName );
 }
@@ -75,5 +74,4 @@ ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
-//  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
@@ -107,4 +105,6 @@ Ticket *ResourceQtopia::requestSaveTicket()
   kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
+  qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
+
   if ( !addressBook() ) return 0;
 
@@ -129,9 +129,9 @@ bool ResourceQtopia::doOpen()
   }
 
-  bool res = false;
+
   if (mConverter == 0)
   {
     mConverter = new QtopiaConverter();
-    res = mConverter->init();
+    bool res = mConverter->init();
     if ( !res )
     {
@@ -190,67 +190,42 @@ bool ResourceQtopia::load()
 bool ResourceQtopia::save( Ticket *ticket )
 {
-/*US
-//    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  kdDebug(5700) << "ResourceQtopia::save()" << endl;
-
-  // create backup file
-  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
+  qDebug("ResourceQtopia::save: %s", fileName().latin1());
 
-/*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
-//US ToDo: write backupfile
-  QFile info;
-  info.setName( mFileName );
-  bool ok = info.open( IO_WriteOnly );
-  if ( ok ) {
-//US    mFormat->saveAll( addressBook(), this, &info );
+  KABC::AddressBook::Iterator it;
+  bool res;
 
-    info.close();
-    ok = true;
-  }
-  else {
+  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());
+    }
   }
 
-  if ( !ok )
-    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
+//  mAccess->addressBookUpdated();
 
   delete ticket;
-  unlock( mFileName );
-
-  return ok;
-
-  qDebug("ResourceQtopia::save has to be changed");
-
-
-  access->save();
-
-*/
+  unlock( fileName() );
 
   return true;
 }
 
-bool ResourceQtopia::lock( const QString &fileName )
+bool ResourceQtopia::lock( const QString &lockfileName )
 {
-  kdDebug(5700) << "ResourceQtopia::lock()" << endl;
+  qDebug("ResourceQtopia::lock: %s", fileName().latin1());
 
-  QString fn = fileName;
+  kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
-//US change the implementation how the lockfilename is getting created
-//US  fn.replace( QRegExp("/"), "_" );
-//US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
+  QString fn = lockfileName;
 
   KURL url(fn);
@@ -275,7 +250,9 @@ bool ResourceQtopia::lock( const QString &fileName )
 
   // Create lock file
-  int result = ::link( QFile::encodeName( mLockUniqueName ),
+  int result = 0;
+#ifndef _WIN32_
+  result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
-
+#endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
@@ -290,9 +267,7 @@ bool ResourceQtopia::lock( const QString &fileName )
 void ResourceQtopia::unlock( const QString &fileName )
 {
+  qDebug("ResourceQtopia::unlock() %s", fileName.latin1());
+
   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" );
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 7b909de..14f272d 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -50,4 +50,6 @@ $Id$
 #include "resourcesharpdtm.h"
 
+#include "syncprefwidget.h"
+
 #include "stdaddressbook.h"
 
@@ -59,5 +61,5 @@ extern "C"
   void *init_microkabc_sharpdtm()
   {
-    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
+    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidget>();
   }
 }
@@ -75,5 +77,4 @@ ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
-//  qDebug("ResourceFile::ResourceSharpDTM : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
@@ -91,7 +92,9 @@ void ResourceSharpDTM::init( const QString &fileName )
 ResourceSharpDTM::~ResourceSharpDTM()
 {
-//  if (mConverter != 0)
-//    delete mConverter;
+  if (mConverter != 0)
+    delete mConverter;
 
+  if(mAccess != 0)
+    delete mAccess;
 }
 
@@ -103,11 +106,13 @@ void ResourceSharpDTM::writeConfig( KConfig *config )
 Ticket *ResourceSharpDTM::requestSaveTicket()
 {
-  kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
+  kdDebug(5700) << "ResourceSharpDTM::requestSaveTicket()" << endl;
+
+  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
 
-  if ( !lock( mFileName ) ) {
-    kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
-                  << mFileName << "'" << endl;
+  if ( !lock( fileName() ) ) {
+    kdDebug(5700) << "ResourceSharpDTM::requestSaveTicket(): Unable to lock file '"
+                  << fileName() << "'" << endl;
     return 0;
   }
@@ -118,59 +123,20 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
 bool ResourceSharpDTM::doOpen()
 {
-/*US
-  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;
-    }
-
-//US    bool ok = mFormat->checkFormat( &file );
-    bool ok = true;
-
-    file.close();
-
-    return ok;
-  }
-*/
-  return true;
-}
-
-void ResourceSharpDTM::doClose()
-{
-}
-
-bool ResourceSharpDTM::load()
-{
-  kdDebug(5700) << "ResourcSharpDTM::load(): '" << mFileName << "'" << endl;
-
-//  qDebug("ResourceSharpDTM::load: Try to load file() %s", mFileName.latin1());
+  qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
 
   // the last parameter in the SlZDataBase constructor means "readonly"
-  SlZDataBase* access = new SlZDataBase(mFileName,
+  mAccess = new SlZDataBase(fileName(),
                         SlZDataBase::addressbookItems(),
                         NULL, true);
-  if ( !access ) {
-    qDebug("Unable to load file() %s", mFileName.latin1());
-    addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
+
+  if ( !mAccess ) {
+    qDebug("Unable to load file() %s", fileName().latin1());
     return false;
   }
 
-  bool res = false;
   if (mConverter == 0)
   {
     mConverter = new SharpDTMConverter();
-    res = mConverter->init();
+    bool res = mConverter->init();
     if ( !res )
     {
@@ -178,29 +144,51 @@ bool ResourceSharpDTM::load()
 
       qDebug(msg);
-      addressBook()->error( i18n( msg ) );
-      delete access;
+      delete mAccess;
+      mAccess = 0;
       return false;
     }
   }
 
-  { //create a new scope
-    CardId id;
+ return true;
+}
+
+void ResourceSharpDTM::doClose()
+{
+  qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
 
-    for (bool res=access->first(); res == true; res=access->next()) {
-      id = access->cardId();
+  if(mAccess)
+  {
+    delete mAccess;
+    mAccess = 0;
+  }
+  // it seems so, that deletion of access deletes backend as well
+  //delete backend;
 
-      KABC::Addressee addressee;
+  return;
+}
 
-      res = mConverter->sharpToAddressee( id, access, addressee );
+bool ResourceSharpDTM::load()
+{
+  qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
 
-      if ( !addressee.isEmpty() && res )
-      {
-        addressee.setResource( this );
-        addressBook()->insertAddressee( addressee );
-      }
+  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 );
     }
   }
 
-  delete access;
   return true;
 }
@@ -208,62 +196,52 @@ bool ResourceSharpDTM::load()
 bool ResourceSharpDTM::save( Ticket *ticket )
 {
-/*US
-//    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  kdDebug(5700) << "ResourceQtopia::save()" << endl;
+  qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
 
-  // create backup file
-  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 
-/*US we use a simpler method to create a backupfile
+  KABC::AddressBook::Iterator it;
+  bool res;
 
-  (void) KSaveFile::backupFile( mFileName, QString::null
-  ,extension );
+  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+    CardId id = 0;	// 0 means new card
+    KABC::Addressee addressee = (*it);
 
-  KSaveFile saveFile( mFileName );
-  bool ok = false;
-  if ( saveFile.status() == 0 && saveFile.file() )
-  {
-    mFormat->saveAll( addressBook(), this, saveFile.file() );
-    ok = saveFile.close();
-  }
-*/
-
-/*US
-//US ToDo: write backupfile
-  QFile info;
-  info.setName( mFileName );
-  bool ok = info.open( IO_WriteOnly );
-  if ( ok ) {
-//US    mFormat->saveAll( addressBook(), this, &info );
-
-    info.close();
-    ok = true;
-  }
-  else {
+    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());
+    }
 
   }
 
-  if ( !ok )
-    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
+//US  mAccess->save();
 
   delete ticket;
-  unlock( mFileName );
+  unlock( fileName() );
 
-  return ok;
-
-  qDebug("ResourceQtopia::save has to be changed");
-*/
   return true;
 }
 
-bool ResourceSharpDTM::lock( const QString &fileName )
+bool ResourceSharpDTM::lock( const QString &lockfileName )
 {
-  kdDebug(5700) << "ResourceSharpDTM::lock()" << endl;
+  qDebug("ResourceSharpDTM::lock: %s", fileName().latin1());
 
-  QString fn = fileName;
+  kdDebug(5700) << "ResourceSharpDTM::lock()" << endl;
 
-//US change the implementation how the lockfilename is getting created
-//US  fn.replace( QRegExp("/"), "_" );
-//US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
+  QString fn = lockfileName;
 
   KURL url(fn);
@@ -288,7 +266,9 @@ bool ResourceSharpDTM::lock( const QString &fileName )
 
   // Create lock file
-  int result = ::link( QFile::encodeName( mLockUniqueName ),
+  int result = 0;
+#ifndef _WIN32_
+  result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
-
+#endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
@@ -303,9 +283,7 @@ bool ResourceSharpDTM::lock( const QString &fileName )
 void ResourceSharpDTM::unlock( const QString &fileName )
 {
+  qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1());
+
   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" );
@@ -316,21 +294,16 @@ void ResourceSharpDTM::unlock( const QString &fileName )
 }
 
-void ResourceSharpDTM::setFileName( const QString &fileName )
+void ResourceSharpDTM::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
-  mDirWatch.removeFile( mFileName );
+  mDirWatch.removeFile( fileName() );
 
-  mFileName = fileName;
+  Resource::setFileName( newFileName );
 
-  mDirWatch.addFile( mFileName );
+  mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 
 }
 
-QString ResourceSharpDTM::fileName() const
-{
-  return mFileName;
-}
-
 void ResourceSharpDTM::fileChanged()
 {
@@ -340,5 +313,5 @@ void ResourceSharpDTM::fileChanged()
     return;
 
-  QString text( i18n( "Sharp DTM resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  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();
@@ -353,5 +326,5 @@ void ResourceSharpDTM::removeAddressee( const Addressee &addr )
 void ResourceSharpDTM::cleanUp()
 {
-  unlock( mFileName );
+  unlock( fileName() );
 }
 
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h
index f495e9d..60d38a1 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.h
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h
@@ -38,4 +38,6 @@ $Id$
 
 
+class SlZDataBase;
+
 namespace KABC {
 
@@ -142,4 +144,5 @@ protected:
 
 private:
+  SlZDataBase* mAccess;
   SharpDTMConverter* mConverter;