openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #03094
[Merge] lp:~googol-hush/openlp/fixes into lp:openlp
googol has proposed merging lp:~googol-hush/openlp/fixes into lp:openlp.
Requested reviews:
Tim Bentley (trb143)
I improved generateSlideData, moved some stuff, fixed some other things.
--
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/34013
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2010-08-28 23:52:10 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2010-08-29 13:00:58 +0000
@@ -47,7 +47,6 @@
self.parent().onListViewResize(event.size().width(),
event.size().width())
-
class BibleMediaItem(MediaManagerItem):
"""
This is the custom media manager item for Bibles.
@@ -61,8 +60,7 @@
self.ListViewWithDnD_class = BibleListView
MediaManagerItem.__init__(self, parent, icon, title)
# place to store the search results for both bibles
- self.search_results = {}
- self.dual_search_results = {}
+ self.search_results, self.dual_search_results = {}, {}
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'bibles_load_list'), self.reloadBibles)
@@ -408,13 +406,13 @@
self.reloadBibles()
def onAdvancedFromVerse(self):
- frm = self.AdvancedFromVerse.currentText()
- self.adjustComboBox(frm, self.verses, self.AdvancedToVerse)
+ from_ = self.AdvancedFromVerse.currentText()
+ self.adjustComboBox(from_, self.verses, self.AdvancedToVerse)
def onAdvancedToChapter(self):
- frm = unicode(self.AdvancedFromChapter.currentText())
+ from_ = unicode(self.AdvancedFromChapter.currentText())
to = unicode(self.AdvancedToChapter.currentText())
- if frm != to:
+ if from_ != to:
bible = unicode(self.AdvancedVersionComboBox.currentText())
book = unicode(self.AdvancedBookComboBox.currentText())
# get the verse count for new chapter
@@ -465,20 +463,32 @@
self.displayResults(bible, dual_bible)
def generateSlideData(self, service_item, item=None):
+<<<<<<< TREE
"""
Generates and formats the slides for the service item.
"""
+=======
+ """
+ Generates and formats the slides for the service item as well as the
+ service item's title.
+ """
+>>>>>>> MERGE-SOURCE
log.debug(u'generating slide data')
items = self.listView.selectedIndexes()
if len(items) == 0:
return False
- bible_text = u''
- old_chapter = u''
- raw_footer = []
- raw_slides = []
- service_item.add_capability(ItemCapabilities.AllowsPreview)
- service_item.add_capability(ItemCapabilities.AllowsLoop)
- service_item.add_capability(ItemCapabilities.AllowsAdditions)
+ has_dual_bible = False
+ bible_text, old_chapter = u'', u''
+ raw_footer, raw_slides = [], []
+ for item in items:
+ bitem = self.listView.item(item.row())
+ reference = bitem.data(QtCore.Qt.UserRole)
+ if isinstance(reference, QtCore.QVariant):
+ reference = reference.toPyObject()
+ dual_bible = self._decodeQtObject(reference, 'dual_bible')
+ if dual_bible:
+ has_dual_bible = True
+ break
# Let's loop through the main lot, and assemble our verses.
for item in items:
bitem = self.listView.item(item.row())
@@ -502,49 +512,29 @@
#dual_permission = self._decodeQtObject(reference,
# 'dual_permission')
dual_text = self._decodeQtObject(reference, 'dual_text')
- if self.parent.settings_tab.display_style == 1:
- verse_text = self.formatVerse(old_chapter, chapter, verse,
- u'{su}(', u'){/su}')
- elif self.parent.settings_tab.display_style == 2:
- verse_text = self.formatVerse(old_chapter, chapter, verse,
- u'{su}{', u'}{/su}')
- elif self.parent.settings_tab.display_style == 3:
- verse_text = self.formatVerse(old_chapter, chapter, verse,
- u'{su}[', u']{/su}')
- else:
- verse_text = self.formatVerse(old_chapter, chapter, verse,
- u'{su}', u'{/su}')
- old_chapter = chapter
+ verse_text = self.formatVerse(old_chapter, chapter, verse)
footer = u'%s (%s %s)' % (book, version, copyright)
- # If not found add to footer
if footer not in raw_footer:
raw_footer.append(footer)
if dual_bible:
- footer = u'%s (%s %s)' % (book, dual_version,
- dual_copyright)
- # If not found add second version and copyright to footer.
+ footer = u'%s (%s %s)' % (book, dual_version, dual_copyright)
if footer not in raw_footer:
raw_footer.append(footer)
- bible_text = u'%s %s \n\n %s %s' % (verse_text, text,
+ # If there is an old bible_text we have to add it.
+ if bible_text:
+ raw_slides.append(bible_text)
+ bible_text = u''
+ bible_text = u'%s %s\n\n%s %s' % (verse_text, text,
verse_text, dual_text)
raw_slides.append(bible_text)
bible_text = u''
- else:
- # If we are 'Verse Per Line' then force a new line.
- if self.parent.settings_tab.layout_style == 1:
- text = text + u'\n'
- else:
- # split the line but do not replace line breaks in renderer
- service_item.add_capability(ItemCapabilities.NoLineBreaks)
- text = text + u'\n'
- bible_text = u'%s %s %s' % (bible_text, verse_text, text)
- # If we are 'Verse Per Slide' then create a new slide.
+ elif has_dual_bible:
if self.parent.settings_tab.layout_style == 0:
+ bible_text = u'%s %s' % (verse_text, text)
raw_slides.append(bible_text)
bible_text = u''
- # If we are not 'Verse Per Slide' we have to make sure, that we
- # add more verses.
else:
+<<<<<<< TREE
if item.row() < len(items) - 1:
bitem = items[item.row() + 1]
reference = bitem.data(QtCore.Qt.UserRole)
@@ -563,6 +553,33 @@
raw_slides.append(bible_text)
bible_text = u''
# service item title
+=======
+ bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+ # If we are 'Verse Per Slide' then create a new slide.
+ elif self.parent.settings_tab.layout_style == 0:
+ bible_text = u'%s %s' % (verse_text, text)
+ raw_slides.append(bible_text)
+ bible_text = u''
+ # If we are 'Verse Per Line' then force a new line.
+ elif self.parent.settings_tab.layout_style == 1:
+ bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+ # We have to be 'Continuous'.
+ else:
+ bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+ old_chapter = chapter
+ # If there are no more items we check whether we have to add bible_text.
+ if bible_text:
+ raw_slides.append(bible_text)
+ bible_text = u''
+ # Service Item: Capabilities
+ if self.parent.settings_tab.layout_style == 2 and not has_dual_bible:
+ # split the line but do not replace line breaks in renderer
+ service_item.add_capability(ItemCapabilities.NoLineBreaks)
+ service_item.add_capability(ItemCapabilities.AllowsPreview)
+ service_item.add_capability(ItemCapabilities.AllowsLoop)
+ service_item.add_capability(ItemCapabilities.AllowsAdditions)
+ # Service Item: Title
+>>>>>>> MERGE-SOURCE
if not service_item.title:
if dual_bible:
service_item.title = u'%s (%s, %s) %s' % (book, version,
@@ -573,7 +590,7 @@
translate('BiblesPlugin.MediaItem', 'etc')) == -1:
service_item.title = u'%s, %s' % (service_item.title,
translate('BiblesPlugin.MediaItem', 'etc'))
- # item theme
+ # Service Item: Theme
if len(self.parent.settings_tab.bible_theme) == 0:
service_item.theme = None
else:
@@ -587,14 +604,20 @@
service_item.raw_footer = raw_footer
return True
- def formatVerse(self, old_chapter, chapter, verse, opening, closing):
- verse_text = opening
- if old_chapter != chapter:
- verse_text += chapter + u':'
- elif not self.parent.settings_tab.show_new_chapters:
- verse_text += chapter + u':'
- verse_text += verse
- verse_text += closing
+ def formatVerse(self, old_chapter, chapter, verse):
+ if not self.parent.settings_tab.show_new_chapters or \
+ old_chapter != chapter:
+ verse_text = chapter + u':' + verse
+ else:
+ verse_text = verse
+ if self.parent.settings_tab.display_style == 1:
+ verse_text = u'{su}(' + verse_text + u'){/su}'
+ elif self.parent.settings_tab.display_style == 2:
+ verse_text = u'{su}{' + verse_text + u'}{/su}'
+ elif self.parent.settings_tab.display_style == 3:
+ verse_text = u'{su}[' + verse_text + u']{/su}'
+ else:
+ verse_text = u'{su}' + verse_text + u'{/su}'
return verse_text
def reloadBibles(self):
@@ -639,11 +662,19 @@
for i in range(int(range_from), int(range_to) + 1):
combo.addItem(unicode(i))
+<<<<<<< TREE
def displayResults(self, bible, dual_bible=None):
"""
Displays the search results in the media manager. All data needed for
further action is saved for/in each row.
"""
+=======
+ def displayResults(self, bible, dual_bible=u''):
+ """
+ Displays the search results in the media manager. All data needed for
+ further action is saved for/in each row.
+ """
+>>>>>>> MERGE-SOURCE
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'Permissions')
@@ -652,45 +683,45 @@
u'Version')
dual_copyright = self.parent.manager.get_meta_data(dual_bible,
u'Copyright')
- dual_permission = self.parent.manager.get_meta_data(dual_bible,
- u'Permissions')
- if dual_permission:
- dual_permission = dual_permission.value
- else:
- dual_permission = u''
+ #dual_permission = self.parent.manager.get_meta_data(dual_bible,
+ # u'Permissions')
+ #if dual_permission:
+ # dual_permission = dual_permission.value
+ #else:
+ # dual_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):
if dual_bible:
vdict = {
- 'book':QtCore.QVariant(verse.book.name),
- 'chapter':QtCore.QVariant(verse.chapter),
- 'verse':QtCore.QVariant(verse.verse),
- 'bible':QtCore.QVariant(bible),
- 'version':QtCore.QVariant(version.value),
- 'copyright':QtCore.QVariant(copyright.value),
- #'permission':QtCore.QVariant(permission.value),
- 'text':QtCore.QVariant(verse.text),
- 'dual_bible':QtCore.QVariant(dual_bible),
- 'dual_version':QtCore.QVariant(dual_version.value),
- 'dual_copyright':QtCore.QVariant(dual_copyright.value),
- #'dual_permission':QtCore.QVariant(dual_permission),
- 'dual_text':QtCore.QVariant(
+ 'book': QtCore.QVariant(verse.book.name),
+ 'chapter': QtCore.QVariant(verse.chapter),
+ 'verse': QtCore.QVariant(verse.verse),
+ 'bible': QtCore.QVariant(bible),
+ 'version': QtCore.QVariant(version.value),
+ 'copyright': QtCore.QVariant(copyright.value),
+ #'permission': QtCore.QVariant(permission.value),
+ 'text': QtCore.QVariant(verse.text),
+ 'dual_bible': QtCore.QVariant(dual_bible),
+ 'dual_version': QtCore.QVariant(dual_version.value),
+ 'dual_copyright': QtCore.QVariant(dual_copyright.value),
+ #'dual_permission': QtCore.QVariant(dual_permission),
+ 'dual_text': QtCore.QVariant(
self.dual_search_results[count].text)
}
bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name,
verse.chapter, verse.verse, version.value, dual_version.value)
else:
vdict = {
- 'book':QtCore.QVariant(verse.book.name),
- 'chapter':QtCore.QVariant(verse.chapter),
- 'verse':QtCore.QVariant(verse.verse),
- 'bible':QtCore.QVariant(bible),
- 'version':QtCore.QVariant(version.value),
- 'copyright':QtCore.QVariant(copyright.value),
- #'permission':QtCore.QVariant(permission.value),
- 'text':QtCore.QVariant(verse.text),
- 'dual_bible':QtCore.QVariant(dual_bible)
+ 'book': QtCore.QVariant(verse.book.name),
+ 'chapter': QtCore.QVariant(verse.chapter),
+ 'verse': QtCore.QVariant(verse.verse),
+ 'bible': QtCore.QVariant(bible),
+ 'version': QtCore.QVariant(version.value),
+ 'copyright': QtCore.QVariant(copyright.value),
+ #'permission': QtCore.QVariant(permission.value),
+ 'text': QtCore.QVariant(verse.text),
+ 'dual_bible': QtCore.QVariant(dual_bible)
}
bible_text = u' %s %d:%d (%s)' % (verse.book.name,
verse.chapter, verse.verse, version.value)
@@ -703,5 +734,4 @@
row = self.listView.setCurrentRow(count + start_count)
if row:
row.setSelected(True)
- self.search_results = {}
- self.dual_search_results = {}
+ self.search_results, self.dual_search_results = {}, {}
