parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: Fix window display for version PyQt5 > 5.5

setup.py
Pierre-Antoine Rouby 2023-10-06 16:21:23 +02:00
parent 559d7dc006
commit a77c342e69
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
requirements.txt
View File

@ -1,6 +1,7 @@
PyQt5==5.15.4 PyQt5==5.15.4
PyQt5-Qt5==5.15.2 PyQt5-Qt5==5.15.2
PyQt5-sip==12.8.1 PyQt5-sip==12.12.2
PyQtWebEngine==5.15.6
pyqtgraph>=0.12.1 pyqtgraph>=0.12.1
matplotlib>=3.4.1 matplotlib>=3.4.1
numpy>=1.24.2 numpy>=1.24.2

26
src/View/Doc/Window.py
View File

@ -27,10 +27,9 @@ _translate = QCoreApplication.translate
logger = logging.getLogger() logger = logging.getLogger()
from PyQt5.QtWidgets import QApplication, QWidget from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout
from PyQt5.QtCore import QUrl from PyQt5.QtCore import QUrl
from PyQt5.QtWebKitWidgets import QWebView from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEngineSettings
from PyQt5.QtWebKit import QWebSettings
class DocWindow(PamhyrWindow): class DocWindow(PamhyrWindow):
_pamhyr_ui = "WebView" _pamhyr_ui = "WebView"
@ -56,15 +55,18 @@ class DocWindow(PamhyrWindow):
) )
self.setup_setting() self.setup_web_engine()
self.setup_url(filename) self.setup_url(filename)
def setup_url(self, filename): def setup_web_engine(self):
webView = self.find(QWebView, "webView") vl = self.find(QVBoxLayout, "verticalLayout")
webView.setUrl(QUrl(f"file://{self._path_file(filename)}")) self._web_view = QWebEngineView()
def setup_setting(self): settings = self._web_view.settings()
webView = self.find(QWebView, "webView") settings.setAttribute(QWebEngineSettings.PluginsEnabled, True)
settings = webView.settings() settings.setAttribute(QWebEngineSettings.JavascriptEnabled, False)
settings.setAttribute(QWebSettings.PluginsEnabled, True)
settings.setAttribute(QWebSettings.JavascriptEnabled, False) vl.addWidget(self._web_view)
def setup_url(self, filename):
self._web_view.setUrl(QUrl(f"file://{self._path_file(filename)}"))

15
src/View/ui/WebView.ui
View File

@ -16,13 +16,7 @@
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QWebView" name="webView"> <layout class="QVBoxLayout" name="verticalLayout"/>
<property name="url">
<url>
<string>about:blank</string>
</url>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -38,13 +32,6 @@
</widget> </widget>
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
</widget> </widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<extends>QWidget</extends>
<header location="global">QtWebKitWidgets/QWebView</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>