Merge commit 'refs/merge-requests/1842' of git://gitorious.org/rekonq/mainline into Mon4

1 files changed, 7 insertions, 1 deletions

diff --git a/src/webview.cpp b/src/webview.cpp
index de755bfa..1815e871 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -136,6 +136,8 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
         a = pageAction(QWebPage::CopyLinkToClipboard);
         a->setIcon(KIcon("edit-copy"));
         menu.addAction(a);
+        
+        menu.addSeparator();
     }
 
     // is content editable && selected? Add CUT
@@ -154,6 +156,10 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
         a = pageAction(QWebPage::Copy);
         a->setIcon(KIcon("edit-copy"));
         a->setShortcut(KStandardShortcut::copy().primary());
+        if(!result.isContentEditable()) // "Cut" "Copy Text" "Paste" is ugly. Don't add "text" with cut/paste
+            a->setText(i18n("Copy Text"));
+        else
+            a->setText(i18n("Copy"));
         menu.addAction(a);
     }
 
@@ -169,7 +175,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     // is content selected? Add SEARCH actions
     if(result.isContentSelected())
     {
-        KActionMenu *searchMenu = new KActionMenu(i18n("Search with"), this);
+        KActionMenu *searchMenu = new KActionMenu(KIcon("edit-find"), i18n("Search with"), this);
 
         KConfig config("kuriikwsfilterrc"); //Share with konqueror
         KConfigGroup cg = config.group("General");