raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

This commit is contained in:
Philip Ridout 2017-09-29 18:31:35 +01:00
parent e16c7899bb
commit 6780a44496
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/display/canvas.py
View File

@ -34,7 +34,7 @@ import json
import logging import logging
import os import os
from PyQt5 import QtCore, QtWidgets, QtWebKit, QtWebKitWidgets, QtGui, QtMultimedia, QtWebChannel, QtWebEngineWidgets from PyQt5 import QtCore, QtWidgets, QtGui, QtMultimedia, QtWebChannel, QtWebEngineWidgets
from openlp.core.common import AppLocation, Registry, RegistryProperties, OpenLPMixin, Settings, translate,\ from openlp.core.common import AppLocation, Registry, RegistryProperties, OpenLPMixin, Settings, translate,\
is_macosx, is_win is_macosx, is_win

2
openlp/core/lib/htmlbuilder.py
View File

@ -409,7 +409,7 @@ is the function which has to be called from outside. The generated and returned
import logging import logging
from string import Template from string import Template
from PyQt5 import QtWebKit from PyQt5 import QtWebEgine
from openlp.core.common import Settings from openlp.core.common import Settings
from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, VerticalType, HorizontalType from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, VerticalType, HorizontalType

4
openlp/core/ui/media/webkitplayer.py
View File

@ -24,7 +24,7 @@ The :mod:`~openlp.core.ui.media.webkit` module contains our WebKit video player
""" """
import logging import logging
from PyQt5 import QtGui, QtWebKitWidgets from PyQt5 import QtGui, QtWebEngineWidgets
from openlp.core.common import Settings from openlp.core.common import Settings
from openlp.core.lib import translate from openlp.core.lib import translate
@ -157,7 +157,7 @@ class WebkitPlayer(MediaPlayer):
:return: boolean. True if available :return: boolean. True if available
""" """
web = QtWebKitWidgets.QWebPage() web = QtWebEngineWidgets.QWebPage()
# This script should return '[object HTMLVideoElement]' if the html5 video is available in webkit. Otherwise it # This script should return '[object HTMLVideoElement]' if the html5 video is available in webkit. Otherwise it
# should return '[object HTMLUnknownElement]' # should return '[object HTMLUnknownElement]'
return web.mainFrame().evaluateJavaScript( return web.mainFrame().evaluateJavaScript(