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

Changes continue

Browse Source
This commit is contained in:
Tim Bentley 2011-04-03 07:19:03 +01:00
parent fbc94dda3a
commit 63bfac4b7e
2 changed files with 80 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
openlp/core/lib/renderer.py
View File

@ -45,6 +45,8 @@ VERSE = u'The Lord said to {r}Noah{/r}: \n' \
'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n' 'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456'] FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
HTML_END = u'</div></body></html>'
class Renderer(object): class Renderer(object):
""" """
Class to pull all Renderer interactions into one place. The plugins will Class to pull all Renderer interactions into one place. The plugins will
@ -72,7 +74,6 @@ class Renderer(object):
self.display = MainDisplay(self, screens, False) self.display = MainDisplay(self, screens, False)
self.display.imageManager = self.image_manager self.display.imageManager = self.image_manager
self.theme_manager = theme_manager self.theme_manager = theme_manager
self.theme = u''
self.service_theme = u'' self.service_theme = u''
self.theme_level = u'' self.theme_level = u''
self.override_background = None self.override_background = None
@ -120,7 +121,7 @@ class Renderer(object):
self.service_theme = service_theme self.service_theme = service_theme
self.theme_data = None self.theme_data = None
def set_override_theme(self, theme, override_levels=False): def set_override_theme(self, override_theme, override_levels=False):
""" """
Set the appropriate theme depending on the theme level. Set the appropriate theme depending on the theme level.
Called by the service item when building a display frame Called by the service item when building a display frame
@ -133,35 +134,35 @@ class Renderer(object):
Used to force the theme data passed in to be used. Used to force the theme data passed in to be used.
""" """
log.debug(u'set override theme to %s', theme) log.debug(u'set override theme to %s', override_theme)
theme_level = self.theme_level theme_level = self.theme_level
if override_levels: if override_levels:
theme_level = ThemeLevel.Song theme_level = ThemeLevel.Song
if theme_level == ThemeLevel.Global: if theme_level == ThemeLevel.Global:
self.theme = self.global_theme theme = self.global_theme
elif theme_level == ThemeLevel.Service: elif theme_level == ThemeLevel.Service:
if self.service_theme == u'': if self.service_theme == u'':
self.theme = self.global_theme theme = self.global_theme
else: else:
self.theme = self.service_theme theme = self.service_theme
else: else:
# Images have a theme of -1 # Images have a theme of -1
if theme and theme != -1: if override_theme and override_theme != -1:
self.theme = theme theme = override_theme
elif theme_level == ThemeLevel.Song or \ elif theme_level == ThemeLevel.Song or \
theme_level == ThemeLevel.Service: theme_level == ThemeLevel.Service:
if self.service_theme == u'': if self.service_theme == u'':
self.theme = self.global_theme theme = self.global_theme
else: else:
self.theme = self.service_theme theme = self.service_theme
else: else:
self.theme = self.global_theme theme = self.global_theme
log.debug(u'theme is now %s', self.theme) log.debug(u'theme is now %s', theme)
# Force the theme to be the one passed in. # Force the theme to be the one passed in.
if override_levels: if override_levels:
self.theme_data = theme self.theme_data = override_theme
else: else:
self.theme_data = self.theme_manager.getThemeData(self.theme) self.theme_data = self.theme_manager.getThemeData(theme)
self._calculate_default(self.screens.current[u'size']) self._calculate_default(self.screens.current[u'size'])
self._build_text_rectangle(self.theme_data) self._build_text_rectangle(self.theme_data)
self.image_manager.add_image(self.theme_data.theme_name, self.image_manager.add_image(self.theme_data.theme_name,
@ -203,11 +204,11 @@ class Renderer(object):
self._calculate_default(self.screens.current[u'size']) self._calculate_default(self.screens.current[u'size'])
return preview return preview
def format_slide(self, slide, line_break, item): def format_slide(self, text, line_break, item):
""" """
Calculate how much text can fit on a slide. Calculate how much text can fit on a slide.
``slide`` ``text``
The words to go on the slides. The words to go on the slides.
``line_break`` ``line_break``
@ -215,17 +216,13 @@ class Renderer(object):
""" """
log.debug(u'format slide') log.debug(u'format slide')
# clean up line endings # clean up line endings
slide = slide.replace(u'\r\n', u'\n') lines = self._lines(text)
print "###############"
print [slide]
lines = self._lines(slide)
pages = self._paginate_slide(lines, line_break, self.force_page) pages = self._paginate_slide(lines, line_break, self.force_page)
print len(pages)
if len(pages) > 1: if len(pages) > 1:
# Songs and Custom # Songs and Custom
if item.is_capable(ItemCapabilities.AllowsVirtualSplit): if item.is_capable(ItemCapabilities.AllowsVirtualSplit):
# do not forget the line breaks ! # do not forget the line breaks !
slides = slide.split(u'\n[---]\n') slides = text.split(u'\n[---]\n')
pages = [] pages = []
for slide in slides: for slide in slides:
lines = self._lines(slide) lines = self._lines(slide)
@ -235,9 +232,7 @@ class Renderer(object):
pages.append(page) pages.append(page)
# # Bibles # # Bibles
elif item.is_capable(ItemCapabilities.AllowsWordSplit): elif item.is_capable(ItemCapabilities.AllowsWordSplit):
lines = self._words(slide) pages = self._paginate_slide_words(text, line_break)
pages = self._paginate_slide(lines, False)
print pages
return pages return pages
def _calculate_default(self, screen): def _calculate_default(self, screen):
@ -339,7 +334,7 @@ class Renderer(object):
line_count += 1 line_count += 1
styled_line = expand_tags(line) + line_end styled_line = expand_tags(line) + line_end
styled_text += styled_line styled_text += styled_line
html = self.page_shell + styled_text + u'</div></body></html>' html = self.page_shell + styled_text + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
# Text too long so go to next page # Text too long so go to next page
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
@ -358,14 +353,20 @@ class Renderer(object):
log.debug(u'format_slide - End') log.debug(u'format_slide - End')
return formatted return formatted
def _paginate_slide_words(self, lines, line_break): def _paginate_slide_words(self, text, line_break):
""" """
Figure out how much text can appear on a slide, using the current Figure out how much text can appear on a slide, using the current
theme settings. theme settings. This version is to handle text which needs to be split
into words to get it to fit.
``lines`` ``text``
The words to be fitted on the slide split into lines. The words to be fitted on the slide split into lines.
``line_break``
Add line endings after each line of text used for bibles.
""" """
print [text]
log.debug(u'format_slide - Start') log.debug(u'format_slide - Start')
line_end = u'' line_end = u''
if line_break: if line_break:
@ -373,35 +374,69 @@ class Renderer(object):
formatted = [] formatted = []
html_text = u'' html_text = u''
styled_text = u'' styled_text = u''
line_count = 0
force_current = False
lines = self._lines(text, u'[---]')
# Loop through the lines
for line in lines: for line in lines:
line_count += 1
styled_line = expand_tags(line) styled_line = expand_tags(line)
if line.startswith(u'{su}'): styled_line = line_end + styled_line
styled_line = line_end + styled_line
styled_text += styled_line styled_text += styled_line
html = self.page_shell + styled_text + u'</div></body></html>' html = self.page_shell + styled_text + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
# Text too long so go to next page # Text too long so go to next page
print self.web_frame.contentsSize().height() , self.page_height, [line]
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
#split # we have more than 1 verse on the slide
if html_text.endswith(u'<br>'): print "A", line_count
html_text = html_text[:len(html_text)-4] if line_count > 1:
formatted.append(html_text) if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4]
formatted.append(html_text)
force_current = True
print "##### > 1"
print [html_text]
html_text = u'' html_text = u''
styled_text = styled_line # only one block on page so lets make it words.
html_text += line# + line_end if line_count == 1 or force_current:
print "##### = 1"
print [line]
force_current = False
styled_text = u''
words = self._words(line)
styled_text = u''
for word in words:
styled_line = expand_tags(word)
styled_text += styled_line
html = self.page_shell + styled_text + HTML_END
self.web.setHtml(html)
# Text too long so go to next page
print "B", self.web_frame.contentsSize().height() , self.page_height
if self.web_frame.contentsSize().height() > self.page_height:
if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4]
print "c", [html_text]
formatted.append(html_text)
html_text = u''
styled_text = styled_line
html_text += word
line_count = 0
styled_text = styled_line
html_text += line + line_end
if html_text.endswith(u'<br>'): if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4] html_text = html_text[:len(html_text)-4]
formatted.append(html_text) formatted.append(html_text)
log.debug(u'format_slide - End') log.debug(u'format_slide - End')
return formatted return formatted
def _lines(self, words, split=u'\n[---]\n'):
def _lines(self, words):
""" """
Split the slide up by physical line Split the slide up by physical line
""" """
# this parse we do not want to use this so remove it # this parse we do not want to use this so remove it
words = words.replace(u'\n[---]\n', u'') words = words.replace(split, u'')
verses_text = words.split(u'\n') verses_text = words.split(u'\n')
text = [] text = []
for verse in verses_text: for verse in verses_text:
@ -415,7 +450,6 @@ class Renderer(object):
Split the slide up by word so can wrap better Split the slide up by word so can wrap better
""" """
# this parse we are wordy # this parse we are wordy
words = words.replace(u'[---]', u'').lstrip()
words = words.replace(u'\n', u' ') words = words.replace(u'\n', u' ')
verses_text = words.split(u' ') verses_text = words.split(u' ')
text = [] text = []

8
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -799,9 +799,9 @@ class BibleMediaItem(MediaManagerItem):
else: else:
verse_text = unicode(verse) verse_text = unicode(verse)
if self.settings.display_style == DisplayStyle.Round: if self.settings.display_style == DisplayStyle.Round:
return u'\n[---]\n{su}(%s){/su}' % verse_text return u'[---]{su}(%s){/su}' % verse_text
if self.settings.display_style == DisplayStyle.Curly: if self.settings.display_style == DisplayStyle.Curly:
return u'\n[---]\n{su}{%s}{/su}' % verse_text return u'[---]{su}{%s}{/su}' % verse_text
if self.settings.display_style == DisplayStyle.Square: if self.settings.display_style == DisplayStyle.Square:
return u'\n[---]\n{su}[%s]{/su}' % verse_text return u'[---]{su}[%s]{/su}' % verse_text
return u'\n[---]\n{su}%s{/su}' % verse_text return u'[---]{su}%s{/su}' % verse_text