Merged revisions 964044 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r964044 | winterz | 2009-05-05 22:51:54 +0200 (Tue, 05 May 2009) | 12 lines
  
  Merged revisions 964041 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r964041 | winterz | 2009-05-05 16:46:43 -0400 (Tue, 05 May 2009) | 6 lines
    
    permit a resourcefolder to have most of its properties changed.
    including: name, icon, generate free/busy..
    
    fixes kolab/issue3606
  ........
................

svn path=/trunk/KDE/kdepim/; revision=965023

kmfolderdialog.cpp

@@ -335,14 +335,16 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
     mSharedSeenFlagsCheckBox( 0 )
 {
   mIsLocalSystemFolder = mDlg->folder()->isSystemFolder();
+  mIsResourceFolder = kmkernel->iCalIface().isStandardResourceFolder( mDlg->folder() );
+
   QLabel *label;
 
   QVBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( 0 );
 
-  // Musn't be able to edit details for a system folder.
-  if ( !mIsLocalSystemFolder ) {
+  // Musn't be able to edit details for a non-resource, system folder.
+  if ( !mIsLocalSystemFolder || mIsResourceFolder ) {
 
     QHBoxLayout *hl = new QHBoxLayout();
     topLayout->addItem( hl );
@@ -353,7 +355,7 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
 
     mNameEdit = new KLineEdit( this );
     if( !mDlg->folder() )
-            mNameEdit->setFocus();
+      mNameEdit->setFocus();
     mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
     if (!aName.isEmpty())
             mNameEdit->setText(aName);
@@ -536,7 +538,8 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
   else if (whoField == "To") mShowSenderReceiverComboBox->setCurrentIndex(2);
 
   // folder contents
-  if ( !mIsLocalSystemFolder && kmkernel->iCalIface().isEnabled() ) {
+  if ( ( !mIsLocalSystemFolder || mIsResourceFolder ) &&
+       kmkernel->iCalIface().isEnabled() ) {
     // Only do make this settable, if the IMAP resource is enabled
     // and it's not the personal folders (those must not be changed)
     ++row;
@@ -556,7 +559,7 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
       mContentsComboBox->setCurrentIndex( mDlg->folder()->storage()->contentsType() );
     connect ( mContentsComboBox, SIGNAL ( activated( int ) ),
               this, SLOT( slotFolderContentsSelectionChanged( int ) ) );
-    if ( mDlg->folder()->isReadOnly() )
+    if ( mDlg->folder()->isReadOnly() || mIsResourceFolder )
       mContentsComboBox->setEnabled( false );
   } else {
     mContentsComboBox = 0;

kmfolderdialog.h

@@ -162,6 +162,7 @@ private:
   KPIMIdentities::IdentityCombo *mIdentityComboBox;
 
   bool mIsLocalSystemFolder;
+  bool mIsResourceFolder;
 };