Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
#693150 Custom Slide Display footer option
https://bugs.launchpad.net/bugs/693150
#693202 delete theme
https://bugs.launchpad.net/bugs/693202
#696557 changing override display blacks background
https://bugs.launchpad.net/bugs/696557
For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/46025
Fix bug 696557. Cache resizing was adding name to full path
Comment tidy ups.
--
https://code.launchpad.net/~trb143/openlp/bugs/+merge/46025
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/bugs into lp:openlp.
=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py 2010-12-26 11:04:47 +0000
+++ openlp/core/lib/imagemanager.py 2011-01-12 18:56:35 +0000
@@ -86,8 +86,7 @@
for key in self._cache.keys():
image = self._cache[key]
image.dirty = True
- fullpath = os.path.join(image.path, image.name)
- image.image = resize_image(fullpath,
+ image.image = resize_image(image.path,
self.width, self.height)
self._cache_dirty = True
# only one thread please
@@ -165,4 +164,4 @@
image = self._cache[key]
if image.dirty:
image.image_bytes = image_to_byte(image.image)
- image.dirty = False
\ No newline at end of file
+ image.dirty = False
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-01-09 13:54:40 +0000
+++ openlp/core/ui/maindisplay.py 2011-01-12 18:56:35 +0000
@@ -198,7 +198,7 @@
The slide text to be displayed
"""
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:
Receiver.send_message(u'openlp_process_events')
self.frame.evaluateJavaScript(u'show_text("%s")' % \
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
