diff --git a/CHANGELOG b/CHANGELOG index c95f6950c..927a35a75 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +Version 1.5.0 + * development version + * added delete action in edit context menu on page + Version 1.4.1 * released 15 March 2013 * fixed websearchbar not respecting select all on click settings diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp index d919f638e..13f065660 100644 --- a/src/lib/webview/webview.cpp +++ b/src/lib/webview/webview.cpp @@ -352,6 +352,12 @@ void WebView::forward() } } +void WebView::editDelete() +{ + QKeyEvent ev(QEvent::KeyPress, Qt::Key_Delete, Qt::NoModifier); + QApplication::sendEvent(this, &ev); +} + void WebView::selectAll() { triggerPageAction(QWebPage::SelectAll); @@ -768,9 +774,13 @@ void WebView::createContextMenu(QMenu* menu, const QWebHitTestResult &hitTest, c m_actionsInitialized = true; pageAction(QWebPage::Cut)->setIcon(QIcon::fromTheme("edit-cut")); + pageAction(QWebPage::Cut)->setText(tr("Cut")); pageAction(QWebPage::Copy)->setIcon(QIcon::fromTheme("edit-copy")); + pageAction(QWebPage::Copy)->setText(tr("Copy")); pageAction(QWebPage::Paste)->setIcon(QIcon::fromTheme("edit-paste")); + pageAction(QWebPage::Paste)->setText(tr("Paste")); pageAction(QWebPage::SelectAll)->setIcon(QIcon::fromTheme("edit-select-all")); + pageAction(QWebPage::SelectAll)->setText(tr("Select All")); m_actionReload = new QAction(qIconProvider->standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this); m_actionStop = new QAction(qIconProvider->standardIcon(QStyle::SP_BrowserStop), tr("S&top"), this); @@ -826,6 +836,11 @@ void WebView::createContextMenu(QMenu* menu, const QWebHitTestResult &hitTest, c menu->addAction(act); + if (act == pageAction(QWebPage::Paste)) { + QAction* a = menu->addAction(QIcon::fromTheme("edit-delete"), tr("Delete"), this, SLOT(editDelete())); + a->setEnabled(!selectedText().isEmpty()); + } + ++i; } diff --git a/src/lib/webview/webview.h b/src/lib/webview/webview.h index eb6d30da5..0d288b127 100644 --- a/src/lib/webview/webview.h +++ b/src/lib/webview/webview.h @@ -76,6 +76,7 @@ public slots: void back(); void forward(); + void editDelete(); void selectAll(); void printPage(QWebFrame* frame = 0); void sendPageByMail();