From d0fa79ee3070863fc0a0613174e9995fc254d593 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 19 Jan 2015 13:53:17 +0100 Subject: [PATCH] Fix Bug 342744 - Put into trash and delete mail should not have the same icon FIXED-IN: 14.12.2 BUG: 342744 --- kmmainwidget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index b7d5b9d53..296a9df97 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -4003,8 +4003,9 @@ void KMMainWidget::updateFolderMenu() bool isInTrashFolder = (mCurrentFolder && CommonKernel->folderIsTrash(mCurrentFolder->collection())); akonadiStandardAction( Akonadi::StandardMailActionManager::MoveToTrash )->setText( isInTrashFolder ? i18nc("@action Hard delete, bypassing trash", "&Delete"): i18n("&Move to Trash") ); - + akonadiStandardAction( Akonadi::StandardMailActionManager::MoveToTrash )->setIcon( isInTrashFolder ? KIcon(QLatin1String("edit-delete")) : KIcon(QLatin1String("user-trash") )); mTrashThreadAction->setText(isInTrashFolder ?i18n("Delete T&hread"): i18n("M&ove Thread to Trash")); + mTrashThreadAction->setIcon(isInTrashFolder ? KIcon(QLatin1String("edit-delete") ) : KIcon(QLatin1String("user-trash") ) ); mSearchMessages->setText( (mCurrentFolder && mCurrentFolder->collection().resource() == QLatin1String( "akonadi_search_resource" )) ? i18n("Edit Search...") : i18n("&Find Messages...") );