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

Fixed multi-verse dual bible.

Browse Source
This commit is contained in:
Raoul Snyman 2010-02-06 15:05:45 +02:00
parent cf95b81a49
commit 92ef1f0d57
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ class BibleMediaItem(MediaManagerItem):
self.IconPath = u'songs/song' self.IconPath = u'songs/song'
self.ListViewWithDnD_class = BibleListView self.ListViewWithDnD_class = BibleListView
self.servicePath = None self.servicePath = None
self.lastReference = u'' self.lastReference = []
MediaManagerItem.__init__(self, parent, icon, title) MediaManagerItem.__init__(self, parent, icon, title)
# place to store the search results # place to store the search results
self.search_results = {} self.search_results = {}
@ -400,9 +400,10 @@ class BibleMediaItem(MediaManagerItem):
versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, \ versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, \
chapter_to, verse_to) chapter_to, verse_to)
self.search_results = self.parent.manager.get_verses(bible, versetext) self.search_results = self.parent.manager.get_verses(bible, versetext)
self.lastReference = versetext
if self.ClearAdvancedSearchComboBox.currentIndex() == 0: if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
self.ListView.clear() self.ListView.clear()
self.lastReference = []
self.lastReference.append(versetext)
self.displayResults(bible) self.displayResults(bible)
def onAdvancedFromChapter(self): def onAdvancedFromChapter(self):
@ -421,8 +422,9 @@ class BibleMediaItem(MediaManagerItem):
text = unicode(self.QuickSearchEdit.displayText()) text = unicode(self.QuickSearchEdit.displayText())
if self.ClearQuickSearchComboBox.currentIndex() == 0: if self.ClearQuickSearchComboBox.currentIndex() == 0:
self.ListView.clear() self.ListView.clear()
self.lastReference = []
self.lastReference.append(versetext)
self.search_results = self.parent.manager.get_verses(bible, text) self.search_results = self.parent.manager.get_verses(bible, text)
self.lastReference = text
if self.search_results: if self.search_results:
self.displayResults(bible) self.displayResults(bible)
@ -442,8 +444,9 @@ class BibleMediaItem(MediaManagerItem):
else: else:
bible2 = unicode(self.AdvancedSecondBibleComboBox.currentText()) bible2 = unicode(self.AdvancedSecondBibleComboBox.currentText())
if bible2: if bible2:
self.searchByReference(bible2, self.lastReference) bible2_verses = []
bible2_verses = self.search_results for scripture in self.lastReference:
bible2_verses.extend(self.parent.manager.get_verses(bible2, scripture))
bible2_version = self.parent.manager.get_meta_data(bible2, u'Version') bible2_version = self.parent.manager.get_meta_data(bible2, u'Version')
bible2_copyright = self.parent.manager.get_meta_data(bible2, u'Copyright') 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'Permission')
@ -477,7 +480,7 @@ class BibleMediaItem(MediaManagerItem):
#If not found throws and error so add.s #If not found throws and error so add.s
if footer not in raw_footer: if footer not in raw_footer:
raw_footer.append(footer) raw_footer.append(footer)
bible_text = u'%s %s \n\n %s %s)' % \ bible_text = u'%s %s \n\n %s %s' % \
(verse_text, text, verse_text, bible2_verses[item.row()].text) (verse_text, text, verse_text, bible2_verses[item.row()].text)
raw_slides.append(bible_text) raw_slides.append(bible_text)
bible_text = u'' bible_text = u''