openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Bibles do not loop

This commit is contained in:
Tim Bentley 2010-07-30 19:02:03 +01:00
parent 50691074b8
commit 0518f4987a
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openlp/core/lib/serviceitem.py
View File

@ -96,6 +96,7 @@ class ServiceItem(object):
self.themedata = None self.themedata = None
self.main = None self.main = None
self.footer = None self.footer = None
self.bg_frame = None
def add_capability(self, capability): def add_capability(self, capability):
""" """
@ -135,12 +136,10 @@ class ServiceItem(object):
""" """
log.debug(u'Render called') log.debug(u'Render called')
self._display_frames = [] self._display_frames = []
#self.clear_cache()
self.bg_frame = None self.bg_frame = None
self.just_rendered = True
if self.service_item_type == ServiceItemType.Text: if self.service_item_type == ServiceItemType.Text:
log.debug(u'Formatting slides') log.debug(u'Formatting slides')
theme = None; theme = None
if not self.theme: if not self.theme:
theme = self.theme theme = self.theme
self.main, self.footer = \ self.main, self.footer = \
@ -150,11 +149,11 @@ class ServiceItem(object):
for slide in self._raw_frames: for slide in self._raw_frames:
before = time.time() before = time.time()
formated = self.render_manager.format_slide(slide[u'raw_slide']) formated = self.render_manager.format_slide(slide[u'raw_slide'])
for format in formated: for page in formated:
self._display_frames.append( self._display_frames.append(
{u'title': self.render_manager.clean(format), {u'title': self.render_manager.clean(page),
u'text': self.render_manager.clean(format.rstrip()), u'text': self.render_manager.clean(page.rstrip()),
u'html': self.render_manager.expand(format.rstrip()), u'html': self.render_manager.expand(page.rstrip()),
u'verseTag': slide[u'verseTag'] }) u'verseTag': slide[u'verseTag'] })
log.log(15, u'Formatting took %4s' % (time.time() - before)) log.log(15, u'Formatting took %4s' % (time.time() - before))
elif self.service_item_type == ServiceItemType.Image: elif self.service_item_type == ServiceItemType.Image:

2
openlp/core/ui/__init__.py
View File

@ -55,6 +55,6 @@ from mediadockmanager import MediaDockManager
from servicemanager import ServiceManager from servicemanager import ServiceManager
from thememanager import ThemeManager from thememanager import ThemeManager
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow', __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm',
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager', 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm'] 'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm']

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

@ -548,13 +548,15 @@ class BibleMediaItem(MediaManagerItem):
#Paragraph style force new line per verse #Paragraph style force new line per verse
if self.parent.settings_tab.layout_style == 1: if self.parent.settings_tab.layout_style == 1:
text = text + u'\n\n' text = text + u'\n\n'
else:
text = text + u'\n'
bible_text = u'%s %s %s' % (bible_text, verse_text, text) bible_text = u'%s %s %s' % (bible_text, verse_text, text)
#if we are verse per slide then create slide #if we are verse per slide then create slide
if self.parent.settings_tab.layout_style == 0: if self.parent.settings_tab.layout_style == 0:
raw_slides.append(bible_text) raw_slides.append(bible_text)
bible_text = u'' bible_text = u''
if not service_item.title: if not service_item.title:
service_item.title = u'%s %s' % (book, verse_text) service_item.title = u'%s %s:%s' % (book, chapter, verse)
elif service_item.title.find( elif service_item.title.find(
translate('BiblesPlugin.MediaItem', 'etc')) == -1: translate('BiblesPlugin.MediaItem', 'etc')) == -1:
service_item.title = u'%s, %s' % (service_item.title, service_item.title = u'%s, %s' % (service_item.title,