Latest changes parked

This commit is contained in:
Tim Bentley 2010-07-13 18:23:05 +01:00
parent 166fabbd5f
commit 957e7294c8
2 changed files with 10 additions and 3 deletions

View File

@ -132,6 +132,7 @@ def build_lyrics(theme, width, height, alert):
height: 480px; height: 480px;
z-index:3; z-index:3;
%s; %s;
%s;
font-family %s; font-family %s;
font-size: %spx; font-size: %spx;
} }
@ -141,8 +142,14 @@ def build_lyrics(theme, width, height, alert):
outline = u'' outline = u''
if theme: if theme:
if theme.display_shadow: 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) shadow = u'text-shadow: %spx %spx %spx %s' %\
lyrics_html = lyrics % (shadow,theme. font_main_name, theme.font_main_proportion) (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 print lyrics_html
return lyrics_html return lyrics_html

View File

@ -183,7 +183,7 @@ class RenderManager(object):
footer.append(u'CCLI 123456') footer.append(u'CCLI 123456')
formatted = self.renderer.format_slide(verse, False) formatted = self.renderer.format_slide(verse, False)
#Only Render the first slide page returned #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], return image #self.renderer.generate_frame_from_lines(formatted[0],
#footer)[u'main'] #footer)[u'main']