Slew of fixes and upgrades, including:

Added kaddressbook automatic sync
Added carddav autosync options
Added DCOP calls for kaddressbook and korganizer manual resync
Repaired Kontact refresh button through above mentioned DCOP calls


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1164528 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 11 insertions, 25 deletions

diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index baa70b403..90da1831c 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -119,9 +119,6 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
   vbox->addWidget(automaticReloadOnStartup);
   vbox->addWidget(noAutomaticReload);
   vbox->addStretch(1);
-
-  // FIXME KABC
-  groupBox->hide();
 }
 
 CardDavReloadConfig::~CardDavReloadConfig()
@@ -131,16 +128,14 @@ CardDavReloadConfig::~CardDavReloadConfig()
 
 void CardDavReloadConfig::loadSettings( ResourceCached *resource )
 {
-  // FIXME KABC
-  //d->mIntervalSpin->setValue( resource->reloadInterval() );
-  //d->mGroup->setButton( resource->reloadPolicy() );
+  d->mIntervalSpin->setValue( resource->reloadInterval() );
+  d->mGroup->setButton( resource->reloadPolicy() );
 }
 
 void CardDavReloadConfig::saveSettings( ResourceCached *resource )
 {
-  // FIXME KABC
-  //resource->setReloadInterval( d->mIntervalSpin->value() );
-  //resource->setReloadPolicy( d->mGroup->selectedId() );
+  resource->setReloadInterval( d->mIntervalSpin->value() );
+  resource->setReloadPolicy( d->mGroup->selectedId() );
 }
 
 void CardDavReloadConfig::slotIntervalToggled( bool checked )
@@ -219,9 +214,6 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
   vbox->addWidget(onExit);
   vbox->addWidget(never);
   vbox->addStretch(1);
-
-  // FIXME KABC
-  groupBox->hide();
 }
 
 CardDavSaveConfig::~CardDavSaveConfig()
@@ -231,16 +223,14 @@ CardDavSaveConfig::~CardDavSaveConfig()
 
 void CardDavSaveConfig::loadSettings( ResourceCached *resource )
 {
-  // FIXME KABC
-  //d->mIntervalSpin->setValue( resource->saveInterval() );
-  //d->mGroup->setButton( resource->savePolicy() );
+  d->mIntervalSpin->setValue( resource->saveInterval() );
+  d->mGroup->setButton( resource->savePolicy() );
 }
 
 void CardDavSaveConfig::saveSettings( ResourceCached *resource )
 {
-  // FIXME KABC
-  //resource->setSaveInterval( d->mIntervalSpin->value() );
-  //resource->setSavePolicy( d->mGroup->selectedId() );
+  resource->setSaveInterval( d->mIntervalSpin->value() );
+  resource->setSavePolicy( d->mGroup->selectedId() );
 }
 
 void CardDavSaveConfig::slotIntervalToggled( bool checked )
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 315b6270d..a5172d9e5 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -54,8 +54,8 @@ const int ResourceCardDav::CACHE_DAYS = 90;
 
 const int ResourceCardDav::DEFAULT_RELOAD_INTERVAL   = 10;
 const int ResourceCardDav::DEFAULT_SAVE_INTERVAL     = 10;
-//const int ResourceCardDav::DEFAULT_RELOAD_POLICY     = ResourceCached::ReloadInterval;
-//const int ResourceCardDav::DEFAULT_SAVE_POLICY       = ResourceCached::SaveDelayed;
+const int ResourceCardDav::DEFAULT_RELOAD_POLICY     = ResourceCached::ReloadInterval;
+const int ResourceCardDav::DEFAULT_SAVE_POLICY       = ResourceCached::SaveDelayed;
 
 /*=========================================================================
 | UTILITY
@@ -237,7 +237,7 @@ CardDavPrefs* ResourceCardDav::createPrefs() const {
 }
 
 void ResourceCardDav::init() {
-    // default settings
+//     // default settings
 //     setReloadInterval(DEFAULT_RELOAD_INTERVAL);
 //     setReloadPolicy(DEFAULT_RELOAD_POLICY);
 //     setSaveInterval(DEFAULT_SAVE_INTERVAL);
@@ -338,10 +338,6 @@ void ResourceCardDav::loadingQueuePop() {
     mLoader->setType(0);
     mLoader->setUseURI(mPrefs->getUseURI());
 
-    //TQDateTime dt(TQDate::currentDate());
-    //mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
-    //mLoader->setGetAll();
-
     mLoadingQueueReady = false;
 
     log("starting actual download job");