author | zautrix <zautrix> | 2004-10-13 03:05:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-13 03:05:35 (UTC) |
commit | 8f852fddc2dc5b63511d6ad1c85a1e74141969ff (patch) (unidiff) | |
tree | 123c7e845e1520a4dcd50dd2361252cc6ab7a76a | |
parent | e7833b80c28e38bfe6316ee5fce150635cdebe03 (diff) | |
download | kdepimpi-8f852fddc2dc5b63511d6ad1c85a1e74141969ff.zip kdepimpi-8f852fddc2dc5b63511d6ad1c85a1e74141969ff.tar.gz kdepimpi-8f852fddc2dc5b63511d6ad1c85a1e74141969ff.tar.bz2 |
fixed one syncing problem
-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 | |||
@@ -2734,22 +2734,7 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
2734 | isXML = true; | 2734 | isXML = true; |
2735 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2735 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
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 ) { |
2754 | qDebug("Setting vcf mode to external "); | 2739 | qDebug("Setting vcf mode to external "); |
2755 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2740 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 6baa2ee..5175f94 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -180,6 +180,7 @@ void KSyncManager::slotSyncMenu( int action ) | |||
180 | mSyncAlgoPrefs = temp->getSyncPrefs(); | 180 | mSyncAlgoPrefs = temp->getSyncPrefs(); |
181 | mWriteBackFile = temp->getWriteBackFile(); | 181 | mWriteBackFile = temp->getWriteBackFile(); |
182 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 182 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
183 | mIsKapiFile = temp->getIsKapiFile(); | ||
183 | mWriteBackInFuture = 0; | 184 | mWriteBackInFuture = 0; |
184 | if ( temp->getWriteBackFuture() ) | 185 | if ( temp->getWriteBackFuture() ) |
185 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 186 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 5b05383..9094aac 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -134,6 +134,7 @@ class KSyncManager : public QObject | |||
134 | QStringList mSyncProfileNames; | 134 | QStringList mSyncProfileNames; |
135 | bool mAskForPreferences; | 135 | bool mAskForPreferences; |
136 | bool mShowSyncSummary; | 136 | bool mShowSyncSummary; |
137 | bool mIsKapiFile; | ||
137 | bool mWriteBackExistingOnly; | 138 | bool mWriteBackExistingOnly; |
138 | int mSyncAlgoPrefs; | 139 | int mSyncAlgoPrefs; |
139 | bool mWriteBackFile; | 140 | bool mWriteBackFile; |
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index cf8f996..03265d2 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -242,6 +242,8 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
242 | mRemoteFile = new QLineEdit( temphb); | 242 | mRemoteFile = new QLineEdit( temphb); |
243 | mRemoteFileAB = new QLineEdit( temphb); | 243 | mRemoteFileAB = new QLineEdit( temphb); |
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 | ||
246 | // *** remote | 248 | // *** remote |
247 | remoteFileWidget = new QVBox( topFrame); | 249 | remoteFileWidget = new QVBox( topFrame); |
@@ -269,7 +271,7 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
269 | mRemotePostcommand = new QLineEdit(temphb ); | 271 | mRemotePostcommand = new QLineEdit(temphb ); |
270 | mRemotePostcommandAB = new QLineEdit(temphb ); | 272 | mRemotePostcommandAB = new QLineEdit(temphb ); |
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); |
274 | temphb = new QHBox( remoteFileWidget ); | 276 | temphb = new QHBox( remoteFileWidget ); |
275 | button = new QPushButton( i18n("ssh/scp"), temphb ); | 277 | button = new QPushButton( i18n("ssh/scp"), temphb ); |
@@ -457,6 +459,9 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
457 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; | 459 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; |
458 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; | 460 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; |
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() ); |
461 | proGr->setEnabled( item > 2 ); | 466 | proGr->setEnabled( item > 2 ); |
462 | if ( item < 3 ) { | 467 | if ( item < 3 ) { |
@@ -497,6 +502,12 @@ void KSyncPrefsDialog::fillFTP() | |||
497 | } | 502 | } |
498 | void KSyncPrefsDialog::kindChanged( bool b ) | 503 | 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 | ||
501 | if ( mIsLocal->isChecked () ) | 512 | if ( mIsLocal->isChecked () ) |
502 | localFileWidget->show(); | 513 | localFileWidget->show(); |
@@ -579,6 +590,7 @@ void KSyncPrefsDialog::saveProfile() | |||
579 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); | 590 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); |
580 | prof->setIsPhoneSync( mIsPhone->isChecked() ); | 591 | prof->setIsPhoneSync( mIsPhone->isChecked() ); |
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()); |
583 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); | 595 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); |
584 | if ( mWriteContactToSIM ) | 596 | if ( mWriteContactToSIM ) |
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index d3f8f4c..c601a58 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h | |||
@@ -146,6 +146,8 @@ class KSyncPrefsDialog : public KDialog | |||
146 | QCheckBox* mAskForPreferences; | 146 | QCheckBox* mAskForPreferences; |
147 | QCheckBox* mShowSummaryAfterSync; | 147 | QCheckBox* mShowSummaryAfterSync; |
148 | QCheckBox* mWriteContactToSIM; | 148 | QCheckBox* mWriteContactToSIM; |
149 | QCheckBox* mIsKapiFileL; | ||
150 | QCheckBox* mIsKapiFileR; | ||
149 | }; | 151 | }; |
150 | 152 | ||
151 | #endif | 153 | #endif |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index 76dfe00..029b70b 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -76,6 +76,7 @@ KSyncProfile* KSyncProfile::clone() | |||
76 | myClone->setSyncPrefs( mSyncPrefs); | 76 | myClone->setSyncPrefs( mSyncPrefs); |
77 | myClone->setIsLocalFileSync( mIsLocalFileSync ); | 77 | myClone->setIsLocalFileSync( mIsLocalFileSync ); |
78 | myClone->setIsPhoneSync( mIsPhoneSync ); | 78 | myClone->setIsPhoneSync( mIsPhoneSync ); |
79 | myClone->setIsKapiFile( mIsKapiFile ); | ||
79 | myClone->setIsPiSync( mIsPiSync ); | 80 | myClone->setIsPiSync( mIsPiSync ); |
80 | myClone->setWriteContactToSIM( mWriteContactToSIM ); | 81 | myClone->setWriteContactToSIM( mWriteContactToSIM ); |
81 | myClone->setName( "noName" ); | 82 | myClone->setName( "noName" ); |
@@ -125,6 +126,7 @@ void KSyncProfile::setDefault() | |||
125 | mName = "noName"; | 126 | mName = "noName"; |
126 | mIsPhoneSync = false; | 127 | mIsPhoneSync = false; |
127 | mIsPiSync = false; | 128 | mIsPiSync = false; |
129 | mIsKapiFile = false; | ||
128 | mWriteContactToSIM = false; | 130 | mWriteContactToSIM = false; |
129 | mPhoneDevice = "/dev/ircomm"; | 131 | mPhoneDevice = "/dev/ircomm"; |
130 | mPhoneConnection = "irda"; | 132 | mPhoneConnection = "irda"; |
@@ -182,6 +184,7 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
182 | mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); | 184 | mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); |
183 | mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync ); | 185 | mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync ); |
184 | mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); | 186 | mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); |
187 | mIsKapiFile = config->readBoolEntry( "IsKapiFile", mIsKapiFile ); | ||
185 | } | 188 | } |
186 | else | 189 | else |
187 | { | 190 | { |
@@ -244,5 +247,6 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
244 | config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); | 247 | config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); |
245 | config->writeEntry( "IsPhoneSync", mIsPhoneSync ); | 248 | config->writeEntry( "IsPhoneSync", mIsPhoneSync ); |
246 | config->writeEntry( "IsPiSync", mIsPiSync ); | 249 | config->writeEntry( "IsPiSync", mIsPiSync ); |
250 | config->writeEntry( "IsKapiFile", mIsKapiFile ); | ||
247 | } | 251 | } |
248 | 252 | ||
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index 6a68bd7..0a59111 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h | |||
@@ -134,6 +134,8 @@ class KSyncProfile : public QObject { | |||
134 | bool getIsPhoneSync( ) { return mIsPhoneSync;} | 134 | bool getIsPhoneSync( ) { return mIsPhoneSync;} |
135 | void setIsPiSync( bool b ) { mIsPiSync= b;} | 135 | void setIsPiSync( bool b ) { mIsPiSync= b;} |
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: |
138 | QString mName; | 140 | QString mName; |
139 | QString mPreSyncCommand; | 141 | QString mPreSyncCommand; |
@@ -180,6 +182,7 @@ class KSyncProfile : public QObject { | |||
180 | bool mWriteContactToSIM; | 182 | bool mWriteContactToSIM; |
181 | 183 | ||
182 | bool mIsPiSync; | 184 | bool mIsPiSync; |
185 | bool mIsKapiFile; | ||
183 | }; | 186 | }; |
184 | 187 | ||
185 | #endif | 188 | #endif |