From b772e8907818c9e4eccdfa5ac6477bf8c8e60626 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 12 Nov 2009 11:45:42 +0000 Subject: [PATCH] Fix disable "remove folder" action svn path=/branches/work/akonadi-ports/kdepim/; revision=1047945 --- kmmainwidget.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 211511d65..f290b46f5 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -4003,10 +4003,11 @@ void KMMainWidget::updateFolderMenu() mEmptyFolderAction->setEnabled( folderWithContent && ( mCurrentFolder->count() > 0 ) && mCurrentFolder->canDeleteMessages() && !multiFolder ); mEmptyFolderAction->setText( (mCurrentFolder && kmkernel->folderIsTrash(mCurrentFolder->collection())) ? i18n("E&mpty Trash") : i18n("&Move All Messages to Trash") ); - mRemoveFolderAction->setEnabled( mCurrentFolder && !mCurrentFolder->isSystemFolder() && mCurrentFolder->canDeleteMessages() && !multiFolder); + mRemoveFolderAction->setEnabled( mCurrentFolder && !mCurrentFolder->isSystemFolder() && mCurrentFolder->canDeleteMessages() && !multiFolder && !CollectionUtils::isVirtualParent( mCurrentFolder->collection()) ); + + mRemoveFolderAction->setText( mCurrentFolder && CollectionUtils::isVirtual( mCurrentFolder->collection() ) ? i18n("&Delete Search") : i18n("&Delete Folder") ); - mRemoveFolderAction->setEnabled( mCurrentFolder&& !CollectionUtils::isVirtualParent( mCurrentFolder->collection() ) ); mExpireFolderAction->setEnabled( mCurrentFolder && mCurrentFolder->isAutoExpire() && !multiFolder && mCurrentFolder->canDeleteMessages() ); updateMarkAsReadAction(); // the visual ones only make sense if we are showing a message list