forked from openlp/openlp
removed argument
This commit is contained in:
parent
f1afae1813
commit
7281f44603
|
@ -234,10 +234,10 @@ class Renderer(object):
|
||||||
serviceItem = ServiceItem()
|
serviceItem = ServiceItem()
|
||||||
if self.force_page:
|
if self.force_page:
|
||||||
# make big page for theme edit dialog to get line count
|
# make big page for theme edit dialog to get line count
|
||||||
serviceItem.add_from_text(u'', VERSE_FOR_LINE_COUNT)
|
serviceItem.add_from_text(VERSE_FOR_LINE_COUNT)
|
||||||
else:
|
else:
|
||||||
self.image_manager.deleteImage(theme_data.theme_name)
|
self.image_manager.deleteImage(theme_data.theme_name)
|
||||||
serviceItem.add_from_text(u'', VERSE)
|
serviceItem.add_from_text(VERSE)
|
||||||
serviceItem.renderer = self
|
serviceItem.renderer = self
|
||||||
serviceItem.raw_footer = FOOTER
|
serviceItem.raw_footer = FOOTER
|
||||||
# if No file do not update cache
|
# if No file do not update cache
|
||||||
|
|
|
@ -220,20 +220,17 @@ class ServiceItem(object):
|
||||||
self.image_border)
|
self.image_border)
|
||||||
self._new_item()
|
self._new_item()
|
||||||
|
|
||||||
def add_from_text(self, title, raw_slide, verse_tag=None):
|
def add_from_text(self, raw_slide, verse_tag=None):
|
||||||
"""
|
"""
|
||||||
Add a text slide to the service item.
|
Add a text slide to the service item.
|
||||||
|
|
||||||
``frame_title``
|
|
||||||
The title of the slide in the service item.
|
|
||||||
|
|
||||||
``raw_slide``
|
``raw_slide``
|
||||||
The raw text of the slide.
|
The raw text of the slide.
|
||||||
"""
|
"""
|
||||||
if verse_tag:
|
if verse_tag:
|
||||||
verse_tag = verse_tag.upper()
|
verse_tag = verse_tag.upper()
|
||||||
self.service_item_type = ServiceItemType.Text
|
self.service_item_type = ServiceItemType.Text
|
||||||
title = title.split(u'\n')[0]
|
title = raw_slide[:30].split(u'\n')[0]
|
||||||
self._raw_frames.append(
|
self._raw_frames.append(
|
||||||
{u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag})
|
{u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag})
|
||||||
self._new_item()
|
self._new_item()
|
||||||
|
|
|
@ -975,7 +975,7 @@ class BibleMediaItem(MediaManagerItem):
|
||||||
else:
|
else:
|
||||||
service_item.theme = self.settings.bible_theme
|
service_item.theme = self.settings.bible_theme
|
||||||
for slide in raw_slides:
|
for slide in raw_slides:
|
||||||
service_item.add_from_text(slide[:30], slide)
|
service_item.add_from_text(slide)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def formatTitle(self, start_bitem, old_bitem):
|
def formatTitle(self, start_bitem, old_bitem):
|
||||||
|
|
|
@ -214,7 +214,7 @@ class CustomMediaItem(MediaManagerItem):
|
||||||
raw_slides = [verse[1] for verse in verseList]
|
raw_slides = [verse[1] for verse in verseList]
|
||||||
service_item.title = title
|
service_item.title = title
|
||||||
for slide in raw_slides:
|
for slide in raw_slides:
|
||||||
service_item.add_from_text(slide[:30], slide)
|
service_item.add_from_text(slide)
|
||||||
if QtCore.QSettings().value(self.settingsSection + u'/display footer',
|
if QtCore.QSettings().value(self.settingsSection + u'/display footer',
|
||||||
QtCore.QVariant(True)).toBool() or credit:
|
QtCore.QVariant(True)).toBool() or credit:
|
||||||
service_item.raw_footer.append(u' '.join([title, credit]))
|
service_item.raw_footer.append(u' '.join([title, credit]))
|
||||||
|
|
|
@ -485,8 +485,7 @@ class SongMediaItem(MediaManagerItem):
|
||||||
verse_index = VerseType.from_tag(verse_tag)
|
verse_index = VerseType.from_tag(verse_tag)
|
||||||
verse_tag = VerseType.TranslatedTags[verse_index].upper()
|
verse_tag = VerseType.TranslatedTags[verse_index].upper()
|
||||||
verse_def = u'%s%s' % (verse_tag, verse[0][u'label'])
|
verse_def = u'%s%s' % (verse_tag, verse[0][u'label'])
|
||||||
service_item.add_from_text(
|
service_item.add_from_text(unicode(verse[1]), verse_def)
|
||||||
verse[1][:30], unicode(verse[1]), verse_def)
|
|
||||||
else:
|
else:
|
||||||
# Loop through the verse list and expand the song accordingly.
|
# Loop through the verse list and expand the song accordingly.
|
||||||
for order in song.verse_order.lower().split():
|
for order in song.verse_order.lower().split():
|
||||||
|
@ -505,12 +504,11 @@ class SongMediaItem(MediaManagerItem):
|
||||||
verse_tag = VerseType.TranslatedTags[verse_index]
|
verse_tag = VerseType.TranslatedTags[verse_index]
|
||||||
verse_def = u'%s%s' % (verse_tag,
|
verse_def = u'%s%s' % (verse_tag,
|
||||||
verse[0][u'label'])
|
verse[0][u'label'])
|
||||||
service_item.add_from_text(
|
service_item.add_from_text(verse[1], verse_def)
|
||||||
verse[1][:30], verse[1], verse_def)
|
|
||||||
else:
|
else:
|
||||||
verses = song.lyrics.split(u'\n\n')
|
verses = song.lyrics.split(u'\n\n')
|
||||||
for slide in verses:
|
for slide in verses:
|
||||||
service_item.add_from_text(slide[:30], unicode(slide))
|
service_item.add_from_text(unicode(slide))
|
||||||
service_item.title = song.title
|
service_item.title = song.title
|
||||||
author_list = [unicode(author.display_name) for author in song.authors]
|
author_list = [unicode(author.display_name) for author in song.authors]
|
||||||
service_item.raw_footer.append(song.title)
|
service_item.raw_footer.append(song.title)
|
||||||
|
|
Loading…
Reference in New Issue