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

Fix Bible plugin rendering

This commit is contained in:
Tim Bentley 2009-10-09 13:48:22 +01:00
parent 05fe475db0
commit 34b95be0b7
2 changed files with 10 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

@ -345,20 +345,20 @@ class BibleMediaItem(MediaManagerItem):
verse = unicode(self.search_results[0].verse) verse = unicode(self.search_results[0].verse)
text = self.search_results[0].text text = self.search_results[0].text
#Paragraph style force new line per verse #Paragraph style force new line per verse
if self.parent.bibles_tab.layout_style == 1: if self.parent.settings_tab.layout_style == 1:
text = text + u'\n\n' text = text + u'\n\n'
if self.parent.bibles_tab.display_style == 1: if self.parent.settings_tab.display_style == 1:
loc = self.formatVerse(old_chapter, chapter, verse, u'(u', u')') loc = self.formatVerse(old_chapter, chapter, verse, u'(u', u')')
elif self.parent.bibles_tab.display_style == 2: elif self.parent.settings_tab.display_style == 2:
loc = self.formatVerse(old_chapter, chapter, verse, u'{', u'}') loc = self.formatVerse(old_chapter, chapter, verse, u'{', u'}')
elif self.parent.bibles_tab.display_style == 3: elif self.parent.settings_tab.display_style == 3:
loc = self.formatVerse(old_chapter, chapter, verse, u'[', u']') loc = self.formatVerse(old_chapter, chapter, verse, u'[', u']')
else: else:
loc = self.formatVerse(old_chapter, chapter, verse, u'', u'') loc = self.formatVerse(old_chapter, chapter, verse, u'', u'')
old_chapter = chapter old_chapter = chapter
bible_text = bible_text + u' '+ loc + u' '+ text bible_text = bible_text + u' '+ loc + u' '+ text
#if we are verse per slide then create slide #if we are verse per slide then create slide
if self.parent.bibles_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''
service_item.title = book + u' ' + loc service_item.title = book + u' ' + loc
@ -368,12 +368,12 @@ class BibleMediaItem(MediaManagerItem):
raw_footer.index(footer) raw_footer.index(footer)
except: except:
raw_footer.append(footer) raw_footer.append(footer)
if len(self.parent.bibles_tab.bible_theme) == 0: if len(self.parent.settings_tab.bible_theme) == 0:
service_item.theme = None service_item.theme = None
else: else:
service_item.theme = self.parent.bibles_tab.bible_theme service_item.theme = self.parent.settings_tab.bible_theme
#if we are verse per slide we have already been added #if we are verse per slide we have already been added
if self.parent.bibles_tab.layout_style != 0: if self.parent.settings_tab.layout_style != 0:
raw_slides.append(bible_text) raw_slides.append(bible_text)
for slide in raw_slides: for slide in raw_slides:
service_item.add_from_text(slide[:30], slide) service_item.add_from_text(slide[:30], slide)
@ -384,7 +384,7 @@ class BibleMediaItem(MediaManagerItem):
loc = opening loc = opening
if old_chapter != chapter: if old_chapter != chapter:
loc += chapter + u':' loc += chapter + u':'
elif not self.parent.bibles_tab.show_new_chapters: elif not self.parent.settings_tab.show_new_chapters:
loc += chapter + u':' loc += chapter + u':'
loc += verse loc += verse
loc += closing loc += closing

2
openlp/plugins/songs/songsplugin.py
View File

@ -51,7 +51,7 @@ class SongsPlugin(Plugin):
# Call the parent constructor # Call the parent constructor
Plugin.__init__(self, u'Songs', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Songs', u'1.9.0', plugin_helpers)
self.weight = -10 self.weight = -10
self.songmanager = None self.songmanager = SongManager(self.config)
self.openlp_import_form = OpenLPImportForm() self.openlp_import_form = OpenLPImportForm()
self.opensong_import_form = OpenSongImportForm() self.opensong_import_form = OpenSongImportForm()
self.openlp_export_form = OpenLPExportForm() self.openlp_export_form = OpenLPExportForm()