diff --git a/requirements.txt b/requirements.txt index 729dbbe4561c95d458148f9ed13cca9990a5c416..01d9a29a64b132d0b5e03a03c8717d1a82417043 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ PyQt5==5.15.4 PyQt5-Qt5==5.15.2 -PyQt5-sip==12.8.1 +PyQt5-sip==12.12.2 +PyQtWebEngine==5.15.6 pyqtgraph>=0.12.1 matplotlib>=3.4.1 numpy>=1.24.2 diff --git a/src/View/Doc/Window.py b/src/View/Doc/Window.py index 73416322f5550fa73a809dca90090e4227291fea..fec3b3aad98b63bd26d15a2dbabb786abd7a6520 100644 --- a/src/View/Doc/Window.py +++ b/src/View/Doc/Window.py @@ -27,10 +27,9 @@ _translate = QCoreApplication.translate logger = logging.getLogger() -from PyQt5.QtWidgets import QApplication, QWidget +from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout from PyQt5.QtCore import QUrl -from PyQt5.QtWebKitWidgets import QWebView -from PyQt5.QtWebKit import QWebSettings +from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEngineSettings class DocWindow(PamhyrWindow): _pamhyr_ui = "WebView" @@ -56,15 +55,18 @@ class DocWindow(PamhyrWindow): ) - self.setup_setting() + self.setup_web_engine() self.setup_url(filename) + def setup_web_engine(self): + vl = self.find(QVBoxLayout, "verticalLayout") + self._web_view = QWebEngineView() + + settings = self._web_view.settings() + settings.setAttribute(QWebEngineSettings.PluginsEnabled, True) + settings.setAttribute(QWebEngineSettings.JavascriptEnabled, False) + + vl.addWidget(self._web_view) + def setup_url(self, filename): - webView = self.find(QWebView, "webView") - webView.setUrl(QUrl(f"file://{self._path_file(filename)}")) - - def setup_setting(self): - webView = self.find(QWebView, "webView") - settings = webView.settings() - settings.setAttribute(QWebSettings.PluginsEnabled, True) - settings.setAttribute(QWebSettings.JavascriptEnabled, False) + self._web_view.setUrl(QUrl(f"file://{self._path_file(filename)}")) diff --git a/src/View/ui/WebView.ui b/src/View/ui/WebView.ui index d29a0c898ae2d1f5863f2fc8e5fbced24b40ee95..0576f1a3d30b09f3011010f31780f0457798ddb1 100644 --- a/src/View/ui/WebView.ui +++ b/src/View/ui/WebView.ui @@ -16,13 +16,7 @@ <widget class="QWidget" name="centralwidget"> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> - <widget class="QWebView" name="webView"> - <property name="url"> - <url> - <string>about:blank</string> - </url> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout"/> </item> </layout> </widget> @@ -38,13 +32,6 @@ </widget> <widget class="QStatusBar" name="statusbar"/> </widget> - <customwidgets> - <customwidget> - <class>QWebView</class> - <extends>QWidget</extends> - <header location="global">QtWebKitWidgets/QWebView</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui>