Skip to content

Commit

Permalink
Fix Qt5 webview for MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
cedricp committed Jan 3, 2018
1 parent 4c16342 commit f1c075f
Showing 1 changed file with 21 additions and 7 deletions.
28 changes: 21 additions & 7 deletions ddt4all.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@
import os
import glob
import json
import platform

try:
import PyQt5.QtGui as gui
import PyQt5.QtCore as core
import PyQt5.QtWebKit as webkit
import PyQt5.QtWebKitWidgets as webkitwidgets
import PyQt5.QtWidgets as widgets
if platform.system() == 'Darwin':
import PyQt5.QtWebEngine as webkit
import PyQt5.QtWebEngineWidgets as webkitwidgets
else:
import PyQt5.QtWebKit as webkit
import PyQt5.QtWebKitWidgets as webkitwidgets

def utf8(string):
return string
qt5 = True
Expand Down Expand Up @@ -227,11 +233,19 @@ def __init__(self, parent = None):
print ("%i " + _("loaded ECUs in database.")) % self.ecu_scan.getNumEcuDb()

self.paramview = None
self.docview = webkitwidgets.QWebView()
self.docview.load(core.QUrl("https://github.com/cedricp/ddt4all/wiki"))
self.docview.settings().setAttribute(webkit.QWebSettings.JavascriptEnabled, True)
self.docview.settings().setAttribute(webkit.QWebSettings.PluginsEnabled, True)
self.docview.settings().setAttribute(webkit.QWebSettings.AutoLoadImages, True)
if platform.system() == 'Darwin':
self.docview = webkitwidgets.QWebEngineView()
self.docview.load(core.QUrl("https://github.com/cedricp/ddt4all/wiki"))
self.docview.settings().setAttribute(webkitwidgets.QWebEngineSettings.JavascriptEnabled, True)
self.docview.settings().setAttribute(webkitwidgets.QWebEngineSettings.PluginsEnabled, True)
self.docview.settings().setAttribute(webkitwidgets.QWebEngineSettings.AutoLoadImages, True)
else:
self.docview = webkitwidgets.QWebView()
self.docview.load(core.QUrl("https://github.com/cedricp/ddt4all/wiki"))
self.docview.settings().setAttribute(webkit.QWebSettings.JavascriptEnabled, True)
self.docview.settings().setAttribute(webkit.QWebSettings.PluginsEnabled, True)
self.docview.settings().setAttribute(webkit.QWebSettings.AutoLoadImages, True)

self.screennames = []

self.statusBar = widgets.QStatusBar()
Expand Down

0 comments on commit f1c075f

Please sign in to comment.