Merged revisions 948667 via svnmerge from

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

................
  r948667 | winterz | 2009-04-03 15:51:07 +0200 (Fri, 03 Apr 2009) | 11 lines
  
  Merged revisions 948569 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r948569 | mlaurent | 2009-04-03 04:09:46 -0400 (Fri, 03 Apr 2009) | 4 lines
    
    Don't allow to change folder type when it's system folder in a groupware too
    it's more logical.
    fix issue 3480
  ........
................

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

kmfolderdialog.cpp

@@ -132,7 +132,7 @@ KMFolderDialog::KMFolderDialog( KMFolder *aFolder, KMFolderDir *aFolderDir,
   addTab( tab );
 
   // Don't add template tab for special folders
-  if (!mFolder->isSystemFolder() || mFolder->isMainInbox()) 
+  if (!mFolder->isSystemFolder() || mFolder->isMainInbox())
   {
     box = new KVBox( this );
     addPage( box, i18n("Templates") );
@@ -169,7 +169,7 @@ KMFolderDialog::KMFolderDialog( KMFolder *aFolder, KMFolderDir *aFolderDir,
   for ( int i = 0 ; i < mTabs.count() ; ++i )
     mTabs[i]->load();
   connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
-  connect( this, SIGNAL( applyClicked() ), SLOT( slotApply() ) ); 
+  connect( this, SIGNAL( applyClicked() ), SLOT( slotApply() ) );
 }
 
 
@@ -334,10 +334,7 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
   : FolderDialogTab( dlg, parent, name ),
     mSharedSeenFlagsCheckBox( 0 )
 {
-  mIsLocalSystemFolder = mDlg->folder()->isSystemFolder() &&
-       mDlg->folder()->folderType() != KMFolderTypeImap &&
-       mDlg->folder()->folderType() != KMFolderTypeCachedImap;
-
+  mIsLocalSystemFolder = mDlg->folder()->isSystemFolder();
   QLabel *label;
 
   QVBoxLayout *topLayout = new QVBoxLayout( this );
@@ -518,7 +515,6 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
         "automatically. Identities can be set up in the main configuration "
         "dialog. (Settings -> Configure KMail)") );
 
-
   // sender or receiver column?
   ++row;
   QString tip = i18n("Show Sender/Receiver Column in List of Messages");
@@ -585,7 +581,7 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
     mIncidencesForComboBox->addItem( i18n( "Nobody" ) );
     mIncidencesForComboBox->addItem( i18n( "Admins of This Folder" ) );
     mIncidencesForComboBox->addItem( i18n( "All Readers of This Folder" ) );
-    const QString whatsThisForMyOwnFolders = 
+    const QString whatsThisForMyOwnFolders =
       i18n( "This setting defines which users sharing "
           "this folder should get \"busy\" periods in their freebusy lists "
           "and should see the alarms for the events or tasks in this folder. "
@@ -601,7 +597,7 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
           "since it is not known who will go to those events." );
 
     mIncidencesForComboBox->setWhatsThis( whatsThisForMyOwnFolders );
- 
+
     ++row;
     const QString whatsThisForReadOnlyFolders =
       i18n( "This setting allows you to disable alarms for folders shared by "
@@ -795,7 +791,7 @@ bool FolderDialogGeneralTab::save()
     if ( folder->folderType() == KMFolderTypeCachedImap ) {
       KMFolderCachedImap* dimap = static_cast<KMFolderCachedImap *>( mDlg->folder()->storage() );
       if ( mIncidencesForComboBox ) {
-        KMFolderCachedImap::IncidencesFor incfor = 
+        KMFolderCachedImap::IncidencesFor incfor =
                static_cast<KMFolderCachedImap::IncidencesFor>( mIncidencesForComboBox->currentIndex() );
         if ( dimap->incidencesFor() != incfor ) {
           dimap->setIncidencesFor( incfor );
@@ -847,10 +843,7 @@ KMail::FolderDialogTemplatesTab::FolderDialogTemplatesTab( KMFolderDialog *dlg,
                                                      QWidget *parent )
   : FolderDialogTab( dlg, parent, 0 )
 {
-
-  mIsLocalSystemFolder = mDlg->folder()->isSystemFolder() &&
-       mDlg->folder()->folderType() != KMFolderTypeImap &&
-       mDlg->folder()->folderType() != KMFolderTypeCachedImap;
+  mIsLocalSystemFolder = mDlg->folder()->isSystemFolder();
 
   QVBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setMargin( 0 );