6 files changed, 99 insertions, 38 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 6f68d84..33b4a65 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -66,3 +66,3 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
     bar->setCaption ("");
-    
+    mWriteBackInPast = 2;
     int w = 300;
@@ -250,4 +250,6 @@ void KSyncManager::slotSyncMenu( int action )
     mWriteBackInFuture = 0;
-    if ( temp->getWriteBackFuture() )
+    if ( temp->getWriteBackFuture() ) {
         mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
+        mWriteBackInPast =  temp->getWriteBackPastWeeks( );
+    }
    
@@ -580,4 +582,6 @@ int KSyncManager::ringSync()
             mWriteBackInFuture = 0;
-            if ( temp->getWriteBackFuture() )
+            if ( temp->getWriteBackFuture() ) {
                 mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
+                mWriteBackInPast =  temp->getWriteBackPastWeeks( );
+            }
             mShowSyncSummary = false;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 6da0ee4..2d0a4ab 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -143,2 +143,3 @@ class KSyncManager : public QObject
     int  mWriteBackInFuture;
+    int  mWriteBackInPast;
     QString mPhoneDevice;
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 03265d2..8a3f4cf 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -45,2 +45,4 @@
 #include <qscrollview.h>
+#include <qvgroupbox.h>
+#include <qhgroupbox.h>
  
@@ -143,3 +145,5 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
-   QHBox *iims = new QHBox( topFrame );
+
+
+   QHGroupBox *iims = new QHGroupBox( i18n("Multiple Sync options"), topFrame);
    new QLabel( i18n("Include in multiple "), iims );
@@ -151,9 +155,14 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    ++iii;
-
-   mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
-   topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
-   ++iii;
-    QButtonGroup* gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), topFrame);
-   topLayout->addMultiCellWidget(gr, iii,iii,0,1);
+   QVGroupBox* gb0 = new QVGroupBox( i18n("Sync algo options"), topFrame);
+   topLayout->addMultiCellWidget(gb0, iii,iii,0,1);
    ++iii;
+   QButtonGroup* gr;
+   {
+       QVGroupBox* topFrame = gb0;
+       mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
+       //topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
+       //++iii;
+       gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), topFrame);
+       //topLayout->addMultiCellWidget(gr, iii,iii,0,1);
+       //++iii;
    loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
@@ -167,21 +176,34 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), topFrame   );
-   topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
-   ++iii;  
+       //topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
+       //++iii;  
 
    mWriteBackFile = new QCheckBox( i18n("Write back synced data"), topFrame   );
-   topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
-   ++iii;
-   
-   mWriteBackExisting= new QCheckBox( i18n("-- Write back (on remote) existing entries only"), topFrame   );
-   topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
-   ++iii;
+       // topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
+       // ++iii;
  
-   mWriteBackFuture= new QCheckBox( i18n("-- Write back (calendar) entries in future only"), topFrame   );
-   topLayout->addMultiCellWidget(mWriteBackFuture, iii,iii,0,1);
-   ++iii;
-   topLayout->addMultiCellWidget(new QLabel( i18n("---- Max. weeks in future: ") , topFrame  ), iii,iii,0,0);
-   mWriteBackFutureWeeks= new QSpinBox(1,104, 1, topFrame);
-   topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
-   ++iii;
+       QVGroupBox* gb2 = new QVGroupBox( i18n("Write back options"), topFrame);
+       //topLayout->addMultiCellWidget(gb2, iii,iii,0,1);
+       //++iii;
+       {
+           QVGroupBox*topFrame = gb2; 
+           mWriteBackExisting= new QCheckBox( i18n("Write back (on remote) existing entries only"), topFrame   );
+           //topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
+           //++iii;
+           mWriteBackFuture= new QCheckBox( i18n("Write back (calendar) entries for time period only"), topFrame   );
+           //topLayout->addMultiCellWidget(mWriteBackFuture, iii,iii,0,1);
+           //++iii;
+           QHGroupBox* gb3 = new QHGroupBox( i18n("Time period"), topFrame);
+           connect ( mWriteBackFuture, SIGNAL( toggled ( bool ) ), gb3, SLOT ( setEnabled ( bool )  ) );
+           new QLabel( i18n("From ") , gb3  );
+           mWriteBackPastWeeks= new QSpinBox(1,104, 1, gb3);
+           new QLabel( i18n(" weeks in the past to ") , gb3  );
+           mWriteBackFutureWeeks= new QSpinBox(1,104, 1, gb3);
+           new QLabel( i18n(" weeks in the future ") , gb3  );
+           //topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
+           //++iii;
+           gb3->setEnabled( false ); 
+       }
+       connect ( mWriteBackFile, SIGNAL( toggled ( bool ) ), gb2, SLOT ( setEnabled ( bool )  ) );
  
