4 files changed, 186 insertions, 16 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 47d298a..70eda1b 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -236,3 +236,23 @@ void AddressBook::init(const QString &config, const QString &family )
   d = new AddressBookData;
+  QString fami = family;
+  qDebug("new ab ");
   if (config != 0) {
+      qDebug("config != 0 ");
+      if ( family == "syncContact" ) {
+          qDebug("creating sync config ");
+          fami = "contact";
+          KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
+          con->setGroup( "General" );
+          con->writeEntry( "ResourceKeys", QString("sync") );
+          con->writeEntry( "Standard", QString("sync") );
+          con->setGroup( "Resource_sync" );
+          con->writeEntry( "FileFormat", QString("vcard") );
+          con->writeEntry( "FileName", config );
+          con->writeEntry( "ResourceIdentifier", QString("sync") );
+          con->writeEntry( "ResourceName", QString("sync_res") );
+          con->writeEntry( "ResourceType", QString("file") );
+          //con->sync();
+          d->mConfig = con;
+      }
+      else
     d->mConfig = new KConfig( locateLocal("config", config) );
@@ -246,4 +266,53 @@ void AddressBook::init(const QString &config, const QString &family )
 //US  d->mErrorHandler = 0;
-  d->mManager = new KRES::Manager<Resource>( family, false );
+  d->mManager = new KRES::Manager<Resource>( fami, false );
   d->mManager->readConfig( d->mConfig );
+  if ( family == "syncContact" ) {
+      KRES::Manager<Resource> *manager = d->mManager;
+      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 ) {
+          qDebug("ERROR: no standard resource");
+          res = manager->createResource( "file" );
+          if ( res )
+              {
+                  addResource( res );
+              }
+          else
+              qDebug(" No resource available!!!");
+      }
+      setStandardResource( res );
+      manager->writeConfig();
+  }
+  addCustomField( i18n( "Department" ), KABC::Field::Organization,
+                                "X-Department", "KADDRESSBOOK" );
+  addCustomField( i18n( "Profession" ), KABC::Field::Organization,
+                                "X-Profession", "KADDRESSBOOK" );
+  addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
+                                "X-AssistantsName", "KADDRESSBOOK" );
+  addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
+                                "X-ManagersName", "KADDRESSBOOK" );
+  addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
+                                "X-SpousesName", "KADDRESSBOOK" );
+  addCustomField( i18n( "Office" ), KABC::Field::Personal,
+                                "X-Office", "KADDRESSBOOK" );
+  addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
+                                "X-IMAddress", "KADDRESSBOOK" );
+  addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
+                                "X-Anniversary", "KADDRESSBOOK" );
+
+  //US added this field to become compatible with Opie/qtopia addressbook
+  // values can be "female" or "male" or "". An empty field represents undefined.
+  addCustomField( i18n( "Gender" ), KABC::Field::Personal,
+                                "X-Gender", "KADDRESSBOOK" );
+  addCustomField( i18n( "Children" ), KABC::Field::Personal,
+                                "X-Children", "KADDRESSBOOK" );
+  addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
+                                "X-FreeBusyUrl", "KADDRESSBOOK" );
+  addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
+                                "X-ExternalID", "KADDRESSBOOK" );
 }
@@ -286,3 +355,2 @@ bool AddressBook::save( Ticket *ticket )
     deleteRemovedAddressees();
-
     return ticket->resource()->save( ticket );
@@ -292,2 +360,31 @@ bool AddressBook::save( Ticket *ticket )
 }
+bool AddressBook::saveAB()
+{
+  bool ok = true;
+
+  deleteRemovedAddressees();
+
+  KRES::Manager<Resource>::ActiveIterator it;
+  KRES::Manager<Resource> *manager = d->mManager;
+  for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
+    if ( !(*it)->readOnly() && (*it)->isOpen() ) {
+      Ticket *ticket = requestSaveTicket( *it );
+//        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
+      if ( !ticket ) {
+        error( i18n( "Unable to save to resource '%1'. It is locked." )
+                   .arg( (*it)->resourceName() ) );
+        return false;
+      }
+
+      //if ( !save( ticket ) ) 
+      if ( ticket->resource() ) {
+          if ( ! ticket->resource()->save( ticket )  )
+              ok = false;
+      } else 
+          ok = false;
+          
+    }
+  }
+  return ok;
+}
 
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index f89d7da..e43de31 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -143,2 +143,3 @@ class AddressBook : public QObject
     bool save( Ticket *ticket );
+    bool saveAB( );
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 49c3b19..e912941 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -150,2 +150,3 @@ $Id$
 #include <libkdepim/ksyncprofile.h>
+#include <libkdepim/ksyncprefsdialog.h>
 
@@ -181,2 +182,4 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
+#if 0
+  // LP moved to addressbook init method
   mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
@@ -206,3 +209,3 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
-
+#endif
   initGUI();
