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

tweaks and cleanups

Browse Source
This commit is contained in:
Andreas Preikschat 2010-08-04 10:02:52 +02:00
parent 444a219a20
commit e6f0fde98d
1 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,6 +463,9 @@ class BibleMediaItem(MediaManagerItem):
self.displayResults(bible, bible2) self.displayResults(bible, bible2)
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):
'''
Generates and formats the slides for the service item.
'''
log.debug(u'generating slide data') log.debug(u'generating slide data')
items = self.listView.selectedIndexes() items = self.listView.selectedIndexes()
if len(items) == 0: if len(items) == 0:
@ -480,14 +483,14 @@ class BibleMediaItem(MediaManagerItem):
reference = bitem.data(QtCore.Qt.UserRole) reference = bitem.data(QtCore.Qt.UserRole)
if isinstance(reference, QtCore.QVariant): if isinstance(reference, QtCore.QVariant):
reference = reference.toPyObject() reference = reference.toPyObject()
#bible = self._decodeQtObject(reference, 'bible')
book = self._decodeQtObject(reference, 'book') book = self._decodeQtObject(reference, 'book')
chapter = self._decodeQtObject(reference, 'chapter') chapter = self._decodeQtObject(reference, 'chapter')
verse = self._decodeQtObject(reference, 'verse') verse = self._decodeQtObject(reference, 'verse')
text = self._decodeQtObject(reference, 'text') #bible = self._decodeQtObject(reference, 'bible')
version = self._decodeQtObject(reference, 'version') version = self._decodeQtObject(reference, 'version')
copyright = self._decodeQtObject(reference, 'copyright') copyright = self._decodeQtObject(reference, 'copyright')
#permission = self._decodeQtObject(reference, 'permission') #permission = self._decodeQtObject(reference, 'permission')
text = self._decodeQtObject(reference, 'text')
bible2 = self._decodeQtObject(reference, 'bible2') bible2 = self._decodeQtObject(reference, 'bible2')
if bible2: if bible2:
bible2_version = self._decodeQtObject(reference, bible2_version = self._decodeQtObject(reference,
@ -496,7 +499,7 @@ class BibleMediaItem(MediaManagerItem):
'bible2_copyright') 'bible2_copyright')
#bible2_permission = self._decodeQtObject(reference, #bible2_permission = self._decodeQtObject(reference,
# 'bible2_permission') # 'bible2_permission')
text2 = self._decodeQtObject(reference, 'text2') bible2_text = self._decodeQtObject(reference, 'bible2_text')
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')')
@ -521,7 +524,7 @@ class BibleMediaItem(MediaManagerItem):
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' % (verse_text, text, bible_text = u'%s %s \n\n %s %s' % (verse_text, text,
verse_text, text2) verse_text, bible2_text)
raw_slides.append(bible_text) raw_slides.append(bible_text)
bible_text = u'' bible_text = u''
else: else:
@ -533,14 +536,16 @@ class BibleMediaItem(MediaManagerItem):
if self.parent.settings_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''
# if we are verse per slide we have already been added
if self.parent.settings_tab.layout_style != 0 and not bible2:
raw_slides.append(bible_text)
# service item title # service item title
if not service_item.title: if not service_item.title:
if bible2: if bible2:
service_item.title = u'%s (%s, %s) %s' % (book, version, service_item.title = u'%s (%s, %s) %s' % (book, version,
bible2_version, verse_text) bible2_version, verse_text)
else: else:
service_item.title = u'%s (%s) %s' % (book, version, service_item.title = u'%s (%s) %s' % (book, version, verse_text)
verse_text)
elif service_item.title.find(translate('BiblesPlugin.MediaItem', elif service_item.title.find(translate('BiblesPlugin.MediaItem',
'etc')) == -1: 'etc')) == -1:
service_item.title = u'%s, %s' % (service_item.title, service_item.title = u'%s, %s' % (service_item.title,
@ -550,14 +555,11 @@ class BibleMediaItem(MediaManagerItem):
service_item.theme = None service_item.theme = None
else: else:
service_item.theme = self.parent.settings_tab.bible_theme service_item.theme = self.parent.settings_tab.bible_theme
# if we are verse per slide we have already been added
if self.parent.settings_tab.layout_style != 0 and not bible2:
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)
if service_item.raw_footer: if service_item.raw_footer:
for foot in raw_footer: for footer in raw_footer:
service_item.raw_footer.append(foot) service_item.raw_footer.append(footer)
else: else:
service_item.raw_footer = raw_footer service_item.raw_footer = raw_footer
return True return True
@ -589,8 +591,8 @@ class BibleMediaItem(MediaManagerItem):
row, QtCore.QVariant(book[u'chapters'])) row, QtCore.QVariant(book[u'chapters']))
if first: if first:
first = False first = False
self.initialiseChapterVerse( self.initialiseChapterVerse(bible, book[u'name'],
bible, book[u'name'], book[u'chapters']) book[u'chapters'])
def initialiseChapterVerse(self, bible, book, chapters): def initialiseChapterVerse(self, bible, book, chapters):
log.debug(u'initialiseChapterVerse %s, %s', bible, book) log.debug(u'initialiseChapterVerse %s, %s', bible, book)
@ -598,8 +600,8 @@ class BibleMediaItem(MediaManagerItem):
self.verses = self.parent.manager.get_verse_count(bible, book, 1) self.verses = self.parent.manager.get_verse_count(bible, book, 1)
if self.verses == 0: if self.verses == 0:
self.AdvancedSearchButton.setEnabled(False) self.AdvancedSearchButton.setEnabled(False)
self.AdvancedMessage.setText( self.AdvancedMessage.setText(translate('BiblesPlugin.MediaItem',
translate('BiblesPlugin.MediaItem', 'Bible not fully loaded.')) 'Bible not fully loaded.'))
else: else:
self.AdvancedSearchButton.setEnabled(True) self.AdvancedSearchButton.setEnabled(True)
self.AdvancedMessage.setText(u'') self.AdvancedMessage.setText(u'')
@ -615,6 +617,10 @@ class BibleMediaItem(MediaManagerItem):
combo.addItem(unicode(i)) combo.addItem(unicode(i))
def displayResults(self, bible, bible2=None): def displayResults(self, bible, bible2=None):
'''
Displays the search results in the media manager. All data needed for further
action is saved for/in each row.
'''
version = self.parent.manager.get_meta_data(bible, u'Version') version = self.parent.manager.get_meta_data(bible, u'Version')
copyright = self.parent.manager.get_meta_data(bible, u'Copyright') copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
permission = self.parent.manager.get_meta_data(bible, u'Permissions') permission = self.parent.manager.get_meta_data(bible, u'Permissions')
@ -634,36 +640,38 @@ class BibleMediaItem(MediaManagerItem):
for count, verse in enumerate(self.search_results): for count, verse in enumerate(self.search_results):
if bible2: if bible2:
vdict = { vdict = {
'bible': QtCore.QVariant(bible), 'book':QtCore.QVariant(verse.book.name),
'version': QtCore.QVariant(version.value), 'chapter':QtCore.QVariant(verse.chapter),
'copyright': QtCore.QVariant(copyright.value), 'verse':QtCore.QVariant(verse.verse),
#'permission': QtCore.QVariant(permission.value), #'bible':QtCore.QVariant(bible),
'bible2': QtCore.QVariant(bible2), 'version':QtCore.QVariant(version.value),
'bible2_version': QtCore.QVariant(bible2_version.value), 'copyright':QtCore.QVariant(copyright.value),
'bible2_copyright': QtCore.QVariant(bible2_copyright.value), #'permission':QtCore.QVariant(permission.value),
#'bible2_permission': QtCore.QVariant(bible2_permission), 'text':QtCore.QVariant(verse.text),
'book': QtCore.QVariant(verse.book.name), 'bible2':QtCore.QVariant(bible2),
'chapter': QtCore.QVariant(verse.chapter), 'bible2_version':QtCore.QVariant(bible2_version.value),
'verse': QtCore.QVariant(verse.verse), 'bible2_copyright':QtCore.QVariant(bible2_copyright.value),
'text': QtCore.QVariant(verse.text), #'bible2_permission':QtCore.QVariant(bible2_permission),
'text2': QtCore.QVariant(self.search_results2[count].text) 'bible2_text':QtCore.QVariant(
self.search_results2[count].text)
} }
bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name, bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name,
verse.chapter, verse.verse, version.value, bible2_version.value) verse.chapter, verse.verse, version.value, bible2_version.value)
else: else:
vdict = { vdict = {
'bible': QtCore.QVariant(bible),
'version': QtCore.QVariant(version.value),
'copyright': QtCore.QVariant(copyright.value),
#'permission': QtCore.QVariant(permission.value),
'bible2': QtCore.QVariant(bible2),
'book': QtCore.QVariant(verse.book.name), 'book': QtCore.QVariant(verse.book.name),
'chapter': QtCore.QVariant(verse.chapter), 'chapter': QtCore.QVariant(verse.chapter),
'verse': QtCore.QVariant(verse.verse), 'verse': QtCore.QVariant(verse.verse),
'text': QtCore.QVariant(verse.text) #'bible': QtCore.QVariant(bible),
'version': QtCore.QVariant(version.value),
'copyright': QtCore.QVariant(copyright.value),
#'permission': QtCore.QVariant(permission.value),
'text': QtCore.QVariant(verse.text),
'bible2': QtCore.QVariant(bible2)
} }
bible_text = u' %s %d:%d (%s)' % (verse.book.name, bible_text = u' %s %d:%d (%s)' % (verse.book.name,
verse.chapter, verse.verse, version.value) verse.chapter, verse.verse, version.value)
# set the row title
bible_verse = QtGui.QListWidgetItem(bible_text) bible_verse = QtGui.QListWidgetItem(bible_text)
#bible_verse.setData(QtCore.Qt.UserRole, #bible_verse.setData(QtCore.Qt.UserRole,
# QtCore.QVariant(bible_text)) # QtCore.QVariant(bible_text))
@ -672,3 +680,5 @@ class BibleMediaItem(MediaManagerItem):
row = self.listView.setCurrentRow(count + start_count) row = self.listView.setCurrentRow(count + start_count)
if row: if row:
row.setSelected(True) row.setSelected(True)
self.search_results = {}
self.search_results2 = {}