sync settings

4 files changed, 80 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;
@@ -479,2 +511,7 @@ void KSyncPrefsDialog::profileChanged( int item )
     
+    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 );
+    
     switch ( prof->getSyncPrefs() ) {
@@ -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 ());
     }
-
 }
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 997f524..24543e1 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -102,2 +102,7 @@ class KSyncPrefsDialog : public KDialog
 
+    QComboBox * mFilterOutCal;
+    QComboBox * mFilterInCal;
+    QComboBox * mFilterOutAB;
+    QComboBox * mFilterInAB;
+
     QRadioButton* loc, *rem, *newest, *ask, *f_loc,* f_rem, *both;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 9f404cb..0d72fc9 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -83,2 +83,6 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setName( "noName" );
+    myClone->setFilterInCal ( mFilterInCal );
+    myClone->setFilterOutCal ( mFilterOutCal );
+    myClone->setFilterInAB ( mFilterInAB );
+    myClone->setFilterOutAB ( mFilterOutAB );
     //myClone->setIdentifier( "noID" );
@@ -135,2 +139,6 @@ void KSyncProfile::setDefault()
     mPhoneModel = "6310i";
+    mFilterInCal = "no filter";
+    mFilterOutCal = "no filter";
+    mFilterInAB = "no filter";
+    mFilterOutAB = "no filter";
 }
@@ -190,2 +198,8 @@ void KSyncProfile::readConfig(KConfig *config )
     mIsKapiFile = config->readBoolEntry( "IsKapiFile", mIsKapiFile );
+
+    mFilterInCal = config->readEntry( "FilterInCal", mFilterInCal );
+    mFilterOutCal = config->readEntry( "FilterOutCal", mFilterOutCal );
+    mFilterInAB = config->readEntry( "FilterInAB", mFilterInAB );
+    mFilterOutAB = config->readEntry( "FilterOutAB", mFilterOutAB );
+
   }
@@ -254,2 +268,7 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->writeEntry( "IsKapiFile", mIsKapiFile );
+    config->writeEntry( "FilterInCal", mFilterInCal );
+    config->writeEntry( "FilterOutCal", mFilterOutCal );
+    config->writeEntry( "FilterInAB", mFilterInAB );
+    config->writeEntry( "FilterOutAB", mFilterOutAB );
+
 }
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index e970b50..aad63d3 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -106,2 +106,11 @@ class KSyncProfile : public QObject {
 
+    void setFilterInCal (const QString& n  ){ mFilterInCal  = n;}
+    void setFilterOutCal (const QString& n  ){ mFilterOutCal  = n;}
+    void setFilterInAB (const QString& n  ){ mFilterInAB  = n;}
+    void setFilterOutAB (const QString& n  ){ mFilterOutAB  = n;}
+    QString getFilterInCal () { return mFilterInCal  ;}
+    QString getFilterOutCal () { return mFilterOutCal  ;}
+    QString getFilterInAB () { return mFilterInAB  ;}
+    QString getFilterOutAB () { return mFilterOutAB  ;}
+
     void setName( const QString& n ) {mName = n;}
@@ -171,2 +180,7 @@ class KSyncProfile : public QObject {
 
+    QString mFilterInCal;
+    QString mFilterOutCal;
+    QString mFilterInAB;
+    QString mFilterOutAB;
+
     bool mIncludeInRingSync;