forked from openlp/openlp
- footer now displays both bible versions/copyright information (dual bible view)
- small fix
This commit is contained in:
parent
3678ea5ea2
commit
dfd53e5628
@ -463,7 +463,19 @@ class BibleMediaItem(MediaManagerItem):
|
||||
bible2_verses.extend(self.parent.manager.get_verses(bible2, scripture))
|
||||
bible2_version = self.parent.manager.get_meta_data(bible2, u'Version')
|
||||
bible2_copyright = self.parent.manager.get_meta_data(bible2, u'Copyright')
|
||||
bible2_permission = self.parent.manager.get_meta_data(bible2, u'Permission')
|
||||
bible2_permission = self.parent.manager.get_meta_data(bible2, u'Permissions')
|
||||
if bible2_version:
|
||||
bible2_version = bible2_version.value
|
||||
else:
|
||||
bible2_version = u''
|
||||
if bible2_copyright:
|
||||
bible2_copyright = bible2_copyright.value
|
||||
else:
|
||||
bible2_copyright = u''
|
||||
if bible2_permission:
|
||||
bible2_permission = bible2_permission.value
|
||||
else:
|
||||
bible2_permission = u''
|
||||
# Let's loop through the main lot, and assemble our verses
|
||||
for item in items:
|
||||
bitem = self.ListView.item(item.row())
|
||||
@ -487,13 +499,17 @@ class BibleMediaItem(MediaManagerItem):
|
||||
else:
|
||||
verse_text = self.formatVerse(old_chapter, chapter, verse, u'', u'')
|
||||
old_chapter = chapter
|
||||
footer = u'%s (%s %s)' % (book, version, copyright)
|
||||
#If not found add to footer
|
||||
footer = u'%s' % (book)
|
||||
#If not found add book to footer
|
||||
if footer not in raw_footer:
|
||||
raw_footer.append(footer)
|
||||
footer = u'%s %s' % (version, copyright)
|
||||
#If not found add version and copyright to footer
|
||||
if footer not in raw_footer:
|
||||
raw_footer.append(footer)
|
||||
if bible2:
|
||||
footer = u'%s (%s %s)' % (book, version, copyright)
|
||||
#If not found add to footer
|
||||
footer = u'%s %s' % (bible2_version, bible2_copyright)
|
||||
#If not found add second version and copyright to footer
|
||||
if footer not in raw_footer:
|
||||
raw_footer.append(footer)
|
||||
bible_text = u'%s %s \n\n %s %s' % \
|
||||
@ -580,7 +596,7 @@ class BibleMediaItem(MediaManagerItem):
|
||||
def displayResults(self, bible):
|
||||
version = self.parent.manager.get_meta_data(bible, u'Version')
|
||||
copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
|
||||
permission = self.parent.manager.get_meta_data(bible, u'Permission')
|
||||
permission = self.parent.manager.get_meta_data(bible, u'Permissions')
|
||||
if not permission:
|
||||
permission = u''
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user