Skip to content

Commit 454bcee

Browse files
Add default context menu from qtwebengine and set appropriate icons. Also remove media control options as we have custom media controller
1 parent 3ef7156 commit 454bcee

1 file changed

Lines changed: 11 additions & 21 deletions

File tree

src/webview.cpp

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -323,27 +323,17 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
323323
QMenu* WebView::createStandardContextMenu() {
324324
auto app = KiwixApp::instance();
325325

326-
QMenu* menu = new QMenu(this);
327-
auto backAction = new QAction(gt("back"));
328-
backAction->setEnabled(app->getAction(KiwixApp::HistoryBackAction)->isEnabled());
329-
backAction->setIcon(app->getAction(KiwixApp::HistoryBackAction)->icon());
330-
menu->addAction(backAction);
331-
connect(menu, &QObject::destroyed, backAction, &QObject::deleteLater);
332-
connect(backAction, &QAction::triggered, this, [=](bool checked) {
333-
Q_UNUSED(checked);
334-
KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back);
335-
});
336-
337-
auto forwardAction = new QAction(gt("forward"));
338-
forwardAction->setEnabled(app->getAction(KiwixApp::HistoryForwardAction)->isEnabled());
339-
forwardAction->setIcon(app->getAction(KiwixApp::HistoryForwardAction)->icon());
340-
menu->addAction(forwardAction);
341-
connect(menu, &QObject::destroyed, forwardAction, &QObject::deleteLater);
342-
connect(forwardAction, &QAction::triggered, this, [=](bool checked) {
343-
Q_UNUSED(checked);
344-
KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward);
345-
});
346-
326+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
327+
QMenu* menu = QWebEngineView::createStandardContextMenu();
328+
#else
329+
QMenu* menu = page()->createStandardContextMenu();
330+
#endif
331+
page()->action(QWebEnginePage::Back)->setIcon(app->getAction(KiwixApp::HistoryBackAction)->icon());
332+
page()->action(QWebEnginePage::Forward)->setIcon(app->getAction(KiwixApp::HistoryForwardAction)->icon());
333+
if (page()->action(QWebEnginePage::ToggleMediaControls)) {
334+
menu->removeAction(page()->action(QWebEnginePage::ToggleMediaControls));
335+
}
336+
347337
menu->addAction(app->getAction(KiwixApp::SavePageAsAction));
348338
return menu;
349339
}

0 commit comments

Comments
 (0)