diff --git a/src/lib/other/qzsettings.cpp b/src/lib/other/qzsettings.cpp index d7ef6628d..97367eae1 100644 --- a/src/lib/other/qzsettings.cpp +++ b/src/lib/other/qzsettings.cpp @@ -50,7 +50,6 @@ void QzSettings::loadSettings() allowJsHideMenuBar = settings.value("allowJavaScriptHideMenuBar", true).toBool(); allowJsHideStatusBar = settings.value("allowJavaScriptHideStatusBar", true).toBool(); allowJsHideToolBar = settings.value("allowJavaScriptHideToolBar", true).toBool(); - allowJsDisableContextMenu = settings.value("allowJavaScriptDisableContextMenu", true).toBool(); settings.endGroup(); settings.beginGroup("Browser-Tabs-Settings"); diff --git a/src/lib/other/qzsettings.h b/src/lib/other/qzsettings.h index 0061b4334..f517fa157 100644 --- a/src/lib/other/qzsettings.h +++ b/src/lib/other/qzsettings.h @@ -51,7 +51,6 @@ public: bool allowJsHideMenuBar; bool allowJsHideStatusBar; bool allowJsHideToolBar; - bool allowJsDisableContextMenu; QStringList autoOpenProtocols; QStringList blockedProtocols; diff --git a/src/lib/preferences/jsoptions.cpp b/src/lib/preferences/jsoptions.cpp index a4ed15496..5a47205e1 100644 --- a/src/lib/preferences/jsoptions.cpp +++ b/src/lib/preferences/jsoptions.cpp @@ -39,7 +39,6 @@ JsOptions::JsOptions(QWidget* parent) ui->jscanHideMenu->setChecked(settings.value("allowJavaScriptHideMenuBar", true).toBool()); ui->jscanHideStatus->setChecked(settings.value("allowJavaScriptHideStatusBar", true).toBool()); ui->jscanHideTool->setChecked(settings.value("allowJavaScriptHideToolBar", true).toBool()); - ui->jscanDisableContextMenu->setChecked(settings.value("allowJavaScriptDisableContextMenu", true).toBool()); ui->jscanAccessClipboard->setChecked(settings.value("allowJavaScriptAccessClipboard", false).toBool()); settings.endGroup(); @@ -60,7 +59,6 @@ void JsOptions::accept() settings.setValue("allowJavaScriptHideMenuBar", ui->jscanHideMenu->isChecked()); settings.setValue("allowJavaScriptHideStatusBar", ui->jscanHideStatus->isChecked()); settings.setValue("allowJavaScriptHideToolBar", ui->jscanHideTool->isChecked()); - settings.setValue("allowJavaScriptDisableContextMenu", ui->jscanDisableContextMenu->isChecked()); settings.setValue("allowJavaScriptAccessClipboard", ui->jscanAccessClipboard->isChecked()); settings.endGroup(); diff --git a/src/lib/preferences/jsoptions.ui b/src/lib/preferences/jsoptions.ui index 64d829a92..1c826c302 100644 --- a/src/lib/preferences/jsoptions.ui +++ b/src/lib/preferences/jsoptions.ui @@ -6,8 +6,8 @@ 0 0 - 240 - 286 + 214 + 261 @@ -78,13 +78,6 @@ - - - - Disable or change context menu - - - diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp index b123421e2..8f87b5392 100644 --- a/src/lib/webview/webview.cpp +++ b/src/lib/webview/webview.cpp @@ -704,21 +704,6 @@ void WebView::showClickedFrameSource() showSource(m_clickedFrame); } -bool WebView::event(QEvent* event) -{ - if (event->type() == QEvent::ContextMenu && !qzSettings->allowJsDisableContextMenu) { - QContextMenuEvent* ev = static_cast(event); - const QWebHitTestResult &hitTest = page()->mainFrame()->hitTestContent(ev->pos()); - - if (!hitTest.isContentEditable()) { - contextMenuEvent(ev); - return true; - } - } - - return QWebView::event(event); -} - void WebView::printPage(QWebFrame* frame) { QPrintPreviewDialog* dialog = new QPrintPreviewDialog(this); diff --git a/src/lib/webview/webview.h b/src/lib/webview/webview.h index 40666b502..29a107e15 100644 --- a/src/lib/webview/webview.h +++ b/src/lib/webview/webview.h @@ -124,7 +124,6 @@ protected slots: void showClickedFrameSource(); protected: - bool event(QEvent* event); void wheelEvent(QWheelEvent* event); void mousePressEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event); diff --git a/translations/empty.ts b/translations/empty.ts index f9c513d0f..410f43688 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -1711,10 +1711,6 @@ Access clipboard - - Disable or change context menu - - LicenseViewer