-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) | |||
2736 | } else { | 2736 | } else { |
2737 | Addressee lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2737 | external = !manager->mIsKapiFile; |
2738 | if ( ! lse.isEmpty() ) { | ||
2739 | if ( lse.familyName().left(4) == "!E: " ) | ||
2740 | external = true; | ||
2741 | } else { | ||
2742 | bool found = false; | ||
2743 | AddressBook::Iterator it; | ||
2744 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | ||
2745 | if ( (*it).revision().date().year() > 2003 ) { | ||
2746 | found = true; | ||
2747 | break; | ||
2748 | } | ||
2749 | } | ||
2750 | external = ! found; | ||
2751 | } | ||
2752 | |||
2753 | if ( external ) { | 2738 | 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 ) | |||
182 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 182 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
183 | mIsKapiFile = temp->getIsKapiFile(); | ||
183 | mWriteBackInFuture = 0; | 184 | 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 | |||
136 | bool mShowSyncSummary; | 136 | bool mShowSyncSummary; |
137 | bool mIsKapiFile; | ||
137 | bool mWriteBackExistingOnly; | 138 | 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() | |||
244 | mRemoteFilePWM = new QLineEdit( temphb); | 244 | mRemoteFilePWM = new QLineEdit( temphb); |
245 | mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget ); | ||
246 | |||
245 | 247 | ||
@@ -271,3 +273,3 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
271 | mRemotePostcommandPWM = new QLineEdit(temphb ); | 273 | mRemotePostcommandPWM = new QLineEdit(temphb ); |
272 | 274 | mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget ); | |
273 | lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget); | 275 | lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget); |
@@ -459,2 +461,5 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
459 | mIsPi->setChecked(prof->getIsPiSync()) ; | 461 | mIsPi->setChecked(prof->getIsPiSync()) ; |
462 | mIsKapiFileL->setChecked(prof->getIsKapiFile()) ; | ||
463 | mIsKapiFileR->setChecked(prof->getIsKapiFile()) ; | ||
464 | |||
460 | mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() ); | 465 | mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() ); |
@@ -499,2 +504,8 @@ void KSyncPrefsDialog::kindChanged( bool b ) | |||
499 | { | 504 | { |
505 | |||
506 | if ( mIsLocal->isChecked () ) { | ||
507 | mIsKapiFileL->setChecked( mIsKapiFileR->isChecked() ); | ||
508 | } else { | ||
509 | mIsKapiFileR->setChecked( mIsKapiFileL->isChecked() ); | ||
510 | } | ||
500 | 511 | ||
@@ -581,2 +592,3 @@ void KSyncPrefsDialog::saveProfile() | |||
581 | prof->setIsPiSync( mIsPi->isChecked() ); | 592 | prof->setIsPiSync( mIsPi->isChecked() ); |
593 | prof->setIsKapiFile( mIsKapiFileL->isChecked() ); | ||
582 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); | 594 | 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 | |||
148 | QCheckBox* mWriteContactToSIM; | 148 | QCheckBox* mWriteContactToSIM; |
149 | QCheckBox* mIsKapiFileL; | ||
150 | QCheckBox* mIsKapiFileR; | ||
149 | }; | 151 | }; |
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() | |||
78 | myClone->setIsPhoneSync( mIsPhoneSync ); | 78 | myClone->setIsPhoneSync( mIsPhoneSync ); |
79 | myClone->setIsKapiFile( mIsKapiFile ); | ||
79 | myClone->setIsPiSync( mIsPiSync ); | 80 | myClone->setIsPiSync( mIsPiSync ); |
@@ -127,2 +128,3 @@ void KSyncProfile::setDefault() | |||
127 | mIsPiSync = false; | 128 | mIsPiSync = false; |
129 | mIsKapiFile = false; | ||
128 | mWriteContactToSIM = false; | 130 | mWriteContactToSIM = false; |
@@ -184,2 +186,3 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
184 | mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); | 186 | mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); |
187 | mIsKapiFile = config->readBoolEntry( "IsKapiFile", mIsKapiFile ); | ||
185 | } | 188 | } |
@@ -246,2 +249,3 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
246 | config->writeEntry( "IsPiSync", mIsPiSync ); | 249 | config->writeEntry( "IsPiSync", mIsPiSync ); |
250 | config->writeEntry( "IsKapiFile", mIsKapiFile ); | ||
247 | } | 251 | } |
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 { | |||
136 | bool getIsPiSync( ) { return mIsPiSync;} | 136 | bool getIsPiSync( ) { return mIsPiSync;} |
137 | void setIsKapiFile( bool b ) { mIsKapiFile= b;} | ||
138 | bool getIsKapiFile( ) { return mIsKapiFile;} | ||
137 | private: | 139 | private: |
@@ -182,2 +184,3 @@ class KSyncProfile : public QObject { | |||
182 | bool mIsPiSync; | 184 | bool mIsPiSync; |
185 | bool mIsKapiFile; | ||
183 | }; | 186 | }; |