From 957e7294c857ec2eda0f0b8f99e57cd1489e04ec Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 13 Jul 2010 18:23:05 +0100 Subject: [PATCH] Latest changes parked --- openlp/core/lib/htmlbuilder.py | 11 +++++++++-- openlp/core/lib/rendermanager.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index b9152c9ec..005416f73 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -132,6 +132,7 @@ def build_lyrics(theme, width, height, alert): height: 480px; z-index:3; %s; + %s; font-family %s; font-size: %spx; } @@ -141,8 +142,14 @@ def build_lyrics(theme, width, height, alert): outline = u'' if theme: if theme.display_shadow: - shadow = u'text-shadow: %spx %spx %spx %s' % (theme.display_shadow_size, theme.display_shadow_size, theme.display_shadow_size, theme.display_shadow_color) - lyrics_html = lyrics % (shadow,theme. font_main_name, theme.font_main_proportion) + shadow = u'text-shadow: %spx %spx %spx %s' %\ + (theme.display_shadow_size, theme.display_shadow_size, + theme.display_shadow_size, theme.display_shadow_color) + if theme.display_outline: + # 1px is the blur radius + outline = u'text-outline: %spx 1px %s' %\ + (theme.display_outline_size, theme.display_outline_color) + lyrics_html = lyrics % (shadow, outline, theme.font_main_name, theme.font_main_proportion) print lyrics_html return lyrics_html diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index a08a1ac77..18409dddf 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -183,7 +183,7 @@ class RenderManager(object): footer.append(u'CCLI 123456') formatted = self.renderer.format_slide(verse, False) #Only Render the first slide page returned - image = self.previewDisplay.preview(self.renderer.bg_frame, main_text[0]) + image = self.previewDisplay.preview(self.renderer.bg_frame, verse, self.themedata) return image #self.renderer.generate_frame_from_lines(formatted[0], #footer)[u'main']