Allow images to blank to theme.

As none defined cos it's an image use global

Fixes: https://launchpad.net/bugs/630254
This commit is contained in:
Tim Bentley 2010-09-05 17:11:50 +01:00
parent 789147ad94
commit a4d8e225c0
3 changed files with 15 additions and 11 deletions

View File

@ -145,6 +145,7 @@ body {
}
document.getElementById('black').style.display = black;
document.getElementById('lyricsmain').style.visibility = lyrics;
document.getElementById('image').style.visibility = lyrics;
outline = document.getElementById('lyricsoutline')
if(outline!=null)
outline.style.visibility = lyrics;
@ -370,7 +371,7 @@ def build_lyrics_css(item, webkitvers):
lyricsmain = u''
outline = u''
shadow = u''
if theme:
if theme and item.main:
lyricstable = u'left: %spx; top: %spx;' % \
(item.main.x(), item.main.y())
lyrics = build_lyrics_format_css(theme, item.main.width(),
@ -520,7 +521,7 @@ def build_footer_css(item):
text-align: %s;
"""
theme = item.themedata
if not theme:
if not theme or not item.footer:
return u''
if theme.display_horizontalAlign == 2:
align = u'center'

View File

@ -93,6 +93,8 @@ class RenderManager(object):
"""
self.global_theme = global_theme
self.theme_level = theme_level
self.global_theme_data = \
self.theme_manager.getThemeData(self.global_theme)
self.themedata = None
def set_service_theme(self, service_theme):

View File

@ -170,6 +170,7 @@ class ServiceItem(object):
u'verseTag': slide[u'verseTag'] })
log.log(15, u'Formatting took %4s' % (time.time() - before))
elif self.service_item_type == ServiceItemType.Image:
self.themedata = self.render_manager.global_theme_data
for slide in self._raw_frames:
slide[u'image'] = resize_image(slide[u'image'],
self.render_manager.width, self.render_manager.height)