From 83334a19e9e54861f3a9ef34ce4b2084c0f1508c Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 25 Sep 2010 11:07:40 +0100
Subject: [PATCH] New Manifest file

---
 MANIFEST.in                 |  1 +
 openlp/core/lib/__init__.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index e8a5822e6..efccdf79d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,7 @@ recursive-include openlp *.sqlite
 recursive-include openlp *.csv
 recursive-include openlp *.html
 recursive-include openlp *.js
+recursive-include openlp *.qm
 recursive-include documentation *
 recursive-include resources/forms *
 recursive-include resources/i18n *
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 0bf07381b..e9ca9ecd7 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -81,8 +81,8 @@ html_expands.append({u'desc':u'Italics', u'start tag':u'{it}',
     u'start html':u'<em>', u'end tag':u'{/it}', u'end html':u'</em>',
     u'protected':True})
 
-# Image cache to stop regualar image resizing
-cache = {}
+# Image image_cache to stop regualar image resizing
+image_cache = {}
 
 def translate(context, text, comment=None):
     """
@@ -261,9 +261,9 @@ def resize_image(image, width, height, background=QtCore.Qt.black):
             return preview
         preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
             QtCore.Qt.SmoothTransformation)
-    cache_key = u'%s%s%s' % (image, unicode(width), unicode(height))
-    if cache_key in cache:
-        return cache[cache_key]
+    image_cache_key = u'%s%s%s' % (image, unicode(width), unicode(height))
+    if image_cache_key in image_cache:
+        return image_cache[image_cache_key]
     realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space
@@ -272,8 +272,8 @@ def resize_image(image, width, height, background=QtCore.Qt.black):
     new_image.fill(background)
     painter = QtGui.QPainter(new_image)
     painter.drawImage((width - realw) / 2, (height - realh) / 2, preview)
-    cache[cache_key] = new_image
-    print cache
+    image_cache[image_cache_key] = new_image
+    print image_cache
     return new_image
 
 def check_item_selected(list_widget, message):