changes that resources support writing and syncing

8 files changed, 133 insertions, 198 deletions

diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 598d4fc..62a66eb 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -5,3 +5,3 @@ 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)
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
@@ -59,3 +59,3 @@ $Id$
 #include "resourcedir.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
@@ -73,3 +73,3 @@ __declspec(dllexport)
   {
-    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidget>();
   }
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
@@ -53,3 +53,3 @@ $Id$
 #include "resourcefile.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
@@ -68,3 +68,3 @@ __declspec(dllexport)
   {
-    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidget>();
   }
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
@@ -38,3 +38,3 @@ $Id$
 #include "resourceldapconfig.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
@@ -47,3 +47,3 @@ extern "C"
   {
-    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
@@ -52,3 +52,3 @@ $Id$
 #include "stdaddressbook.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
@@ -63,3 +63,3 @@ extern "C"
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>();
   }
@@ -78,4 +78,2 @@ ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
 
-//  qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
-
   init( fileName );
@@ -86,3 +84,2 @@ ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
 {
-//  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
   init( fileName );
@@ -97,5 +94,3 @@ void ResourceOpie::init( const QString &fileName )
 
-
   setFileName( fileName );
-
 }
@@ -109,3 +104,2 @@ ResourceOpie::~ResourceOpie()
     delete mAccess;
-
 }
@@ -253,4 +247,2 @@ bool ResourceOpie::lock( const QString &lockfileName )
 
-
-//  qDebug("ResourceOpie::lock() %s", fileName.latin1());
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
@@ -259,6 +251,2 @@ bool ResourceOpie::lock( const QString &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);
@@ -304,6 +292,2 @@ 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);
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
@@ -51,3 +51,3 @@ $Id$
 #include "qtopiaconverter.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
@@ -60,3 +60,3 @@ extern "C"
   {
-    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>();
   }
@@ -69,3 +69,2 @@ ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable  )
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-
   init( fileName );
