Merged revisions 866875 via svnmerge from

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

........
  r866875 | pradeepto | 2008-10-02 08:42:20 +0200 (Thu, 02 Oct 2008) | 4 lines
  
   -- Moving Favourite Folder context menu items to look nicer and such. Adding Search and Move messages to Trash/Empty Trash functionality to the same context menu. -- kolab/issue2614
  
     OT :  I really like KDE API, people just thought about everything.
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=924667

favoritefolderview.cpp

@@ -329,12 +329,6 @@ void FavoriteFolderView::contextMenu(Q3ListViewItem * item, const QPoint & point
   mContextMenuItem = fti;
   KMenu contextMenu;
   if ( fti && fti->folder() ) {
-    contextMenu.addAction( SmallIcon( "edit-delete" ), i18n( "Remove From Favorites" ),
-                           this, SLOT( removeFolder() ) );
-    contextMenu.addAction( SmallIcon( "edit-rename" ), i18n( "Rename Favorite..." ),
-                           this, SLOT( renameFolder() ) );
-    contextMenu.addSeparator();
-
     contextMenu.addAction( mainWidget()->action( "mark_all_as_read" ) );
     if ( fti->folder()->folderType() == KMFolderTypeImap
          || fti->folder()->folderType() == KMFolderTypeCachedImap ) {
@@ -343,11 +337,22 @@ void FavoriteFolderView::contextMenu(Q3ListViewItem * item, const QPoint & point
 
     if ( fti->folder()->isMailingListEnabled() )
       contextMenu.addAction( mainWidget()->action( "post_message" ) );
+    contextMenu.addAction( mainWidget()->action( "search_messages" ) );
+    if ( fti->folder()->canDeleteMessages() && ( fti->folder()->count() > 0 ) )
+       contextMenu.addAction( mainWidget()->action( "empty" ) );
+    contextMenu.addSeparator();
 
     contextMenu.addAction( SmallIcon( "configure-shortcuts" ), i18n( "&Assign Shortcut..." ),
                            fti, SLOT( assignShortcut() ) );
     contextMenu.addAction( i18n( "Expire..." ), fti, SLOT(slotShowExpiryProperties()) );
     contextMenu.addAction( mainWidget()->action( "modify" ) );
+    contextMenu.addSeparator();
+
+    contextMenu.addAction( SmallIcon( "edit-delete" ), i18n( "Remove From Favorites" ),
+                           this, SLOT( removeFolder() ) );
+    contextMenu.addAction( SmallIcon( "edit-rename" ), i18n( "Rename Favorite..." ),
+                           this, SLOT( renameFolder() ) );
+
   } else {
     contextMenu.addAction( SmallIcon( "bookmark-new" ), i18n( "Add Favorite Folder..." ),
                            this, SLOT( addFolder() ) );