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

changed/removed variable

Browse Source
This commit is contained in:
Andreas Preikschat 2010-09-17 14:17:50 +02:00
parent 194e278581
commit bfc3543d39
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,7 +512,7 @@ class BibleMediaItem(MediaManagerItem):
raw_footer = [] raw_footer = []
raw_slides = [] raw_slides = []
raw_title = [] raw_title = []
first_item = True first = True
# Let's loop through the main lot, and assemble our verses. # Let's loop through the main lot, and assemble our verses.
for item in items: for item in items:
book = self._decodeQtObject(item, 'book') book = self._decodeQtObject(item, 'book')
@ -552,17 +552,15 @@ class BibleMediaItem(MediaManagerItem):
# We have to be 'Continuous'. # We have to be 'Continuous'.
else: else:
bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
if first_item: if first:
start_item = item start_item = item
first_item = False first = False
elif self.checkTitle(item, old_item): elif self.checkTitle(item, old_item):
title = self.formatTitle(start_item, old_item) raw_title.append(self.formatTitle(start_item, old_item))
raw_title.append(title)
start_item = item start_item = item
old_item = item old_item = item
old_chapter = chapter old_chapter = chapter
title = self.formatTitle(start_item, item) raw_title.append(self.formatTitle(start_item, item))
raw_title.append(title)
# If there are no more items we check whether we have to add bible_text. # If there are no more items we check whether we have to add bible_text.
if bible_text: if bible_text:
raw_slides.append(bible_text) raw_slides.append(bible_text)
@ -574,10 +572,10 @@ class BibleMediaItem(MediaManagerItem):
service_item.add_capability(ItemCapabilities.AllowsPreview) service_item.add_capability(ItemCapabilities.AllowsPreview)
service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsLoop)
# Service Item: Title # Service Item: Title
first_verse = True first = True
for title in raw_title: for title in raw_title:
if first_verse: if first:
first_verse = False first = False
service_item.title = title service_item.title = title
else: else:
service_item.title += u', ' + title service_item.title += u', ' + title