mirror of https://gitlab.com/pamhyr/pamhyr2
doc: Fix window display for version PyQt5 > 5.5
parent
559d7dc006
commit
a77c342e69
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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_url(self, filename):
|
||||
webView = self.find(QWebView, "webView")
|
||||
webView.setUrl(QUrl(f"file://{self._path_file(filename)}"))
|
||||
def setup_web_engine(self):
|
||||
vl = self.find(QVBoxLayout, "verticalLayout")
|
||||
self._web_view = QWebEngineView()
|
||||
|
||||
def setup_setting(self):
|
||||
webView = self.find(QWebView, "webView")
|
||||
settings = webView.settings()
|
||||
settings.setAttribute(QWebSettings.PluginsEnabled, True)
|
||||
settings.setAttribute(QWebSettings.JavascriptEnabled, False)
|
||||
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):
|
||||
self._web_view.setUrl(QUrl(f"file://{self._path_file(filename)}"))
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue