* 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, 28 insertions, 0 deletions

diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 4fc41819c..c9f4d8610 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -289,6 +289,33 @@ void FieldWidget::loadContact( KABC::Addressee *addr )
   }
 }
 
+void FieldWidget::setReadOnly( bool readOnly )
+{
+  FieldRecordList::ConstIterator it;
+  for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) {
+    TQString value;
+    if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
+      TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget );
+      wdg->setReadOnly(readOnly);
+    } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
+      TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget );
+      wdg->setEnabled( !readOnly );
+    } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
+      TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget );
+      wdg->setEnabled( !readOnly );
+    } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) {
+      TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
+      wdg->setEnabled( !readOnly );
+    } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) {
+      TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
+      wdg->setEnabled( !readOnly );
+    } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) {
+      TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
+      wdg->setEnabled( !readOnly );
+    }
+  }
+}
+
 void FieldWidget::storeContact( KABC::Addressee *addr )
 {
   FieldRecordList::ConstIterator it;
@@ -390,6 +417,7 @@ void CustomFieldsWidget::setReadOnly( bool readOnly )
 {
   mAddButton->setEnabled( !readOnly );
   mRemoveButton->setEnabled( !readOnly && !mFieldWidget->fields().isEmpty() );
+  mFieldWidget->setReadOnly( readOnly );
 }
 
 void CustomFieldsWidget::addField()