author | zautrix <zautrix> | 2004-08-01 14:19:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-01 14:19:41 (UTC) |
commit | 3a4186926d078692ad3c2261b70406c391f27554 (patch) (unidiff) | |
tree | 6f71c51606a786711ca2885beb8ee20068e3ccd0 /libkdepim | |
parent | 43d6cf3619675856333d82ae2fcad6ce81d824b8 (diff) | |
download | kdepimpi-3a4186926d078692ad3c2261b70406c391f27554.zip kdepimpi-3a4186926d078692ad3c2261b70406c391f27554.tar.gz kdepimpi-3a4186926d078692ad3c2261b70406c391f27554.tar.bz2 |
Fixed sync config
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 7 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.h | 1 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.cpp | 4 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.h | 3 |
4 files changed, 14 insertions, 1 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 3df2a3b..7c04f48 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -141,7 +141,10 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
141 | ++iii; | 141 | ++iii; |
142 | 142 | ||
143 | mIncludeInRing = new QCheckBox( i18n("Include in multiple sync"), topFrame ); | 143 | mIncludeInRing = new QCheckBox( i18n("Include in multiple calendar sync"), topFrame ); |
144 | topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1); | 144 | topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1); |
145 | ++iii; | 145 | ++iii; |
146 | mIncludeInRingAB = new QCheckBox( i18n("Include in multiple addressbook sync"), topFrame ); | ||
147 | topLayout->addMultiCellWidget(mIncludeInRingAB, iii,iii,0,1); | ||
148 | ++iii; | ||
146 | 149 | ||
147 | mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame ); | 150 | mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame ); |
@@ -276,4 +279,5 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
276 | mWriteBackFile->setChecked( prof->getWriteBackFile()); | 279 | mWriteBackFile->setChecked( prof->getWriteBackFile()); |
277 | mIncludeInRing->setChecked( prof->getIncludeInRingSync() ); | 280 | mIncludeInRing->setChecked( prof->getIncludeInRingSync() ); |
281 | mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() ); | ||
278 | 282 | ||
279 | switch ( prof->getSyncPrefs() ) { | 283 | switch ( prof->getSyncPrefs() ) { |
@@ -362,4 +366,5 @@ void KSyncPrefsDialog::saveProfile() | |||
362 | prof->setWriteBackFile( mWriteBackFile->isChecked()); | 366 | prof->setWriteBackFile( mWriteBackFile->isChecked()); |
363 | prof->setIncludeInRingSync( mIncludeInRing->isChecked() ); | 367 | prof->setIncludeInRingSync( mIncludeInRing->isChecked() ); |
368 | prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() ); | ||
364 | int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ; | 369 | int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ; |
365 | prof->setSyncPrefs( syncprefs); | 370 | prof->setSyncPrefs( syncprefs); |
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index 90fa286..c663d22 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h | |||
@@ -86,4 +86,5 @@ class KSyncPrefsDialog : public KDialog | |||
86 | QRadioButton* mIsNotLocal; | 86 | QRadioButton* mIsNotLocal; |
87 | QCheckBox* mIncludeInRing; | 87 | QCheckBox* mIncludeInRing; |
88 | QCheckBox* mIncludeInRingAB; | ||
88 | void addProfile ( KSyncProfile* ); | 89 | void addProfile ( KSyncProfile* ); |
89 | void insertProfiles(); | 90 | void insertProfiles(); |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index d6d8fa3..ea41a85 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -53,4 +53,5 @@ KSyncProfile* KSyncProfile::clone() | |||
53 | myClone->setWriteBackFile( mWriteBackFile); | 53 | myClone->setWriteBackFile( mWriteBackFile); |
54 | myClone->setIncludeInRingSync( mIncludeInRingSync ); | 54 | myClone->setIncludeInRingSync( mIncludeInRingSync ); |
55 | myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB ); | ||
55 | myClone->setSyncPrefs( mSyncPrefs); | 56 | myClone->setSyncPrefs( mSyncPrefs); |
56 | myClone->setIsLocalFileSync( mIsLocalFileSync ); | 57 | myClone->setIsLocalFileSync( mIsLocalFileSync ); |
@@ -72,4 +73,5 @@ void KSyncProfile::setDefault() | |||
72 | mWriteBackFile = true; | 73 | mWriteBackFile = true; |
73 | mIncludeInRingSync = false; | 74 | mIncludeInRingSync = false; |
75 | mIncludeInRingSyncAB = false; | ||
74 | mSyncPrefs = SYNC_PREF_ASK; | 76 | mSyncPrefs = SYNC_PREF_ASK; |
75 | mIsLocalFileSync = true; | 77 | mIsLocalFileSync = true; |
@@ -84,4 +86,5 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
84 | mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand ); | 86 | mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand ); |
85 | mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); | 87 | mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); |
88 | mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); | ||
86 | mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile ); | 89 | mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile ); |
87 | mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName ); | 90 | mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName ); |
@@ -100,4 +103,5 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
100 | config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand ); | 103 | config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand ); |
101 | config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); | 104 | config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); |
105 | config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); | ||
102 | config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile ); | 106 | config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile ); |
103 | config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName ); | 107 | config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName ); |
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index 3f7f1ac..df1b49e 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h | |||
@@ -80,4 +80,6 @@ class KSyncProfile : public QObject { | |||
80 | void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;} | 80 | void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;} |
81 | bool getIncludeInRingSync( ) { return mIncludeInRingSync;} | 81 | bool getIncludeInRingSync( ) { return mIncludeInRingSync;} |
82 | void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;} | ||
83 | bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;} | ||
82 | void setSyncPrefs( int n ) { mSyncPrefs= n;} | 84 | void setSyncPrefs( int n ) { mSyncPrefs= n;} |
83 | int getSyncPrefs( ) { return mSyncPrefs;} | 85 | int getSyncPrefs( ) { return mSyncPrefs;} |
@@ -92,4 +94,5 @@ class KSyncProfile : public QObject { | |||
92 | QString mRemoteFileName; | 94 | QString mRemoteFileName; |
93 | bool mIncludeInRingSync; | 95 | bool mIncludeInRingSync; |
96 | bool mIncludeInRingSyncAB; | ||
94 | int mSyncPrefs; | 97 | int mSyncPrefs; |
95 | bool mWriteBackFile; | 98 | bool mWriteBackFile; |