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

Fix bug 696557. Cache resizing was adding name to full path

Browse Source 
Comment tidy ups.

bzr-revno: 1211
Fixes: https://launchpad.net/bugs/696557
This commit is contained in:
Tim Bentley 2011-01-12 19:25:38 +00:00
commit 3335bf0d36
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/lib/imagemanager.py
View File

@ -86,8 +86,7 @@ class ImageManager(QtCore.QObject):
for key in self._cache.keys(): for key in self._cache.keys():
image = self._cache[key] image = self._cache[key]
image.dirty = True image.dirty = True
fullpath = os.path.join(image.path, image.name) image.image = resize_image(image.path,
image.image = resize_image(fullpath,
self.width, self.height) self.width, self.height)
self._cache_dirty = True self._cache_dirty = True
# only one thread please # only one thread please
@ -165,4 +164,4 @@ class ImageManager(QtCore.QObject):
image = self._cache[key] image = self._cache[key]
if image.dirty: if image.dirty:
image.image_bytes = image_to_byte(image.image) image.image_bytes = image_to_byte(image.image)
image.dirty = False image.dirty = False

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

@ -198,7 +198,7 @@ class MainDisplay(DisplayWidget):
The slide text to be displayed The slide text to be displayed
""" """
log.debug(u'text to display') log.debug(u'text to display')
# Wait for the webview to update before displayiong text. # Wait for the webview to update before displaying text.
while not self.loaded: while not self.loaded:
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
self.frame.evaluateJavaScript(u'show_text("%s")' % \ self.frame.evaluateJavaScript(u'show_text("%s")' % \