From ee7b50a770d56ed74fe2ff0d796abbb32201d7aa Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Thu, 29 Jul 2010 18:08:01 +0100
Subject: [PATCH] Fix html color location

---
 openlp/core/lib/rendermanager.py | 30 ++++++++++++++++++++++++++
 openlp/core/lib/serviceitem.py   | 36 ++++----------------------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index ca62c5560..9bfded946 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -67,6 +67,16 @@ class RenderManager(object):
         self.override_background = None
         self.themedata = None
 
+        # TODO make external and configurable
+        self.html_expands = {
+            u'{r}': u'<font color=red>',
+            u'{b}': u'<font color=black>',
+            u'{u}': u'<font color=blue>',
+            u'{y}': u'<font color=yellow>',
+            u'{g}': u'<font color=green>',
+            u'{/}': u'</font>'
+        }
+
     def update_display(self):
         """
         Updates the render manager's information about the current screen.
@@ -240,3 +250,23 @@ class RenderManager(object):
             self.width, self.height, self.screen_ratio )
         # 90% is start of footer
         self.footer_start = int(self.height * 0.90)
+
+    def clean(self, text):
+        """
+        Remove Tags from text for display
+        """
+        text = text.replace(u'<br>', u'\n').replace(u'<p>', u'')\
+            .replace(u'</p>', u'').replace(u'<sup>', u'')\
+            .replace(u'</sup>', u'')
+        for key, value in self.html_expands.iteritems():
+            text = text.replace(key, u'')
+        return text
+
+    def expand(self, text):
+        """
+        Expand tags fto HTML for display
+        """
+        for key, value in self.html_expands.iteritems():
+            text = text.replace(key, value)
+        return text
+
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 30c6d164b..cc0f93c17 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -97,16 +97,6 @@ class ServiceItem(object):
         self.main = None
         self.footer = None
 
-        # TODO make external and configurable
-        self.html_expands = {
-            u'{r}': u'<font color=red>',
-            u'{b}': u'<font color=black>',
-            u'{u}': u'<font color=blue>',
-            u'{y}': u'<font color=yellow>',
-            u'{g}': u'<font color=green>',
-            u'{/}': u'</font>'
-        }
-
     def add_capability(self, capability):
         """
         Add an ItemCapability to a ServiceItem
@@ -153,7 +143,8 @@ class ServiceItem(object):
             theme = None;
             if not self.theme:
                 theme = self.theme
-            self.main, self.footer = self.render_manager.set_override_theme(theme)
+            self.main, self.footer = \
+                self.render_manager.set_override_theme(theme)
             self.bg_frame = self.render_manager.renderer.bg_frame
             self.themedata = self.render_manager.themedata
             for slide in self._raw_frames:
@@ -162,8 +153,8 @@ class ServiceItem(object):
                 for format in formated:
                     self._display_frames.append(
                         {u'title': format.replace(u'<p>', u''),
-                        u'text': self.clean(format.rstrip()),
-                        u'html': self.expand(format.rstrip()),
+                        u'text': self.render_manager.clean(format.rstrip()),
+                        u'html': self.render_manager.expand(format.rstrip()),
                         u'verseTag': slide[u'verseTag'] })
                 log.log(15, u'Formatting took %4s' % (time.time() - before))
         elif self.service_item_type == ServiceItemType.Image:
@@ -382,22 +373,3 @@ class ServiceItem(object):
         Returns the title of the raw frame
         """
         return self._raw_frames[row][u'path']
-
-    def clean(self, text):
-        """
-        Remove Tags from text for display
-        """
-        text = text.replace(u'<br>', u'\n').replace(u'<p>', u'')\
-            .replace(u'</p>', u'').replace(u'<sup>', u'')\
-            .replace(u'</sup>', u'')
-        for key, value in self.html_expands.iteritems():
-            text = text.replace(key, u'')
-        return text
-
-    def expand(self, text):
-        """
-        Expand tags fto HTML for display
-        """
-        for key, value in self.html_expands.iteritems():
-            text = text.replace(key, value)
-        return text