Major KAddressbook carddav fixes and improvements (should now work with Zimbra once Zimbra fixes a standards compliance issue with contact creation mimetypes)

Fixed handling of close events and save interaction with Kontact and Korganizer

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

1 files changed, 5 insertions, 0 deletions

diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index 8408184cc..2fd583837 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -87,6 +87,7 @@ void ResourceCardDavConfig::loadSettings( KRES::Resource *resource ) {
         mUsername->setText(p->username());
         mRememberPassword->setChecked(p->rememberPassword());
         mPassword->setText(p->password());
+        mUseUriNotUID->setChecked(p->useURI());
 
         mReloadConfig->loadSettings(res);
         mSaveConfig->loadSettings(res);
@@ -105,6 +106,7 @@ void ResourceCardDavConfig::saveSettings( KRES::Resource *resource ) {
             p->setUsername(mUsername->text());
             p->setRememberPassword(mRememberPassword->isChecked());
             p->setPassword(mPassword->text());
+            p->setUseURI(mUseUriNotUID->isChecked());
         }
     }
 }
@@ -137,6 +139,9 @@ void ResourceCardDavConfig::setupUI() {
     mRememberPassword = new QCheckBox( i18n("Remember password"), this );
     mainLayout->addWidget(mRememberPassword, 4, 1);
 
+    mUseUriNotUID = new QCheckBox( i18n( "Use URI instead of UID when modifying existing contacts" ), this );
+    mainLayout->addWidget( mUseUriNotUID, 5, 1 );
+
     // configs
     QHBoxLayout* horizontal = new QHBoxLayout(this);