-rw-r--r-- | kabc/addressbook.cpp | 5 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 27 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 7 |
3 files changed, 33 insertions, 6 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 17b9ba2..adb451f 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -255,6 +255,9 @@ void AddressBook::init(const QString &config, const QString &family ) if ( config.right(4) == ".xml" ) con->writeEntry( "ResourceType", QString("qtopia") ); - else + else if ( config == "sharp" ) { + con->writeEntry( "ResourceType", QString("sharp") ); + } else { con->writeEntry( "ResourceType", QString("file") ); + } //con->sync(); d->mConfig = con; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f8683e7..c1ead9d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -3027,9 +3027,32 @@ void KABCore::confSync() void KABCore::syncSharp() { + if ( ! syncExternal("sharp") ) + qDebug("ERROR sync sharp ");; +} +bool KABCore::syncExternal(QString resource) +{ if ( mModified ) save(); - qDebug("pending syncSharp() "); - //mView->syncSharp(); + if ( KABPrefs::instance()->mAskForPreferences ) + edit_sync_options(); + qDebug("syncSharp() "); + AddressBook abLocal( resource,"syncContact"); + bool syncOK = false; + if ( abLocal.load() ) { + qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); + mGlobalSyncMode = SYNC_MODE_EXTERNAL; + abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); + syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, KABPrefs::instance()->mSyncAlgoPrefs ); + if ( syncOK ) { + if ( KABPrefs::instance()->mWriteBackFile ) { + abLocal.saveAB(); + abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); + } + } setModified(); + } + if ( syncOK ) + mViewManager->refreshView(); + return syncOK; } diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index f01f306..e89bf41 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -461,7 +461,8 @@ class KABCore : public QWidget void quickSyncLocalFile(); bool syncWithFile( QString fn , bool quick ); - void KABCore::syncLocalFile(); - void KABCore::syncPhone(); - void KABCore::syncSharp(); + void syncLocalFile(); + void syncPhone(); + void syncSharp(); + bool syncExternal(QString); void multiSync( bool askforPrefs ); int mCurrentSyncProfile ; |