feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

HelpViewers: Fix context menu item title and corresponding symbol names

Browse Source 
It should be "Open Link as New Page", not "New Window".

Change-Id: Iccfd179370e912028f8d0d2562cfe51e6f7d6ccd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Eike Ziller
2014-09-23 17:10:26 +02:00
parent b6098da75b
commit 37e06c8d53
8 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/help/qtwebkithelpviewer.cpp
View File

@@ -295,6 +295,11 @@ void QtWebKitHelpWidget::scaleDown()
setZoomFactor(qMax(qreal(0.0), zoomFactor() - qreal(0.1)));
}
void QtWebKitHelpWidget::setOpenInNewPageActionVisible(bool visible)
{
m_openInNewPageActionVisible = visible;
}
// -- public slots
void QtWebKitHelpWidget::copy()
@@ -345,6 +350,15 @@ void QtWebKitHelpWidget::mouseReleaseEvent(QMouseEvent *event)
QWebView::mouseReleaseEvent(event);
}
void QtWebKitHelpWidget::contextMenuEvent(QContextMenuEvent *event)
{
QAction *newPageAction = pageAction(QWebPage::OpenLinkInNewWindow);
newPageAction->setText(QCoreApplication::translate("HelpViewer", "Open Link as New Page"));
QMenu *menu = page()->createStandardContextMenu();
menu->exec(event->globalPos());
delete menu;
}
// -- private slots
void QtWebKitHelpWidget::actionChanged()
@@ -541,9 +555,9 @@ void QtWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu)
}
}
void QtWebKitHelpViewer::setOpenInNewWindowActionVisible(bool visible)
void QtWebKitHelpViewer::setOpenInNewPageActionVisible(bool visible)
{
m_webView->pageAction(QWebPage::OpenLinkInNewWindow)->setVisible(visible);
m_webView->setOpenInNewPageActionVisible(visible);
}
bool QtWebKitHelpViewer::findText(const QString &text, Core::FindFlags flags,