[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Leo Franchi <lfranchi () kde ! org>
Date:       2010-06-02 22:30:33
Message-ID: 20100602223033.50E8CAC8C8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1133943 by lfranchi:

only show Move To Trash in folder context menu if selected folder is not the trash


 M  +3 -0      kmmainwidget.cpp  
 M  +1 -2      kmmainwin.rc  


--- trunk/KDE/kdepim/kmail/kmmainwidget.cpp #1133942:1133943
@@ -3796,6 +3796,9 @@
     kDebug() << "Enablign send queued";
     actionlist << mSendQueued;
   }
+  if( mCurrentFolder && mCurrentFolder->collection().id() != kmkernel->trashCollectionFolder().id() ) {
+    actionlist << mTrashAction;
+  }
   mGUIClient->unplugActionList( QLatin1String( "outbox_folder_actionlist" ) );
   mGUIClient->plugActionList( QLatin1String( "outbox_folder_actionlist" ), actionlist );
   actionlist.clear();
--- trunk/KDE/kdepim/kmail/kmmainwin.rc #1133942:1133943
@@ -213,9 +213,8 @@
   <Separator/>
   <Action name="mark_all_as_read" />
   <Action name="search_messages" />
-  <Action name="move_to_trash" />
-  <Action name="empty"/>
   <ActionList name="outbox_folder_actionlist" />
+  <Action name="empty"/>
   <Separator/>
   <Action name="akonadi_collection_create" />
   <Action name="akonadi_collection_copy_to_menu"/>
[prev in list] [next in list] [prev in thread] [next in thread]