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

fixed second bible when using Keep to create multiple bible verses in one service item

Browse Source
This commit is contained in:
Andreas Preikschat 2010-08-03 12:46:12 +02:00
parent 778388b2ae
commit 569377e7d0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,20 +466,14 @@ class BibleMediaItem(MediaManagerItem):
items = self.listView.selectedIndexes() items = self.listView.selectedIndexes()
if len(items) == 0: if len(items) == 0:
return False return False
old_chapter = u''
raw_slides = []
raw_footer = []
bible_text = u'' bible_text = u''
old_chapter = u''
raw_footer = []
raw_slides = []
bible2_verses = []
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.add_capability(ItemCapabilities.AllowsAdditions) service_item.add_capability(ItemCapabilities.AllowsAdditions)
# If we want to use a 2nd translation / version.
if bible2:
bible2_verses = []
for scripture in self.lastReference:
bible2_verses.extend(self.parent.manager.get_verses(bible2,
scripture))
# Let's loop through the main lot, and assemble our verses.
for item in items: for item in items:
bitem = self.listView.item(item.row()) bitem = self.listView.item(item.row())
reference = bitem.data(QtCore.Qt.UserRole) reference = bitem.data(QtCore.Qt.UserRole)
@ -501,6 +495,11 @@ class BibleMediaItem(MediaManagerItem):
'bible2_copyright') 'bible2_copyright')
#bible2_permission = self._decodeQtObject(reference, #bible2_permission = self._decodeQtObject(reference,
# 'bible2_permission') # 'bible2_permission')
for scripture in self.lastReference:
bible2_verses.extend(self.parent.manager.get_verses(bible2,
scripture))
log.debug(u'aaaaaaaaa')
log.debug(bible2_verses)
if self.parent.settings_tab.display_style == 1: if self.parent.settings_tab.display_style == 1:
verse_text = self.formatVerse(old_chapter, chapter, verse, verse_text = self.formatVerse(old_chapter, chapter, verse,
u'(', u')') u'(', u')')
@ -631,6 +630,8 @@ class BibleMediaItem(MediaManagerItem):
bible2_permission = bible2_permission.value bible2_permission = bible2_permission.value
else: else:
bible2_permission = u'' bible2_permission = u''
# We count the number of rows which are maybe already present.
start_count = self.listView.count()
for count, verse in enumerate(self.search_results): for count, verse in enumerate(self.search_results):
if bible2: if bible2:
vdict = { vdict = {
@ -668,6 +669,6 @@ class BibleMediaItem(MediaManagerItem):
# QtCore.QVariant(bible_text)) # QtCore.QVariant(bible_text))
bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict)) bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict))
self.listView.addItem(bible_verse) self.listView.addItem(bible_verse)
row = self.listView.setCurrentRow(count) row = self.listView.setCurrentRow(count + start_count)
if row: if row:
row.setSelected(True) row.setSelected(True)