* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


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

1 files changed, 10 insertions, 1 deletions

diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp
index 2c8d89838..df2412b3d 100644
--- a/libkcal/resourcelocaldirconfig.cpp
+++ b/libkcal/resourcelocaldirconfig.cpp
@@ -26,6 +26,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
+#include <kmessagebox.h>
 #include <kstandarddirs.h>
 
 #include "vcaldrag.h"
@@ -41,7 +42,7 @@ using namespace KCal;
 ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* parent,  const char* name )
     : KRES::ConfigWidget( parent, name )
 {
-  resize( 245, 115 ); 
+  resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
 
   TQLabel *label = new TQLabel( i18n( "Location:" ), this );
@@ -65,6 +66,14 @@ void ResourceLocalDirConfig::saveSettings( KRES::Resource *resource )
   ResourceLocalDir* res = static_cast<ResourceLocalDir*>( resource );
   if (res) {
     res->mURL = mURL->url();
+    if ( mURL->url().isEmpty() && !resource->readOnly() ) {
+      KMessageBox::information(
+        this,
+        i18n( "No location specified.  The calendar will be read-only." ),
+        TQString(),
+        "ResourceLocalDirUrl" );
+      resource->setReadOnly( true );
+    }
   } else
     kdDebug(5700) << "ERROR: ResourceLocalDirConfig::saveSettings(): no ResourceLocalDir, cast failed" << endl;
 }