Fixed sync config

5 files changed, 18 insertions, 5 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d0d1f3b..298fa82 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -859,5 +859,5 @@ int MainWindow::ringSync()
     int i;  
     QTime timer;
-    KConfig *config = KOGlobals::config();
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
     QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
@@ -866,5 +866,5 @@ int MainWindow::ringSync()
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
-        temp->readConfig(config);
+        temp->readConfig(&config);
         if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2  )) {
             setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
@@ -957,8 +957,8 @@ void MainWindow::slotSyncMenu( int action )
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
     mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
-    KConfig *config = KOGlobals::config();
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
-    temp->readConfig(config);
+    temp->readConfig(&config);
     KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
     KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
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()
    ++iii;
 
-   mIncludeInRing = new QCheckBox( i18n("Include in multiple sync"), topFrame   );
+   mIncludeInRing = new QCheckBox( i18n("Include in multiple calendar sync"), topFrame   );
    topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1);
    ++iii;
+   mIncludeInRingAB = new QCheckBox( i18n("Include in multiple addressbook sync"), topFrame   );
+   topLayout->addMultiCellWidget(mIncludeInRingAB, iii,iii,0,1);
+   ++iii;
 
    mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
@@ -276,4 +279,5 @@ void KSyncPrefsDialog::profileChanged( int item )
     mWriteBackFile->setChecked( prof->getWriteBackFile());
     mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
+    mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
     
     switch ( prof->getSyncPrefs() ) {
@@ -362,4 +366,5 @@ void KSyncPrefsDialog::saveProfile()
         prof->setWriteBackFile( mWriteBackFile->isChecked());
         prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
+        prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
         int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
         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
     QRadioButton* mIsNotLocal;
     QCheckBox* mIncludeInRing;
+    QCheckBox* mIncludeInRingAB;
     void addProfile ( KSyncProfile* );
     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()
     myClone->setWriteBackFile( mWriteBackFile);
     myClone->setIncludeInRingSync( mIncludeInRingSync );
+    myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
     myClone->setSyncPrefs( mSyncPrefs);
     myClone->setIsLocalFileSync( mIsLocalFileSync );
@@ -72,4 +73,5 @@ void KSyncProfile::setDefault()
     mWriteBackFile = true;
     mIncludeInRingSync = false;
+    mIncludeInRingSyncAB = false;
     mSyncPrefs = SYNC_PREF_ASK;
     mIsLocalFileSync = true;
@@ -84,4 +86,5 @@ void KSyncProfile::readConfig(KConfig *config )
     mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
     mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync  );
+    mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB  );
     mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile );
     mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName );
@@ -100,4 +103,5 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
     config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync  );
+    config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB  );
     config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile );
     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 {
     void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;}
     bool getIncludeInRingSync( ) { return mIncludeInRingSync;}
+    void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;}
+    bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;}
     void setSyncPrefs( int n ) { mSyncPrefs= n;}
     int getSyncPrefs( ) { return mSyncPrefs;}
@@ -92,4 +94,5 @@ class KSyncProfile : public QObject {
     QString mRemoteFileName;
     bool mIncludeInRingSync;
+    bool mIncludeInRingSyncAB;
     int mSyncPrefs;
     bool mWriteBackFile;