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

Fix crash and optimise display

Browse Source 
bzr-revno: 1058
This commit is contained in:
Tim Bentley 2010-09-25 08:47:23 +01:00
commit 3748bbf53a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/ui/maindisplay.py
View File

@ -183,6 +183,9 @@ class MainDisplay(DisplayWidget):
The slide text to be displayed The slide text to be displayed
""" """
log.debug(u'text') log.debug(u'text')
# Wait for the webview to update before displayiong text.
while not self.loaded:
Receiver.send_message(u'openlp_process_events')
self.frame.evaluateJavaScript(u'show_text("%s")' % \ self.frame.evaluateJavaScript(u'show_text("%s")' % \
slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"')) slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'))
return self.preview() return self.preview()
@ -234,8 +237,11 @@ class MainDisplay(DisplayWidget):
Display an image, as is. Display an image, as is.
""" """
if image: if image:
if isinstance(image, QtGui.QImage):
js = u'show_image("data:image/png;base64,%s");' % \ js = u'show_image("data:image/png;base64,%s");' % \
image_to_byte(image) image_to_byte(image)
else:
js = u'show_image("data:image/png;base64,%s");' % image
else: else:
js = u'show_image("");' js = u'show_image("");'
self.frame.evaluateJavaScript(js) self.frame.evaluateJavaScript(js)
@ -246,7 +252,7 @@ class MainDisplay(DisplayWidget):
Used after Image plugin has changed the background Used after Image plugin has changed the background
""" """
log.debug(u'resetImage') log.debug(u'resetImage')
self.displayImage(self.serviceItem.bg_frame) self.displayImage(self.serviceItem.bg_image_bytes)
def resetVideo(self): def resetVideo(self):
""" """