dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 05:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qt5.15: hide unused actions in web viewer

Browse Source
This commit is contained in:
Le Tan 2022-02-23 17:02:31 +08:00
parent 486950c1aa
commit eab367cf6f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets/editors/markdownviewer.cpp
View File

@ -292,11 +292,14 @@ void MarkdownViewer::removeHtmlFromImageData(QClipboard *p_clipboard,
void MarkdownViewer::hideUnusedActions(QMenu *p_menu) void MarkdownViewer::hideUnusedActions(QMenu *p_menu)
{ {
Q_UNUSED(p_menu);
QList<QAction *> unusedActions; QList<QAction *> unusedActions;
// QWebEnginePage uses different actions of Back/Forward/Reload. // QWebEnginePage uses different actions of Back/Forward/Reload before Qt 5.15.
// [Woboq](https://code.woboq.org/qt5/qtwebengine/src/webenginewidgets/api/qwebenginepage.cpp.html#1652) // [Woboq](https://code.woboq.org/qt5/qtwebengine/src/webenginewidgets/api/qwebenginepage.cpp.html#1652)
// We tell these three actions by name. // We tell these three actions by name.
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
const QStringList actionNames({QWebEnginePage::tr("&Back"), const QStringList actionNames({QWebEnginePage::tr("&Back"),
QWebEnginePage::tr("&Forward"), QWebEnginePage::tr("&Forward"),
QWebEnginePage::tr("&Reload")}); QWebEnginePage::tr("&Reload")});
@ -307,6 +310,7 @@ void MarkdownViewer::hideUnusedActions(QMenu *p_menu)
unusedActions.append(it); unusedActions.append(it);
} }
} }
#endif
QVector<QWebEnginePage::WebAction> pageActions = { QWebEnginePage::SavePage, QVector<QWebEnginePage::WebAction> pageActions = { QWebEnginePage::SavePage,
QWebEnginePage::ViewSource, QWebEnginePage::ViewSource,
@ -315,7 +319,12 @@ void MarkdownViewer::hideUnusedActions(QMenu *p_menu)
QWebEnginePage::OpenLinkInThisWindow, QWebEnginePage::OpenLinkInThisWindow,
QWebEnginePage::OpenLinkInNewBackgroundTab, QWebEnginePage::OpenLinkInNewBackgroundTab,
QWebEnginePage::OpenLinkInNewTab, QWebEnginePage::OpenLinkInNewTab,
QWebEnginePage::OpenLinkInNewWindow QWebEnginePage::OpenLinkInNewWindow,
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
QWebEnginePage::Forward,
QWebEnginePage::Back,
QWebEnginePage::Reload
#endif
}; };
for (auto pageAct : pageActions) { for (auto pageAct : pageActions) {