summaryrefslogtreecommitdiffabout
path: root/libkdepim
Unidiff
Diffstat (limited to 'libkdepim') (more/less context) (show whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp7
-rw-r--r--libkdepim/ksyncprefsdialog.h1
-rw-r--r--libkdepim/ksyncprofile.cpp4
-rw-r--r--libkdepim/ksyncprofile.h3
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
@@ -142,5 +142,8 @@ void KSyncPrefsDialog::setupSyncAlgTab()
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
@@ -277,2 +280,3 @@ void KSyncPrefsDialog::profileChanged( int item )
277 mIncludeInRing->setChecked( prof->getIncludeInRingSync() ); 280 mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
281 mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
278 282
@@ -363,2 +367,3 @@ void KSyncPrefsDialog::saveProfile()
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 ;
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 90fa286..c663d22 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -87,2 +87,3 @@ class KSyncPrefsDialog : public KDialog
87 QCheckBox* mIncludeInRing; 87 QCheckBox* mIncludeInRing;
88 QCheckBox* mIncludeInRingAB;
88 void addProfile ( KSyncProfile* ); 89 void addProfile ( KSyncProfile* );
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index d6d8fa3..ea41a85 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -54,2 +54,3 @@ KSyncProfile* KSyncProfile::clone()
54 myClone->setIncludeInRingSync( mIncludeInRingSync ); 54 myClone->setIncludeInRingSync( mIncludeInRingSync );
55 myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
55 myClone->setSyncPrefs( mSyncPrefs); 56 myClone->setSyncPrefs( mSyncPrefs);
@@ -73,2 +74,3 @@ void KSyncProfile::setDefault()
73 mIncludeInRingSync = false; 74 mIncludeInRingSync = false;
75 mIncludeInRingSyncAB = false;
74 mSyncPrefs = SYNC_PREF_ASK; 76 mSyncPrefs = SYNC_PREF_ASK;
@@ -85,2 +87,3 @@ void KSyncProfile::readConfig(KConfig *config )
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 );
@@ -101,2 +104,3 @@ void KSyncProfile::writeConfig( KConfig * config )
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 );
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 3f7f1ac..df1b49e 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -81,2 +81,4 @@ class KSyncProfile : public QObject {
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;}
@@ -93,2 +95,3 @@ class KSyncProfile : public QObject {
93 bool mIncludeInRingSync; 95 bool mIncludeInRingSync;
96 bool mIncludeInRingSyncAB;
94 int mSyncPrefs; 97 int mSyncPrefs;