@@ -2197,4 +2200,4 @@ void KABCore::slotSyncMenu( int action )
         if ( temp->getIsLocalFileSync() ) {
-            if ( syncWithFile( temp->getRemoteFileName( ), false ) )
-                KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
+            if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
+                KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
         } else {
@@ -2319,3 +2322,3 @@ int KABCore::ringSync()
         temp->readConfig(&config);
-        if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2  )) {
+        if ( temp->getIncludeInRingSyncAB() && ( i < 1 || i > 2  )) {
             setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
@@ -2335,4 +2338,4 @@ int KABCore::ringSync()
                 if ( temp->getIsLocalFileSync() ) {
-                    if ( syncWithFile( temp->getRemoteFileName( ), true ) )
-                        KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
+                    if ( syncWithFile( temp->getRemoteFileNameAB( ), true ) )
+                        KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                 } else {
@@ -2375,3 +2378,3 @@ void KABCore::syncRemote( KSyncProfile* prof,  bool ask)
     }
-    QString command = prof->getPreSyncCommand();
+    QString command = prof->getPreSyncCommandAB();
     int fi;
@@ -2407,3 +2410,3 @@ void KABCore::syncRemote( KSyncProfile* prof,  bool ask)
     //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
-    if ( syncWithFile( prof->getLocalTempFile(), true ) ) {
+    if ( syncWithFile( prof->getLocalTempFileAB(), true ) ) {
 //         Event* e = mView->getLastSyncEvent();
@@ -2413,3 +2416,3 @@ void KABCore::syncRemote( KSyncProfile* prof,  bool ask)
         if ( KABPrefs::instance()->mWriteBackFile ) {
-            command =  prof->getPostSyncCommand(); 
+            command =  prof->getPostSyncCommandAB(); 
             int fi;
@@ -2512,3 +2515,6 @@ QString  KABCore::getPassword( )
 }
+bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode)
+{
 
+}
 bool KABCore::syncAB(QString filename, int mode)
@@ -2516,2 +2522,54 @@ bool KABCore::syncAB(QString filename, int mode)
 
+
+
+    mGlobalSyncMode = SYNC_MODE_NORMAL;
+    AddressBook abLocal(filename,"syncContact");
+    bool syncOK = false;
+    if ( abLocal.load() ) {
+        qDebug("AB loaded %s mode %d",filename.latin1(), mode );
+        AddressBook::Iterator it;
+        QStringList vcards;
+        for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
+            qDebug("Name %s ", (*it).familyName().latin1());
+        }
+        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
+        if (  syncOK ) {
+            if ( KABPrefs::instance()->mWriteBackFile )
+                {
+                    abLocal.saveAB();
+                }
+        }
+        setModified();
+        
+    }
+    if ( syncOK )
+        ;//updateView();
+    return syncOK;
+#if 0
+    mGlobalSyncMode = SYNC_MODE_NORMAL;
+    CalendarLocal* calendar = new CalendarLocal();
+    calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+    FileStorage* storage = new FileStorage( calendar );
+    bool syncOK = false;
+    storage->setFileName( filename );
+    // qDebug("loading ... ");
+    if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
+        getEventViewerDialog()->setSyncMode( true );
+        syncOK = synchronizeCalendar( mCalendar, calendar, mode );
+        getEventViewerDialog()->setSyncMode( false );
+        if (  syncOK ) {
+           if ( KOPrefs::instance()->mWriteBackFile )
+            {
+                storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+                storage->save();
+            }
+        }
+        setModified();
+    }
+    delete storage;
+    delete calendar;
+    if ( syncOK )
+        updateView();
+    return syncOK;
+#endif
 }
@@ -2520,5 +2578,16 @@ bool KABCore::syncAB(QString filename, int mode)
 void KABCore::confSync()
-{
-    //mView->confSync();
-    qDebug("pending KABCore::confSync() ");
+{ 
+    static KSyncPrefsDialog* sp = 0;
+    if ( ! sp ) {
+        sp = new KSyncPrefsDialog( this, "syncprefs", true );
+    }
+    sp->usrReadConfig();
+#ifndef DESKTOP_VERSION
+    sp->showMaximized();
+#else
+    sp->show();
+#endif
+    sp->exec();
+    KABPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames();
+    KABPrefs::instance()->mLocalMachineName = sp->getLocalMachineName ();
     fillSyncMenu();
@@ -2531,3 +2600,3 @@ void KABCore::syncSharp()
     //mView->syncSharp();
-    mModified =  true ;
+    setModified();
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 10ce8f4..4487a8a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -458,3 +458,2 @@ class KABCore : public QWidget
     void fillSyncMenu();
-    void confSync();
     QString mCurrentSyncDevice;
@@ -473,2 +472,6 @@ class KABCore : public QWidget
     QString  getPassword( );
+    int mGlobalSyncMode; 
+    bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
+  public slots:
+    void confSync();
     // *********************