From 9952329e74382f0d90619c1301f8a9ddc8737b64 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 6 Aug 2024 11:44:03 +0200 Subject: [PATCH] show JS alerts in a better way --- src/librssguard/gui/webviewers/webengine/webengineviewer.h | 1 - src/librssguard/network-web/webengine/webenginepage.cpp | 7 +++++++ src/librssguard/network-web/webengine/webenginepage.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.h b/src/librssguard/gui/webviewers/webengine/webengineviewer.h index d2c2b57c1..5ac4b591f 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.h +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.h @@ -52,7 +52,6 @@ class RSSGUARD_DLLSPEC WebEngineViewer : public QWebEngineView, public WebViewer protected: virtual ContextMenuData provideContextMenuData(QContextMenuEvent* event) const; - virtual QWebEngineView* createWindow(QWebEnginePage::WebWindowType type); virtual void contextMenuEvent(QContextMenuEvent* event); virtual bool event(QEvent* event); diff --git a/src/librssguard/network-web/webengine/webenginepage.cpp b/src/librssguard/network-web/webengine/webenginepage.cpp index 2358fd8b6..304ab92cf 100644 --- a/src/librssguard/network-web/webengine/webenginepage.cpp +++ b/src/librssguard/network-web/webengine/webenginepage.cpp @@ -71,6 +71,13 @@ void WebEnginePage::hideUnwantedElements() { } } +void WebEnginePage::javaScriptAlert(const QUrl& security_origin, const QString& msg) { + qApp + ->showGuiMessage(Notification::Event::GeneralEvent, + GuiMessage(tr("Website alert"), + tr("URL %1 reports this important message: %2").arg(security_origin.toString(), msg))); +} + bool WebEnginePage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool is_main_frame) { if (type == NavigationType::NavigationTypeLinkClicked) { bool open_externally_now = diff --git a/src/librssguard/network-web/webengine/webenginepage.h b/src/librssguard/network-web/webengine/webenginepage.h index 4add531a8..4a892db8f 100644 --- a/src/librssguard/network-web/webengine/webenginepage.h +++ b/src/librssguard/network-web/webengine/webenginepage.h @@ -25,6 +25,7 @@ class WebEnginePage : public QWebEnginePage { void hideUnwantedElements(); protected: + virtual void javaScriptAlert(const QUrl& security_origin, const QString& msg); virtual bool acceptNavigationRequest(const QUrl& url, NavigationType type, bool is_main_frame); virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message,