@@ -76,3 +75,2 @@ ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable  )
 {
-//  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
@@ -108,2 +106,4 @@ Ticket *ResourceQtopia::requestSaveTicket()
 
+  qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
+
   if ( !addressBook() ) return 0;
@@ -130,3 +130,3 @@ bool ResourceQtopia::doOpen()
 
-  bool res = false;
+
   if (mConverter == 0)
@@ -134,3 +134,3 @@ bool ResourceQtopia::doOpen()
     mConverter = new QtopiaConverter();
-    res = mConverter->init();
+    bool res = mConverter->init();
     if ( !res )
@@ -191,52 +191,29 @@ bool ResourceQtopia::save( Ticket *ticket )
 {
-/*US
-//    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  kdDebug(5700) << "ResourceQtopia::save()" << endl;
+  qDebug("ResourceQtopia::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 ) {
+    PimContact c;
+    KABC::Addressee addressee = (*it);
 
-  KSaveFile saveFile( mFileName );
-  bool ok = false;
-  if ( saveFile.status() == 0 && saveFile.file() )
+    res = mConverter->addresseeToQtopia( *it, c );
+    if (res == true)
   {
-    mFormat->saveAll( addressBook(), this, saveFile.file() );
-    ok = saveFile.close();
+      mAccess->addContact(c);
+//      if (res == false)
+//        qDebug("Unable to append Contact %s", c.fullName().latin1());
   }
-*/
-
-/*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
+    {
+      qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
   }
-  else {
-
   }
 
-  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() );
 
@@ -245,11 +222,9 @@ bool ResourceQtopia::save( Ticket *ticket )
 
-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;
 
@@ -276,5 +251,7 @@ 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 ) {
@@ -291,7 +268,5 @@ 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);
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
@@ -51,2 +51,4 @@ $Id$
 
+#include "syncprefwidget.h"
+
 #include "stdaddressbook.h"
@@ -60,3 +62,3 @@ extern "C"
   {
-    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig>();
+    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidget>();
   }
@@ -76,3 +78,2 @@ ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
 {
-//  qDebug("ResourceFile::ResourceSharpDTM : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
@@ -92,5 +93,7 @@ ResourceSharpDTM::~ResourceSharpDTM()
 {
-//  if (mConverter != 0)
-//    delete mConverter;
+  if (mConverter != 0)
+    delete mConverter;
 
+  if(mAccess != 0)
+    delete mAccess;
 }
@@ -104,3 +107,5 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
 {
-  kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
+  kdDebug(5700) << "ResourceSharpDTM::requestSaveTicket()" << endl;
+
+  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
 
@@ -108,5 +113,5 @@ Ticket *ResourceSharpDTM::requestSaveTicket()
 
-  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;
@@ -119,29 +124,29 @@ bool ResourceSharpDTM::doOpen()
 {
-/*US
-  QFile file( mFileName );
+  qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
 
-  if ( !file.exists() ) {
-    // try to create the file
-    bool ok = file.open( IO_WriteOnly );
-    if ( ok )
-      file.close();
+  // the last parameter in the SlZDataBase constructor means "readonly"
+  mAccess = new SlZDataBase(fileName(),
+                        SlZDataBase::addressbookItems(),
+                        NULL, true);
 
-    return ok;
-  } else {
-    if ( !file.open( IO_ReadWrite ) )
+  if ( !mAccess ) {
+    qDebug("Unable to load file() %s", fileName().latin1());
       return false;
-
-    if ( file.size() == 0 ) {
-      file.close();
-      return true;
     }
 
-//US    bool ok = mFormat->checkFormat( &file );
-    bool ok = true;
-
-    file.close();
+  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");
 
-    return ok;
+      qDebug(msg);
+      delete mAccess;
+      mAccess = 0;
+      return false;
   }
-*/
+  }
+
   return true;
@@ -151,41 +156,26 @@ void ResourceSharpDTM::doClose()
 {
-}
+  qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
 
-bool ResourceSharpDTM::load()
+  if(mAccess)
 {
-  kdDebug(5700) << "ResourcSharpDTM::load(): '" << mFileName << "'" << endl;
-
-//  qDebug("ResourceSharpDTM::load: Try to load file() %s", mFileName.latin1());
+    delete mAccess;
+    mAccess = 0;
+  }
+  // it seems so, that deletion of access deletes backend as well
+  //delete backend;
 
-  // the last parameter in the SlZDataBase constructor means "readonly"
-  SlZDataBase* access = new SlZDataBase(mFileName,
-                        SlZDataBase::addressbookItems(),
-                        NULL, true);
-  if ( !access ) {
-    qDebug("Unable to load file() %s", mFileName.latin1());
-    addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
-    return false;
+  return;
   }
 
-  bool res = false;
-  if (mConverter == 0)
-  {
-    mConverter = new SharpDTMConverter();
-    res = mConverter->init();
-    if ( !res )
+bool ResourceSharpDTM::load()
     {
-	  QString msg("Unable to initialize sharp converter. Most likely a problem with the category file");
+  qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
 
-      qDebug(msg);
-      addressBook()->error( i18n( msg ) );
-      delete access;
-      return false;
-    }
-  }
+  bool res = false;
 
-  { //create a new scope
     CardId id;
 
-    for (bool res=access->first(); res == true; res=access->next()) {
-      id = access->cardId();
+  for (bool res=mAccess->first(); res == true; res=mAccess->next())
+  {
+    id = mAccess->cardId();
 
@@ -193,3 +183,3 @@ bool ResourceSharpDTM::load()
 
-      res = mConverter->sharpToAddressee( id, access, addressee );
+    res = mConverter->sharpToAddressee( id, mAccess, addressee );
 
@@ -201,5 +191,3 @@ bool ResourceSharpDTM::load()
     }
-  }
 
-  delete access;
   return true;
@@ -209,35 +197,32 @@ 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() )
+    res = mAccess->startEditCard(id);
+    if (res == true)
   {
-    mFormat->saveAll( addressBook(), this, saveFile.file() );
-    ok = saveFile.close();
+      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());
   }
-*/
-
-/*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
+      {
+        qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1());
+        mAccess->cancelEditCard();
+      }
+    }
+    else
+    {
+      qDebug("Unable to add new card. Addressee: %s", addressee.formattedName().latin1());
   }
-  else {
 
@@ -245,12 +230,7 @@ bool ResourceSharpDTM::save( Ticket *ticket )
 
-  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;
@@ -258,11 +238,9 @@ bool ResourceSharpDTM::save( Ticket *ticket )
 
-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;
 
@@ -289,5 +267,7 @@ 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 ) {
@@ -304,7 +284,5 @@ 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);
@@ -317,10 +295,10 @@ 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();
@@ -329,7 +307,2 @@ void ResourceSharpDTM::setFileName( const QString &fileName )
 
-QString ResourceSharpDTM::fileName() const
-{
-  return mFileName;
-}
-
 void ResourceSharpDTM::fileChanged()
@@ -341,3 +314,3 @@ void ResourceSharpDTM::fileChanged()
 
-  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 ) {
@@ -354,3 +327,3 @@ 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
@@ -39,2 +39,4 @@ $Id$
 
+class SlZDataBase;
+
 namespace KABC {
@@ -143,2 +145,3 @@ protected:
 private:
+  SlZDataBase* mAccess;
   SharpDTMConverter* mConverter;