+   }
    proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), topFrame);
@@ -198,6 +220,14 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
+   QVGroupBox* gb1 = new QVGroupBox( i18n("Profile kind specific settings"), topFrame);
+   topLayout->addMultiCellWidget(gb1, iii,iii,0,1);
+   ++iii;
 
+   // ******************************************
+   // Profile kind specific settings
+   {
+       // *** phone *******************************
+       QVGroupBox* topFrame = gb1;
    phoneWidget = new QVBox( topFrame);
-   topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
-   ++iii; 
+       //topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
+       //++iii; 
    mWriteContactToSIM = 0;//new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
@@ -223,6 +253,6 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
-   // *** local
+       // *** local*******************************
    localFileWidget = new QVBox( topFrame);
-   topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
-   ++iii;
+       //topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
+       //++iii;
    temphb = new QHBox( localFileWidget );
@@ -247,6 +277,6 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
-   // *** remote
+       // *** remote*******************************
    remoteFileWidget = new QVBox( topFrame);
-   topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
-   ++iii;
+       //topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
+       //++iii;
    temphb = new QHBox( remoteFileWidget );
@@ -282,6 +312,6 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
-   // *** pi-sync
+       // *** pi-sync*******************************
    piWidget = new QVBox( topFrame);
-   topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
-   ++iii;
+       //topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
+       //++iii;
    temphb = new QHBox( piWidget );
@@ -308,2 +338,5 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    mRemotePortPWM = new QLineEdit(temphb);
+   } 
+   // ******************************************
+   // Profile kind specific settings END
 
@@ -313,2 +346,14 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
+void KSyncPrefsDialog::readFilter()
+{
+    mFilterKapi.clear();
+    mFilterKopi.clear();
+    mFilterKopi.append(i18n("No Filter") );
+    mFilterKapi.append(i18n("No Filter") );
+    KConfig cfgko(locateLocal("config","korganizerrc"));
+    KConfig cfgka(locateLocal("config","kaddressbookrc"));
+    cfgko.setGroup("General");
+    mFilterKopi =  cfgko.readListEntry("CalendarFilters");
+    mFilterKopi.prepend(i18n("No Filter") );
+}
 
@@ -432,2 +477,3 @@ void KSyncPrefsDialog::profileChanged( int item )
     mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
+    mWriteBackPastWeeks->setValue( prof->getWriteBackPastWeeks() );
     
@@ -595,2 +641,3 @@ void KSyncPrefsDialog::saveProfile()
         prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
+        prof->setWriteBackPastWeeks(mWriteBackPastWeeks->value());
         if ( mWriteContactToSIM )
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index c601a58..997f524 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -80,5 +80,4 @@ class KSyncPrefsDialog : public KDialog
     void usrWriteConfig();
-
     void setupSyncAlgTab();
-
+    void readFilter();
   private:
@@ -87,2 +86,4 @@ class KSyncPrefsDialog : public KDialog
     QStringList mSyncProfileNames;
+    QStringList mFilterKapi;
+    QStringList mFilterKopi;
     QLineEdit * mMyMachineName;
@@ -144,2 +145,3 @@ class KSyncPrefsDialog : public KDialog
     QSpinBox* mWriteBackFutureWeeks;
+    QSpinBox* mWriteBackPastWeeks;
     QCheckBox* mWriteBackExisting;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 029b70b..9f404cb 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -72,2 +72,3 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setWriteBackFutureWeeks( mWriteBackFutureWeeks );
+    myClone->setWriteBackPastWeeks( mWriteBackPastWeeks );
     myClone->setIncludeInRingSync( mIncludeInRingSync );
@@ -119,2 +120,3 @@ void KSyncProfile::setDefault()
     mWriteBackFutureWeeks = 12;
+    mWriteBackPastWeeks = 2;
     mWriteBackFile = true;
@@ -183,2 +185,3 @@ void KSyncProfile::readConfig(KConfig *config )
     mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks );
+    mWriteBackPastWeeks = config->readNumEntry( "WriteBackPastWeeks", mWriteBackPastWeeks );
     mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync );
@@ -246,2 +249,3 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks);
+    config->writeEntry( "WriteBackPastWeeks", mWriteBackPastWeeks);
     config->writeEntry( "IsLocalFileSync", mIsLocalFileSync );
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 0a59111..e970b50 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -130,2 +130,4 @@ class KSyncProfile : public QObject {
     int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;}
+    void setWriteBackPastWeeks( int n ) { mWriteBackPastWeeks= n;}
+    int getWriteBackPastWeeks( ) { return mWriteBackPastWeeks;}
     void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;}
@@ -177,2 +179,3 @@ class KSyncProfile : public QObject {
     int mWriteBackFutureWeeks;
+    int mWriteBackPastWeeks;
     bool mAskForPreferences;