raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HTML - sort of fixes

This commit is contained in:
Tim Bentley 2010-07-22 19:04:48 +01:00
parent 225ef69b0d
commit 047cc6205a
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openlp/core/lib/htmlbuilder.py
View File

@ -126,13 +126,13 @@ def build_image_src(image):
def build_lyrics(item, width, height): def build_lyrics(item, width, height):
lyrics = """ lyrics = """
#lyrics {position: absolute; %s z-index:3; %s; %s; %s %s } #lyrics {position: absolute; %s z-index:3; %s; %s %s }
table {border=0;margin=0padding=0;}
""" """
theme = item.themedata theme = item.themedata
lyrics_html = u'' lyrics_html = u''
position = u'' position = u''
shadow = u'' fontworks = u''
outline = u''
font = u'' font = u''
text = u'' text = u''
if theme: if theme:
@ -152,16 +152,25 @@ def build_lyrics(item, width, height):
else: else:
valign = u'vertical-align=bottom;' valign = u'vertical-align=bottom;'
text = u'color:%s; %s %s' % (theme.font_main_color, align, valign) text = u'color:%s; %s %s' % (theme.font_main_color, align, valign)
if theme.display_shadow: if theme.display_shadow and theme.display_outline:
shadow = u'text-shadow: %spx %spx %spx %s' %\ fontworks = u'text-shadow: -%spx 0 %s, 0 %spx %s, %spx 0 %s, 0 -%spx %s, %spx %spx %spx %s' %\
(theme.display_outline_size, theme.display_outline_color,
theme.display_outline_size, theme.display_outline_color,
theme.display_outline_size, theme.display_outline_color,
theme.display_outline_size, theme.display_outline_color,
theme.display_shadow_size, theme.display_shadow_size,
theme.display_shadow_size, theme.display_shadow_color)
elif theme.display_shadow:
fontworks = u'text-shadow: %spx %spx %spx %s' %\
(theme.display_shadow_size, theme.display_shadow_size, (theme.display_shadow_size, theme.display_shadow_size,
theme.display_shadow_size, theme.display_shadow_color) theme.display_shadow_size, theme.display_shadow_color)
if theme.display_outline: elif theme.display_outline:
# 1px is the blur radius fontworks = u'text-shadow: -%spx 0 %s, 0 %spx %s, %spx 0 %s, 0 -%spx %s' %\
outline = u'text-outline: %spx 1px %s' %\ (theme.display_outline_size, theme.display_outline_color,
(theme.display_outline_size, theme.display_outline_color) theme.display_outline_size, theme.display_outline_color,
outline = u'text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white' theme.display_outline_size, theme.display_outline_color,
lyrics_html = lyrics % (position, shadow, outline, font, text) theme.display_outline_size, theme.display_outline_color)
lyrics_html = lyrics % (position, fontworks, font, text)
print lyrics_html print lyrics_html
return lyrics_html return lyrics_html