-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 | |||
@@ -140,9 +140,12 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
140 | topLayout->addWidget(mProfileBox, iii,1); | 140 | topLayout->addWidget(mProfileBox, iii,1); |
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 ); |
148 | topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1); | 151 | topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1); |
@@ -275,6 +278,7 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
275 | mWriteBackExisting->setChecked( prof->getWriteBackExisting() ); | 278 | mWriteBackExisting->setChecked( prof->getWriteBackExisting() ); |
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() ) { |
280 | case 0: | 284 | case 0: |
@@ -361,6 +365,7 @@ void KSyncPrefsDialog::saveProfile() | |||
361 | prof->setWriteBackExisting(mWriteBackExisting->isChecked() ); | 365 | prof->setWriteBackExisting(mWriteBackExisting->isChecked() ); |
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); |
366 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); | 371 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); |
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index 90fa286..c663d22 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h | |||
@@ -85,6 +85,7 @@ class KSyncPrefsDialog : public KDialog | |||
85 | QRadioButton* mIsLocal; | 85 | QRadioButton* mIsLocal; |
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(); |
90 | void saveProfile(); | 91 | void saveProfile(); |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index d6d8fa3..ea41a85 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -52,6 +52,7 @@ KSyncProfile* KSyncProfile::clone() | |||
52 | myClone->setWriteBackExisting(mWriteBackExisting ); | 52 | myClone->setWriteBackExisting(mWriteBackExisting ); |
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 ); |
57 | myClone->setName( "noName" ); | 58 | myClone->setName( "noName" ); |
@@ -71,6 +72,7 @@ void KSyncProfile::setDefault() | |||
71 | mWriteBackExisting = false; | 72 | mWriteBackExisting = false; |
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; |
76 | 78 | ||
@@ -83,6 +85,7 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
83 | mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); | 85 | mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); |
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 ); |
88 | mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); | 91 | mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); |
@@ -99,6 +102,7 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
99 | config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); | 102 | config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); |
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 ); |
104 | config->writeEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); | 108 | config->writeEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); |
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index 3f7f1ac..df1b49e 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h | |||
@@ -79,6 +79,8 @@ class KSyncProfile : public QObject { | |||
79 | bool getWriteBackFile( ) { return mWriteBackFile;} | 79 | bool getWriteBackFile( ) { return mWriteBackFile;} |
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;} |
84 | void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;} | 86 | void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;} |
@@ -91,6 +93,7 @@ class KSyncProfile : public QObject { | |||
91 | QString mLocalTempFile; | 93 | QString mLocalTempFile; |
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; |
96 | bool mWriteBackExisting; | 99 | bool mWriteBackExisting; |