1 files changed, 42 insertions, 3 deletions

diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 8a3f4cf..6e42fd4 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -161,2 +161,5 @@ void KSyncPrefsDialog::setupSyncAlgTab()
        QVGroupBox* topFrame = gb0;
+
+       
+
        mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
@@ -179,2 +182,10 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
+       QHGroupBox* gb5 = new QHGroupBox( i18n("Apply filter when adding data to local:"), topFrame);
+       QVBox * fibo2 = new QVBox ( gb5 );
+       new QLabel ( i18n("Incoming calendar filter:"), fibo2 );
+       mFilterInCal = new QComboBox( fibo2 );
+       fibo2 = new QVBox ( gb5 );
+       new QLabel ( i18n("Incoming adressbook filter:"), fibo2 );
+       mFilterInAB = new QComboBox( fibo2 );
+
        mWriteBackFile = new QCheckBox( i18n("Write back synced data"), topFrame   );
@@ -189,2 +200,9 @@ void KSyncPrefsDialog::setupSyncAlgTab()
            mWriteBackExisting= new QCheckBox( i18n("Write back (on remote) existing entries only"), topFrame   );
+           QHGroupBox* gb4 = new QHGroupBox( i18n("Apply filter when adding data to remote:"), topFrame);
+           QVBox * fibo = new QVBox ( gb4 );
+           new QLabel ( i18n("Outgoing calendar filter:"), fibo );
+           mFilterOutCal = new QComboBox( fibo );
+           fibo = new QVBox ( gb4 );
+           new QLabel ( i18n("Outgoing addressbook filter:"), fibo );
+           mFilterOutAB = new QComboBox( fibo );
            //topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
@@ -204,2 +222,3 @@ void KSyncPrefsDialog::setupSyncAlgTab()
            gb3->setEnabled( false ); 
+           connect ( mWriteBackExisting, SIGNAL( toggled ( bool ) ), gb4, SLOT ( setDisabled ( bool )  ) );
        }
@@ -356,3 +375,15 @@ void KSyncPrefsDialog::readFilter()
     mFilterKopi =  cfgko.readListEntry("CalendarFilters");
-    mFilterKopi.prepend(i18n("No Filter") );
+    mFilterKapi = mFilterKopi;
+    mFilterOutCal->clear();
+    mFilterInCal->clear();
+    mFilterOutAB->clear();
+    mFilterInAB->clear();
+    QStringList temp = mFilterKopi;
+    temp.prepend(i18n("No Filter") );
+    mFilterOutCal->insertStringList( temp );
+    mFilterInCal->insertStringList( temp );
+    temp = mFilterKapi;
+    temp.prepend(i18n("No Filter") );
+    mFilterOutAB->insertStringList( temp );
+    mFilterInAB->insertStringList( temp );
 }
@@ -432,2 +463,3 @@ void KSyncPrefsDialog::profileChanged( int item )
     saveProfile();
+    readFilter();
     currentSelection = item;
@@ -478,2 +510,7 @@ void KSyncPrefsDialog::profileChanged( int item )
     mWriteBackPastWeeks->setValue( prof->getWriteBackPastWeeks() );
+
+    mFilterInCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterInCal () ) + 1 );
+    mFilterOutCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterOutCal () ) + 1 );
+    mFilterInAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterInAB () ) + 1 );
+    mFilterOutAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterOutAB () ) + 1 );
     
@@ -647,5 +684,7 @@ void KSyncPrefsDialog::saveProfile()
         prof->setPhoneModel(  mPhoneModel->text() );
-
+        prof->setFilterInCal ( mFilterInCal->currentText ());
+        prof->setFilterOutCal ( mFilterOutCal ->currentText ());
+        prof->setFilterInAB ( mFilterInAB ->currentText ());
+        prof->setFilterOutAB ( mFilterOutAB ->currentText ());
     }
-
 }