| -rw-r--r-- | kaddressbook/kabcore.cpp | 17 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 1 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.h | 1 | ||||
| -rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 14 | ||||
| -rw-r--r-- | libkdepim/ksyncprefsdialog.h | 2 | ||||
| -rw-r--r-- | libkdepim/ksyncprofile.cpp | 4 | ||||
| -rw-r--r-- | libkdepim/ksyncprofile.h | 3 |
7 files changed, 25 insertions, 17 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 282560f..205dbc8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2736,18 +2736,3 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) } else { - Addressee lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); - if ( ! lse.isEmpty() ) { - if ( lse.familyName().left(4) == "!E: " ) - external = true; - } else { - bool found = false; - AddressBook::Iterator it; - for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { - if ( (*it).revision().date().year() > 2003 ) { - found = true; - break; - } - } - external = ! found; - } - + external = !manager->mIsKapiFile; if ( external ) { diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 6baa2ee..5175f94 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -182,2 +182,3 @@ void KSyncManager::slotSyncMenu( int action ) mWriteBackExistingOnly = temp->getWriteBackExisting(); + mIsKapiFile = temp->getIsKapiFile(); mWriteBackInFuture = 0; diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 5b05383..9094aac 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h @@ -136,2 +136,3 @@ class KSyncManager : public QObject bool mShowSyncSummary; + bool mIsKapiFile; bool mWriteBackExistingOnly; diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index cf8f996..03265d2 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp @@ -244,2 +244,4 @@ void KSyncPrefsDialog::setupSyncAlgTab() mRemoteFilePWM = new QLineEdit( temphb); + mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget ); + @@ -271,3 +273,3 @@ void KSyncPrefsDialog::setupSyncAlgTab() mRemotePostcommandPWM = new QLineEdit(temphb ); - + mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget ); lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget); @@ -459,2 +461,5 @@ void KSyncPrefsDialog::profileChanged( int item ) mIsPi->setChecked(prof->getIsPiSync()) ; + mIsKapiFileL->setChecked(prof->getIsKapiFile()) ; + mIsKapiFileR->setChecked(prof->getIsKapiFile()) ; + mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() ); @@ -500,2 +505,8 @@ void KSyncPrefsDialog::kindChanged( bool b ) + if ( mIsLocal->isChecked () ) { + mIsKapiFileL->setChecked( mIsKapiFileR->isChecked() ); + } else { + mIsKapiFileR->setChecked( mIsKapiFileL->isChecked() ); + } + if ( mIsLocal->isChecked () ) @@ -581,2 +592,3 @@ void KSyncPrefsDialog::saveProfile() prof->setIsPiSync( mIsPi->isChecked() ); + prof->setIsKapiFile( mIsKapiFileL->isChecked() ); prof->setWriteBackFuture(mWriteBackFuture->isChecked()); diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index d3f8f4c..c601a58 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h @@ -148,2 +148,4 @@ class KSyncPrefsDialog : public KDialog QCheckBox* mWriteContactToSIM; + QCheckBox* mIsKapiFileL; + QCheckBox* mIsKapiFileR; }; diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index 76dfe00..029b70b 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp @@ -78,2 +78,3 @@ KSyncProfile* KSyncProfile::clone() myClone->setIsPhoneSync( mIsPhoneSync ); + myClone->setIsKapiFile( mIsKapiFile ); myClone->setIsPiSync( mIsPiSync ); @@ -127,2 +128,3 @@ void KSyncProfile::setDefault() mIsPiSync = false; + mIsKapiFile = false; mWriteContactToSIM = false; @@ -184,2 +186,3 @@ void KSyncProfile::readConfig(KConfig *config ) mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); + mIsKapiFile = config->readBoolEntry( "IsKapiFile", mIsKapiFile ); } @@ -246,2 +249,3 @@ void KSyncProfile::writeConfig( KConfig * config ) config->writeEntry( "IsPiSync", mIsPiSync ); + config->writeEntry( "IsKapiFile", mIsKapiFile ); } diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index 6a68bd7..0a59111 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h @@ -136,2 +136,4 @@ class KSyncProfile : public QObject { bool getIsPiSync( ) { return mIsPiSync;} + void setIsKapiFile( bool b ) { mIsKapiFile= b;} + bool getIsKapiFile( ) { return mIsKapiFile;} private: @@ -182,2 +184,3 @@ class KSyncProfile : public QObject { bool mIsPiSync; + bool mIsKapiFile; }; |