openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/service-delete into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/service-delete/+merge/107851

Code tidy up and performance improvement by caching themes early.
-- 
https://code.launchpad.net/~trb143/openlp/service-delete/+merge/107851
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/service-delete into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2012-05-20 20:56:11 +0000
+++ openlp/core/lib/renderer.py	2012-05-29 18:57:21 +0000
@@ -109,6 +109,8 @@
         self.global_theme_data = \
             self.themeManager.getThemeData(self.global_theme)
         self.theme_data = None
+        self._cache_background_image(self.global_theme_data)
+
 
     def set_service_theme(self, service_theme):
         """
@@ -119,6 +121,23 @@
         """
         self.service_theme = service_theme
         self.theme_data = None
+        self._cache_background_image(self.themeManager.getThemeData
+            (service_theme))
+
+
+    def _cache_background_image(self,temp_theme):
+        """
+        Adds a background image to the image cache if necessary.
+
+        ``temp_theme``
+            The theme object containing the theme data.
+        """
+        # if No file do not update cache
+        if temp_theme.background_filename:
+            self.imageManager.add_image(temp_theme.theme_name,
+                temp_theme.background_filename, u'theme',
+                QtGui.QColor(temp_theme.background_border_color))
+
 
     def set_override_theme(self, override_theme, override_levels=False):
         """
@@ -163,11 +182,7 @@
             self.theme_data = self.themeManager.getThemeData(theme)
         self._calculate_default()
         self._build_text_rectangle(self.theme_data)
-        # if No file do not update cache
-        if self.theme_data.background_filename:
-            self.imageManager.add_image(self.theme_data.theme_name,
-                self.theme_data.background_filename, u'theme',
-                QtGui.QColor(self.theme_data.background_border_color))
+        self._cache_background_image(self.theme_data)
         return self._rect, self._rect_footer
 
     def generate_preview(self, theme_data, force_page=False):

=== modified file 'openlp/plugins/remotes/html/index.html'
--- openlp/plugins/remotes/html/index.html	2012-04-21 07:03:32 +0000
+++ openlp/plugins/remotes/html/index.html	2012-05-29 18:57:21 +0000
@@ -164,7 +164,7 @@
       <input type="search" name="search-text" id="search-text" value="" />
     </div>
     <a href="#" id="search-submit" data-role="button">${search}</a>
-    <ul data-role="listview" data-inset="true">
+    <ul data-role="listview" data-inset="true"/>
   </div>
 </div>
 <div data-role="page" id="options">