From 30e867e0206580e96e518120c9e51aafb14a3813 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 15 Aug 2010 16:49:07 +0200 Subject: [PATCH 01/17] - rework - improved usage of different bibles --- openlp/plugins/bibles/lib/mediaitem.py | 102 +++++++++++++------------ 1 file changed, 54 insertions(+), 48 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 196329ca8..3afc403a3 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -501,61 +501,64 @@ class BibleMediaItem(MediaManagerItem): #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'(', u')') - elif self.parent.settings_tab.display_style == 2: - verse_text = self.formatVerse(old_chapter, chapter, verse, - u'{', u'}') - elif self.parent.settings_tab.display_style == 3: - verse_text = self.formatVerse(old_chapter, chapter, verse, - u'[', u']') - else: - verse_text = self.formatVerse(old_chapter, chapter, verse, - u'', u'') + verse_text = self.formatVerse(old_chapter, chapter, verse) old_chapter = chapter + # footer 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) + # If we were previously 'Verse Per Line' we have to add the old + # bible_text first, because it was not added till now. + 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\n' - bible_text = u'%s %s %s' % (bible_text, verse_text, text) - # If we are 'Verse Per Slide' then create a new slide. - if self.parent.settings_tab.layout_style == 0: + # 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\n' % (bible_text, verse_text, text) + # We have to be 'Continuous'. + elif item.row() < len(items) - 1: + #bitem = self.listView.item(item.row() + 1) + bitem = items[item.row() + 1] + reference = bitem.data(QtCore.Qt.UserRole) + if isinstance(reference, QtCore.QVariant): + reference = reference.toPyObject() + #todo replace 'new' by 'next' + next_bible = self._decodeQtObject(reference, 'bible') + next_dual_bible = self._decodeQtObject(reference, 'dual_bible') + next_verse = self._decodeQtObject(reference, 'verse') + next_chapter = self._decodeQtObject(reference, 'chapter') + next_book = self._decodeQtObject(reference, 'book') + # If the next verse is a dual one, then we append 'bible_text'. + if next_dual_bible: + bible_text = u'%s %s %s' % (bible_text, 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. + # We add a line break if the next verse is not part of a series + # of verses, has a different book, bible or so on. + elif bible != next_bible or book != next_book or \ + int(verse) + 1 != int(next_verse) or \ + int(chapter) != int(next_chapter): + bible_text = u'%s %s %s \n\n' % (bible_text, verse_text, + text) else: - if item.row() < len(items) - 1: - bitem = items[item.row() + 1] - reference = bitem.data(QtCore.Qt.UserRole) - if isinstance(reference, QtCore.QVariant): - reference = reference.toPyObject() - bible_new = self._decodeQtObject(reference, 'bible') - dual_bible_new = self._decodeQtObject(reference, 'dual_bible') - if dual_bible_new: - raw_slides.append(bible_text) - bible_text = u'' - elif bible != bible_new: - raw_slides.append(bible_text) - bible_text = u'' - else: - raw_slides.append(bible_text) - bible_text = u'' + bible_text = u'%s %s %s' % (bible_text, verse_text, text) + # 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 title if not service_item.title: if dual_bible: @@ -581,14 +584,17 @@ class BibleMediaItem(MediaManagerItem): 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':' + 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_text += verse - verse_text += closing + if self.parent.settings_tab.display_style == 1: + verse_text = u'(' + verse_text + u')' + elif self.parent.settings_tab.display_style == 2: + verse_text = u'{' + verse_text + u'}' + elif self.parent.settings_tab.display_style == 3: + verse_text = u'[' + verse_text + u']' return verse_text def reloadBibles(self): From 1b1261a1a454a21bcc7b3929d3f40bf1223d2181 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 15 Aug 2010 17:35:20 +0200 Subject: [PATCH 02/17] - improved usage of different bibles and/or books in one service item --- openlp/plugins/bibles/lib/mediaitem.py | 41 ++++++++++---------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 3afc403a3..51b087931 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -471,6 +471,7 @@ class BibleMediaItem(MediaManagerItem): items = self.listView.selectedIndexes() if len(items) == 0: return False + first = True bible_text = u'' old_chapter = u'' raw_footer = [] @@ -502,7 +503,6 @@ class BibleMediaItem(MediaManagerItem): # 'dual_permission') dual_text = self._decodeQtObject(reference, 'dual_text') verse_text = self.formatVerse(old_chapter, chapter, verse) - old_chapter = chapter # footer footer = u'%s (%s %s)' % (book, version, copyright) if footer not in raw_footer: @@ -512,11 +512,11 @@ class BibleMediaItem(MediaManagerItem): if footer not in raw_footer: raw_footer.append(footer) # If we were previously 'Verse Per Line' we have to add the old - # bible_text first, because it was not added till now. + # bible_text, because it was not added until now. if bible_text: raw_slides.append(bible_text) bible_text = u'' - 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, dual_text) raw_slides.append(bible_text) bible_text = u'' @@ -527,34 +527,23 @@ class BibleMediaItem(MediaManagerItem): 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\n' % (bible_text, verse_text, text) + bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text) # We have to be 'Continuous'. - elif item.row() < len(items) - 1: - #bitem = self.listView.item(item.row() + 1) - bitem = items[item.row() + 1] - reference = bitem.data(QtCore.Qt.UserRole) - if isinstance(reference, QtCore.QVariant): - reference = reference.toPyObject() - #todo replace 'new' by 'next' - next_bible = self._decodeQtObject(reference, 'bible') - next_dual_bible = self._decodeQtObject(reference, 'dual_bible') - next_verse = self._decodeQtObject(reference, 'verse') - next_chapter = self._decodeQtObject(reference, 'chapter') - next_book = self._decodeQtObject(reference, 'book') - # If the next verse is a dual one, then we append 'bible_text'. - if next_dual_bible: + else: + # We add a line break if the previously verse has a different + # book or bible version. + if first: bible_text = u'%s %s %s' % (bible_text, verse_text, text) - raw_slides.append(bible_text) - bible_text = u'' - # We add a line break if the next verse is not part of a series - # of verses, has a different book, bible or so on. - elif bible != next_bible or book != next_book or \ - int(verse) + 1 != int(next_verse) or \ - int(chapter) != int(next_chapter): - bible_text = u'%s %s %s \n\n' % (bible_text, verse_text, + elif bible != old_bible or book != old_book: + bible_text = u'%s\n\n%s %s' % (bible_text, verse_text, text) else: bible_text = u'%s %s %s' % (bible_text, verse_text, text) + if first: + first = False + old_chapter = chapter + old_book = book + old_bible = bible # If there are no more items we check whether we have to add bible_text. if bible_text: raw_slides.append(bible_text) From 5a22e673462ef70385a9787d3f8294b397ef2671 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 18 Aug 2010 17:04:16 +0200 Subject: [PATCH 04/17] clean up --- openlp/plugins/bibles/lib/mediaitem.py | 53 +++++++++++++------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 51b087931..d5996b295 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -465,7 +465,8 @@ class BibleMediaItem(MediaManagerItem): def generateSlideData(self, service_item, item=None): ''' - 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. ''' log.debug(u'generating slide data') items = self.listView.selectedIndexes() @@ -628,10 +629,10 @@ class BibleMediaItem(MediaManagerItem): for i in range(int(range_from), int(range_to) + 1): combo.addItem(unicode(i)) - def displayResults(self, bible, dual_bible=None): + 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. + 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') copyright = self.parent.manager.get_meta_data(bible, u'Copyright') @@ -652,34 +653,34 @@ class BibleMediaItem(MediaManagerItem): 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) From 14dbfaa4b50034fb5b874032a85534a5bee671f1 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 19:10:14 +0200 Subject: [PATCH 05/17] fixed stuff messed up resolvesing the conflict --- openlp/plugins/bibles/lib/mediaitem.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 7cf45c238..7f518af71 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -518,8 +518,10 @@ class BibleMediaItem(MediaManagerItem): # If we were previously 'Verse Per Line' we have to add the old # bible_text, because it was not added until now. if bible_text: - bible_text = u'%s %s \n %s %s' % (verse_text, text, - verse_text, dual_text) + raw_slides.append(bible_text) + bible_text = u'' + bible_text = u'%s %s \n %s %s' % (verse_text, text, + verse_text, dual_text) raw_slides.append(bible_text) bible_text = u'' # If we are 'Verse Per Slide' then create a new slide. From 36e2f2e33f49beb8628f39808cb024af533e85b4 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 19:32:44 +0200 Subject: [PATCH 06/17] fixed stuff messed up resolvesing the conflict --- openlp/plugins/bibles/lib/mediaitem.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 7f518af71..89baf091a 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -511,7 +511,6 @@ class BibleMediaItem(MediaManagerItem): if footer not in raw_footer: raw_footer.append(footer) if dual_bible: - service_item.add_capability(ItemCapabilities.NoLineBreaks) footer = u'%s (%s %s)' % (book, dual_version, dual_copyright) if footer not in raw_footer: raw_footer.append(footer) @@ -520,7 +519,7 @@ class BibleMediaItem(MediaManagerItem): if bible_text: raw_slides.append(bible_text) bible_text = u'' - bible_text = u'%s %s \n %s %s' % (verse_text, text, + bible_text = u'%s %s\n\n%s %s' % (verse_text, text, verse_text, dual_text) raw_slides.append(bible_text) bible_text = u'' @@ -531,16 +530,16 @@ class BibleMediaItem(MediaManagerItem): bible_text = u'' # If we are 'Verse Per Line' then force a new line. elif self.parent.settings_tab.layout_style == 1: - service_item.add_capability(ItemCapabilities.NoLineBreaks) - bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) + bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text) # We have to be 'Continuous'. else: # We add a line break if the previously verse has a different # book or bible version. if first: bible_text = u'%s %s %s' % (bible_text, verse_text, text) - elif bible != old_bible or book != old_book: + # split the line but do not replace line breaks in renderer service_item.add_capability(ItemCapabilities.NoLineBreaks) + elif bible != old_bible or book != old_book: bible_text = u'%s\n%s %s' % (bible_text, verse_text, text) else: From 521b06ee8c0b86dcfe19da9a1268a9f449532fb6 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 20:56:46 +0200 Subject: [PATCH 07/17] clean up - not working --- openlp/plugins/bibles/lib/mediaitem.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 89baf091a..42e351627 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -533,12 +533,13 @@ class BibleMediaItem(MediaManagerItem): bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text) # We have to be 'Continuous'. else: - # We add a line break if the previously verse has a different - # book or bible version. + # split the line but do not replace line breaks in renderer + service_item.add_capability(ItemCapabilities.NoLineBreaks) + #text = text + u'\n' if first: bible_text = u'%s %s %s' % (bible_text, verse_text, text) - # split the line but do not replace line breaks in renderer - service_item.add_capability(ItemCapabilities.NoLineBreaks) + # We add a line break if the previously verse has a different + # book or bible version. elif bible != old_bible or book != old_book: bible_text = u'%s\n%s %s' % (bible_text, verse_text, text) From de3659bc928aa1632475acbaf2f1f58f635e10db Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 21:17:52 +0200 Subject: [PATCH 08/17] commented everything out, which cannot work (currently) --- openlp/plugins/bibles/lib/mediaitem.py | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 42e351627..185052a49 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -473,7 +473,7 @@ class BibleMediaItem(MediaManagerItem): items = self.listView.selectedIndexes() if len(items) == 0: return False - first = True + #first = True bible_text = u'' old_chapter = u'' raw_footer = [] @@ -530,26 +530,27 @@ class BibleMediaItem(MediaManagerItem): 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\n' % (bible_text, verse_text, text) + text = text + u'\n' + bible_text = u'%s %s %s' % (bible_text, verse_text, text) # We have to be 'Continuous'. else: # split the line but do not replace line breaks in renderer service_item.add_capability(ItemCapabilities.NoLineBreaks) - #text = text + u'\n' - if first: - bible_text = u'%s %s %s' % (bible_text, verse_text, text) + bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) + #if first: + # bible_text = u'%s %s %s' % (bible_text, verse_text, text) # We add a line break if the previously verse has a different # book or bible version. - elif bible != old_bible or book != old_book: - bible_text = u'%s\n%s %s' % (bible_text, verse_text, - text) - else: - bible_text = u'%s %s %s' % (bible_text, verse_text, text) - if first: - first = False + #elif bible != old_bible or book != old_book: + # bible_text = u'%s\n%s %s' % (bible_text, verse_text, + # text) + #else: + # bible_text = u'%s %s %s' % (bible_text, verse_text, text) + #if first: + # first = False old_chapter = chapter - old_book = book - old_bible = bible + #old_book = book + #old_bible = bible # If there are no more items we check whether we have to add bible_text. if bible_text: raw_slides.append(bible_text) From 37b2b1bb9dfb30344b5483cfb265541bcd5b33f6 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 21:28:50 +0200 Subject: [PATCH 09/17] clean up --- openlp/plugins/bibles/lib/mediaitem.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 185052a49..0286b1b49 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -530,8 +530,7 @@ class BibleMediaItem(MediaManagerItem): bible_text = u'' # If we are 'Verse Per Line' then force a new line. elif self.parent.settings_tab.layout_style == 1: - text = text + u'\n' - bible_text = u'%s %s %s' % (bible_text, verse_text, text) + bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) # We have to be 'Continuous'. else: # split the line but do not replace line breaks in renderer From beaac2d923c665a44d7f972c6f7a091f8a1aa8ec Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 21:41:06 +0200 Subject: [PATCH 10/17] removed everything which cannot work --- openlp/plugins/bibles/lib/mediaitem.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 0286b1b49..af189179b 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -473,7 +473,6 @@ class BibleMediaItem(MediaManagerItem): items = self.listView.selectedIndexes() if len(items) == 0: return False - #first = True bible_text = u'' old_chapter = u'' raw_footer = [] @@ -536,20 +535,7 @@ class BibleMediaItem(MediaManagerItem): # split the line but do not replace line breaks in renderer service_item.add_capability(ItemCapabilities.NoLineBreaks) bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) - #if first: - # bible_text = u'%s %s %s' % (bible_text, verse_text, text) - # We add a line break if the previously verse has a different - # book or bible version. - #elif bible != old_bible or book != old_book: - # bible_text = u'%s\n%s %s' % (bible_text, verse_text, - # text) - #else: - # bible_text = u'%s %s %s' % (bible_text, verse_text, text) - #if first: - # first = False old_chapter = chapter - #old_book = book - #old_bible = bible # If there are no more items we check whether we have to add bible_text. if bible_text: raw_slides.append(bible_text) From 87db3e98e6ea888ca65f5bfad5609f7657e7ba62 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 29 Aug 2010 14:49:45 +0200 Subject: [PATCH 11/17] clean ups, tweaks, fixed 625997 --- openlp/plugins/bibles/lib/mediaitem.py | 65 +++++++++++++++----------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index af189179b..e0cf030de 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -47,7 +47,6 @@ class BibleListView(BaseListWithDnD): 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 @@ class BibleMediaItem(MediaManagerItem): 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 @@ class BibleMediaItem(MediaManagerItem): 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 @@ -473,13 +471,18 @@ class BibleMediaItem(MediaManagerItem): 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()) @@ -496,6 +499,7 @@ class BibleMediaItem(MediaManagerItem): text = self._decodeQtObject(reference, 'text') dual_bible = self._decodeQtObject(reference, 'dual_bible') if dual_bible: + has_dual_bible = True dual_version = self._decodeQtObject(reference, 'dual_version') dual_copyright = self._decodeQtObject(reference, @@ -504,8 +508,6 @@ class BibleMediaItem(MediaManagerItem): # 'dual_permission') dual_text = self._decodeQtObject(reference, 'dual_text') verse_text = self.formatVerse(old_chapter, chapter, verse) - # footer - old_chapter = chapter footer = u'%s (%s %s)' % (book, version, copyright) if footer not in raw_footer: raw_footer.append(footer) @@ -513,8 +515,7 @@ class BibleMediaItem(MediaManagerItem): footer = u'%s (%s %s)' % (book, dual_version, dual_copyright) if footer not in raw_footer: raw_footer.append(footer) - # If we were previously 'Verse Per Line' we have to add the old - # bible_text, because it was not added until now. + # If there is an old bible_text we have to add it. if bible_text: raw_slides.append(bible_text) bible_text = u'' @@ -522,6 +523,13 @@ class BibleMediaItem(MediaManagerItem): verse_text, dual_text) raw_slides.append(bible_text) bible_text = u'' + 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'' + else: + 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) @@ -532,15 +540,20 @@ class BibleMediaItem(MediaManagerItem): bible_text = u'%s %s %s\n' % (bible_text, verse_text, text) # We have to be 'Continuous'. else: - # split the line but do not replace line breaks in renderer - service_item.add_capability(ItemCapabilities.NoLineBreaks) 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 title + # 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 if not service_item.title: if dual_bible: service_item.title = u'%s (%s, %s) %s' % (book, version, @@ -551,7 +564,7 @@ class BibleMediaItem(MediaManagerItem): 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: @@ -568,8 +581,9 @@ class BibleMediaItem(MediaManagerItem): 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_text += verse + 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: @@ -686,5 +700,4 @@ class BibleMediaItem(MediaManagerItem): 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 = {}, {} From 9fc45065fcf3b91b1ba5d8618fda7dddf0d426b8 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 29 Aug 2010 14:58:40 +0200 Subject: [PATCH 12/17] removed unnecessary line --- openlp/plugins/bibles/lib/mediaitem.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index e0cf030de..606842e8d 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -499,7 +499,6 @@ class BibleMediaItem(MediaManagerItem): text = self._decodeQtObject(reference, 'text') dual_bible = self._decodeQtObject(reference, 'dual_bible') if dual_bible: - has_dual_bible = True dual_version = self._decodeQtObject(reference, 'dual_version') dual_copyright = self._decodeQtObject(reference, From 31aba2eadb21d043b581de3186ceecdfb233353b Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 29 Aug 2010 18:20:56 +0200 Subject: [PATCH 13/17] removed commented lines, name change --- openlp/plugins/bibles/lib/mediaitem.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 606842e8d..6e46e5608 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -406,13 +406,13 @@ class BibleMediaItem(MediaManagerItem): self.reloadBibles() def onAdvancedFromVerse(self): - from_ = self.AdvancedFromVerse.currentText() - self.adjustComboBox(from_, self.verses, self.AdvancedToVerse) + frm = self.AdvancedFromVerse.currentText() + self.adjustComboBox(frm, self.verses, self.AdvancedToVerse) def onAdvancedToChapter(self): - from_ = unicode(self.AdvancedFromChapter.currentText()) + frm = unicode(self.AdvancedFromChapter.currentText()) to = unicode(self.AdvancedToChapter.currentText()) - if from_ != to: + if frm != to: bible = unicode(self.AdvancedVersionComboBox.currentText()) book = unicode(self.AdvancedBookComboBox.currentText()) # get the verse count for new chapter @@ -495,7 +495,6 @@ class BibleMediaItem(MediaManagerItem): bible = self._decodeQtObject(reference, 'bible') version = self._decodeQtObject(reference, 'version') copyright = self._decodeQtObject(reference, 'copyright') - #permission = self._decodeQtObject(reference, 'permission') text = self._decodeQtObject(reference, 'text') dual_bible = self._decodeQtObject(reference, 'dual_bible') if dual_bible: @@ -503,8 +502,6 @@ class BibleMediaItem(MediaManagerItem): 'dual_version') dual_copyright = self._decodeQtObject(reference, 'dual_copyright') - #dual_permission = self._decodeQtObject(reference, - # 'dual_permission') dual_text = self._decodeQtObject(reference, 'dual_text') verse_text = self.formatVerse(old_chapter, chapter, verse) footer = u'%s (%s %s)' % (book, version, copyright) @@ -642,18 +639,11 @@ class BibleMediaItem(MediaManagerItem): """ 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') if dual_bible: dual_version = self.parent.manager.get_meta_data(dual_bible, 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'' # We count the number of rows which are maybe already present. start_count = self.listView.count() for count, verse in enumerate(self.search_results): @@ -665,12 +655,10 @@ class BibleMediaItem(MediaManagerItem): '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) } @@ -684,7 +672,6 @@ class BibleMediaItem(MediaManagerItem): '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) } From 60ced9e1845673fe803b2662c7c2fff1fa38eb6e Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 31 Aug 2010 20:28:21 +0200 Subject: [PATCH 14/17] moved some code --- openlp/plugins/bibles/lib/mediaitem.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 6e46e5608..00224f6e2 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -507,20 +507,21 @@ class BibleMediaItem(MediaManagerItem): footer = u'%s (%s %s)' % (book, version, copyright) if footer not in raw_footer: raw_footer.append(footer) - if dual_bible: - footer = u'%s (%s %s)' % (book, dual_version, dual_copyright) - if footer not in raw_footer: - raw_footer.append(footer) - # If there is an old bible_text we have to add it. - if bible_text: + if has_dual_bible: + if dual_bible: + footer = u'%s (%s %s)' % (book, dual_version, + dual_copyright) + if footer not in raw_footer: + raw_footer.append(footer) + # 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'' - bible_text = u'%s %s\n\n%s %s' % (verse_text, text, - verse_text, dual_text) - raw_slides.append(bible_text) - bible_text = u'' - elif has_dual_bible: - if self.parent.settings_tab.layout_style == 0: + elif self.parent.settings_tab.layout_style == 0: bible_text = u'%s %s' % (verse_text, text) raw_slides.append(bible_text) bible_text = u'' From 80851ddfc44df5dabf54b62b4b9041194359ccd2 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Sep 2010 19:27:38 +0200 Subject: [PATCH 15/17] added permission, changed formattig --- openlp/plugins/bibles/lib/mediaitem.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 00224f6e2..37192da07 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -60,7 +60,8 @@ class BibleMediaItem(MediaManagerItem): 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) @@ -472,8 +473,10 @@ class BibleMediaItem(MediaManagerItem): if len(items) == 0: return False has_dual_bible = False - bible_text, old_chapter = u'', u'' - raw_footer, raw_slides = [], [] + bible_text = u'' + old_chapter = u'' + raw_footer = [] + raw_slides = [] for item in items: bitem = self.listView.item(item.row()) reference = bitem.data(QtCore.Qt.UserRole) @@ -495,6 +498,7 @@ class BibleMediaItem(MediaManagerItem): bible = self._decodeQtObject(reference, 'bible') version = self._decodeQtObject(reference, 'version') copyright = self._decodeQtObject(reference, 'copyright') + permission = self._decodeQtObject(reference, 'permission') text = self._decodeQtObject(reference, 'text') dual_bible = self._decodeQtObject(reference, 'dual_bible') if dual_bible: @@ -502,6 +506,8 @@ class BibleMediaItem(MediaManagerItem): 'dual_version') dual_copyright = self._decodeQtObject(reference, 'dual_copyright') + dual_permission = self._decodeQtObject(reference, + 'dual_permission') dual_text = self._decodeQtObject(reference, 'dual_text') verse_text = self.formatVerse(old_chapter, chapter, verse) footer = u'%s (%s %s)' % (book, version, copyright) @@ -640,11 +646,16 @@ class BibleMediaItem(MediaManagerItem): """ 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') if dual_bible: dual_version = self.parent.manager.get_meta_data(dual_bible, 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 not dual_permission: + 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): @@ -656,10 +667,12 @@ class BibleMediaItem(MediaManagerItem): '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.value), 'dual_text': QtCore.QVariant( self.dual_search_results[count].text) } @@ -673,6 +686,7 @@ class BibleMediaItem(MediaManagerItem): '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) } @@ -687,4 +701,5 @@ class BibleMediaItem(MediaManagerItem): 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 = {} From b21e164fd3055c08f0e828a2012d0c251e73012a Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Sep 2010 19:54:10 +0200 Subject: [PATCH 16/17] added permission to footer --- openlp/plugins/bibles/lib/mediaitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 37192da07..8ac5641b1 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -510,13 +510,13 @@ class BibleMediaItem(MediaManagerItem): 'dual_permission') dual_text = self._decodeQtObject(reference, 'dual_text') verse_text = self.formatVerse(old_chapter, chapter, verse) - footer = u'%s (%s %s)' % (book, version, copyright) + footer = u'%s (%s %s)' % (book, version, copyright, permission) if footer not in raw_footer: raw_footer.append(footer) if has_dual_bible: if dual_bible: footer = u'%s (%s %s)' % (book, dual_version, - dual_copyright) + dual_copyright, dual_permission) if footer not in raw_footer: raw_footer.append(footer) # If there is an old bible_text we have to add it. From cadfefe6160a868e63bb142f23165065a34f05e5 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Sep 2010 21:22:55 +0200 Subject: [PATCH 17/17] opps.. forgot the %s --- openlp/plugins/bibles/lib/mediaitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 8ac5641b1..e7850c65c 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -510,12 +510,12 @@ class BibleMediaItem(MediaManagerItem): 'dual_permission') dual_text = self._decodeQtObject(reference, 'dual_text') verse_text = self.formatVerse(old_chapter, chapter, verse) - footer = u'%s (%s %s)' % (book, version, copyright, permission) + footer = u'%s (%s %s %s)' % (book, version, copyright, permission) if footer not in raw_footer: raw_footer.append(footer) if has_dual_bible: if dual_bible: - footer = u'%s (%s %s)' % (book, dual_version, + footer = u'%s (%s %s %s)' % (book, dual_version, dual_copyright, dual_permission) if footer not in raw_footer: raw_footer.append(footer)