From 06752ffa66b159507f17f182b7e6b7b9a50095af Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 2 Aug 2010 21:11:05 +0200 Subject: [PATCH 01/15] show both bible versions in the title --- openlp/plugins/bibles/lib/mediaitem.py | 125 ++++++++++++++----------- 1 file changed, 71 insertions(+), 54 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 1c5243af4..90fc6320a 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -290,40 +290,40 @@ class BibleMediaItem(MediaManagerItem): def retranslateUi(self): log.debug(u'retranslateUi') - self.QuickVersionLabel.setText( - translate('BiblesPlugin.MediaItem', 'Version:')) - self.QuickSecondVersionLabel.setText( - translate('BiblesPlugin.MediaItem', 'Dual:')) - self.QuickSearchLabel.setText( - translate('BiblesPlugin.MediaItem', 'Search type:')) - self.QuickSearchLabel.setText( - translate('BiblesPlugin.MediaItem', 'Find:')) - self.QuickSearchButton.setText( - translate('BiblesPlugin.MediaItem', 'Search')) - self.QuickClearLabel.setText( - translate('BiblesPlugin.MediaItem', 'Results:')) - self.AdvancedVersionLabel.setText( - translate('BiblesPlugin.MediaItem', 'Version:')) + self.QuickVersionLabel.setText(translate('BiblesPlugin.MediaItem', + 'Version:')) + self.QuickSecondVersionLabel.setText(translate('BiblesPlugin.MediaItem', + 'Dual:')) + self.QuickSearchLabel.setText(translate('BiblesPlugin.MediaItem', + 'Search type:')) + self.QuickSearchLabel.setText(translate('BiblesPlugin.MediaItem', + 'Find:')) + self.QuickSearchButton.setText(translate('BiblesPlugin.MediaItem', + 'Search')) + self.QuickClearLabel.setText(translate('BiblesPlugin.MediaItem', + 'Results:')) + self.AdvancedVersionLabel.setText(translate('BiblesPlugin.MediaItem', + 'Version:')) self.AdvancedSecondBibleLabel.setText( translate('BiblesPlugin.MediaItem', 'Dual:')) - self.AdvancedBookLabel.setText( - translate('BiblesPlugin.MediaItem', 'Book:')) - self.AdvancedChapterLabel.setText( - translate('BiblesPlugin.MediaItem', 'Chapter:')) - self.AdvancedVerseLabel.setText( - translate('BiblesPlugin.MediaItem', 'Verse:')) - self.AdvancedFromLabel.setText( - translate('BiblesPlugin.MediaItem', 'From:')) - self.AdvancedToLabel.setText( - translate('BiblesPlugin.MediaItem', 'To:')) - self.AdvancedClearLabel.setText( - translate('BiblesPlugin.MediaItem', 'Results:')) - self.AdvancedSearchButton.setText( - translate('BiblesPlugin.MediaItem', 'Search')) - self.QuickSearchComboBox.addItem( - translate('BiblesPlugin.MediaItem', 'Verse Search')) - self.QuickSearchComboBox.addItem( - translate('BiblesPlugin.MediaItem', 'Text Search')) + self.AdvancedBookLabel.setText(translate('BiblesPlugin.MediaItem', + 'Book:')) + self.AdvancedChapterLabel.setText(translate('BiblesPlugin.MediaItem', + 'Chapter:')) + self.AdvancedVerseLabel.setText(translate('BiblesPlugin.MediaItem', + 'Verse:')) + self.AdvancedFromLabel.setText(translate('BiblesPlugin.MediaItem', + 'From:')) + self.AdvancedToLabel.setText(translate('BiblesPlugin.MediaItem', + 'To:')) + self.AdvancedClearLabel.setText(translate('BiblesPlugin.MediaItem', + 'Results:')) + self.AdvancedSearchButton.setText(translate('BiblesPlugin.MediaItem', + 'Search')) + self.QuickSearchComboBox.addItem(translate('BiblesPlugin.MediaItem', + 'Verse Search')) + self.QuickSearchComboBox.addItem(translate('BiblesPlugin.MediaItem', + 'Text Search')) self.ClearQuickSearchComboBox.addItem( translate('BiblesPlugin.MediaItem', 'Clear')) self.ClearQuickSearchComboBox.addItem( @@ -344,7 +344,7 @@ class BibleMediaItem(MediaManagerItem): self.QuickMessage.setText(text) self.AdvancedMessage.setText(text) Receiver.send_message(u'openlp_process_events') - #minor delay to get the events processed + # minor delay to get the events processed time.sleep(0.1) def loadBibles(self): @@ -423,6 +423,7 @@ class BibleMediaItem(MediaManagerItem): def onAdvancedSearchButton(self): log.debug(u'Advanced Search Button pressed') bible = unicode(self.AdvancedVersionComboBox.currentText()) + bible2 = unicode(self.AdvancedSecondBibleComboBox.currentText()) book = unicode(self.AdvancedBookComboBox.currentText()) chapter_from = int(self.AdvancedFromChapter.currentText()) chapter_to = int(self.AdvancedToChapter.currentText()) @@ -435,7 +436,7 @@ class BibleMediaItem(MediaManagerItem): self.listView.clear() self.lastReference = [] self.lastReference.append(versetext) - self.displayResults(bible) + self.displayResults(bible, bible2) def onAdvancedFromChapter(self): bible = unicode(self.AdvancedVersionComboBox.currentText()) @@ -450,6 +451,7 @@ class BibleMediaItem(MediaManagerItem): def onQuickSearchButton(self): log.debug(u'Quick Search Button pressed') bible = unicode(self.QuickVersionComboBox.currentText()) + bible2 = unicode(self.QuickSecondBibleComboBox.currentText()) text = unicode(self.QuickSearchEdit.text()) if self.ClearQuickSearchComboBox.currentIndex() == 0: self.listView.clear() @@ -457,7 +459,7 @@ class BibleMediaItem(MediaManagerItem): self.lastReference.append(text) self.search_results = self.parent.manager.get_verses(bible, text) if self.search_results: - self.displayResults(bible) + self.displayResults(bible, bible2) def generateSlideData(self, service_item, item=None): log.debug(u'generating slide data') @@ -471,7 +473,7 @@ class BibleMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.AllowsPreview) service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsAdditions) - #If we want to use a 2nd translation / version + # If we want to use a 2nd translation / version. bible2 = u'' if self.SearchTabWidget.currentIndex() == 0: bible2 = unicode(self.QuickSecondBibleComboBox.currentText()) @@ -500,7 +502,7 @@ class BibleMediaItem(MediaManagerItem): bible2_permission = bible2_permission.value else: bible2_permission = u'' - # Let's loop through the main lot, and assemble our verses + # Let's loop through the main lot, and assemble our verses. for item in items: bitem = self.listView.item(item.row()) reference = bitem.data(QtCore.Qt.UserRole) @@ -528,13 +530,13 @@ class BibleMediaItem(MediaManagerItem): u'', u'') old_chapter = chapter footer = u'%s (%s %s)' % (book, version, copyright) - #If not found add to footer + # If not found add to footer if footer not in raw_footer: raw_footer.append(footer) if bible2: footer = u'%s (%s %s)' % (book, bible2_version, bible2_copyright) - #If not found add second version and copyright to footer + # If not found add second version and copyright to footer. if footer not in raw_footer: raw_footer.append(footer) bible_text = u'%s %s \n\n %s %s' % (verse_text, text, @@ -542,16 +544,21 @@ class BibleMediaItem(MediaManagerItem): raw_slides.append(bible_text) bible_text = u'' else: - #Paragraph style force new line per verse + # Paragraph style force new line per verse 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 slide + # if we are verse per slide then create slide if self.parent.settings_tab.layout_style == 0: raw_slides.append(bible_text) bible_text = u'' if not service_item.title: - service_item.title = u'%s %s' % (book, verse_text) + if bible2: + service_item.title = u'%s (%s, %s) %s' % (book, version, + bible2_version, verse_text) + else: + service_item.title = u'%s (%s) %s' % (book, version, + verse_text) elif service_item.title.find( translate('BiblesPlugin.MediaItem', 'etc')) == -1: service_item.title = u'%s, %s' % (service_item.title, @@ -560,7 +567,7 @@ class BibleMediaItem(MediaManagerItem): service_item.theme = None else: service_item.theme = self.parent.settings_tab.bible_theme - #if we are verse per slide we have already been added + # 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: @@ -624,30 +631,40 @@ class BibleMediaItem(MediaManagerItem): for i in range(int(range_from), int(range_to) + 1): combo.addItem(unicode(i)) - def displayResults(self, bible): + def displayResults(self, bible, bible2=None): 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 not permission: - permission = u'' + if bible2: + bible2_version = self.parent.manager.get_meta_data(bible2, u'Version') + if bible2_version: + bible2_version = bible2_version.value + else: + bible2_version = u'' + if version: + version = version.value else: - permission = permission.value + version = u'' for count, verse in enumerate(self.search_results): - bible_text = u' %s %d:%d (%s)' % \ - (verse.book.name, verse.chapter, verse.verse, bible) - bible_verse = QtGui.QListWidgetItem(bible_text) - #bible_verse.setData(QtCore.Qt.UserRole, - # QtCore.QVariant(bible_text)) vdict = { 'bible': QtCore.QVariant(bible), - 'version': QtCore.QVariant(version.value), + 'version': QtCore.QVariant(version), 'copyright': QtCore.QVariant(copyright.value), - 'permission': QtCore.QVariant(permission), + 'permission': QtCore.QVariant(permission.value), 'book': QtCore.QVariant(verse.book.name), 'chapter': QtCore.QVariant(verse.chapter), 'verse': QtCore.QVariant(verse.verse), 'text': QtCore.QVariant(verse.text) } + if bible2: + bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name, + verse.chapter, verse.verse, version, bible2_version) + else: + bible_text = u' %s %d:%d (%s)' % (verse.book.name, + verse.chapter, verse.verse, bible) + bible_verse = QtGui.QListWidgetItem(bible_text) + #bible_verse.setData(QtCore.Qt.UserRole, + # QtCore.QVariant(bible_text)) bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict)) self.listView.addItem(bible_verse) row = self.listView.setCurrentRow(count) From 778388b2ae9f6994ae72e693e3fd92df715b0736 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 2 Aug 2010 22:03:20 +0200 Subject: [PATCH 02/15] search result are dependent (in regard to 2nd bible) --- openlp/plugins/bibles/lib/mediaitem.py | 87 +++++++++++++------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 90fc6320a..9547f629e 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -474,34 +474,11 @@ class BibleMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsAdditions) # If we want to use a 2nd translation / version. - bible2 = u'' - if self.SearchTabWidget.currentIndex() == 0: - bible2 = unicode(self.QuickSecondBibleComboBox.currentText()) - else: - bible2 = unicode(self.AdvancedSecondBibleComboBox.currentText()) if bible2: bible2_verses = [] 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_copyright = self.parent.manager.get_meta_data(bible2, - u'Copyright') - bible2_permission = self.parent.manager.get_meta_data(bible2, - u'Permissions') - if bible2_version: - bible2_version = bible2_version.value - else: - bible2_version = u'' - if bible2_copyright: - bible2_copyright = bible2_copyright.value - else: - bible2_copyright = u'' - if bible2_permission: - bible2_permission = bible2_permission.value - else: - bible2_permission = u'' # Let's loop through the main lot, and assemble our verses. for item in items: bitem = self.listView.item(item.row()) @@ -516,6 +493,14 @@ class BibleMediaItem(MediaManagerItem): version = self._decodeQtObject(reference, 'version') copyright = self._decodeQtObject(reference, 'copyright') #permission = self._decodeQtObject(reference, 'permission') + bible2 = self._decodeQtObject(reference, 'bible2') + if bible2: + bible2_version = self._decodeQtObject(reference, + 'bible2_version') + bible2_copyright = self._decodeQtObject(reference, + 'bible2_copyright') + #bible2_permission = self._decodeQtObject(reference, + # 'bible2_permission') if self.parent.settings_tab.display_style == 1: verse_text = self.formatVerse(old_chapter, chapter, verse, u'(', u')') @@ -636,32 +621,48 @@ class BibleMediaItem(MediaManagerItem): copyright = self.parent.manager.get_meta_data(bible, u'Copyright') permission = self.parent.manager.get_meta_data(bible, u'Permissions') if bible2: - bible2_version = self.parent.manager.get_meta_data(bible2, u'Version') - if bible2_version: - bible2_version = bible2_version.value + bible2_version = self.parent.manager.get_meta_data(bible2, + u'Version') + bible2_copyright = self.parent.manager.get_meta_data(bible2, + u'Copyright') + bible2_permission = self.parent.manager.get_meta_data(bible2, + u'Permissions') + if bible2_permission: + bible2_permission = bible2_permission.value else: - bible2_version = u'' - if version: - version = version.value - else: - version = u'' + bible2_permission = u'' for count, verse in enumerate(self.search_results): - vdict = { - 'bible': QtCore.QVariant(bible), - 'version': QtCore.QVariant(version), - 'copyright': QtCore.QVariant(copyright.value), - 'permission': QtCore.QVariant(permission.value), - 'book': QtCore.QVariant(verse.book.name), - 'chapter': QtCore.QVariant(verse.chapter), - 'verse': QtCore.QVariant(verse.verse), - 'text': QtCore.QVariant(verse.text) - } if bible2: + vdict = { + 'bible': QtCore.QVariant(bible), + 'version': QtCore.QVariant(version.value), + 'copyright': QtCore.QVariant(copyright.value), + 'permission': QtCore.QVariant(permission.value), + 'bible2': QtCore.QVariant(bible2), + 'bible2_version': QtCore.QVariant(bible2_version.value), + 'bible2_copyright': QtCore.QVariant(bible2_copyright.value), + 'bible2_permission': QtCore.QVariant(bible2_permission), + 'book': QtCore.QVariant(verse.book.name), + 'chapter': QtCore.QVariant(verse.chapter), + 'verse': QtCore.QVariant(verse.verse), + 'text': QtCore.QVariant(verse.text) + } bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name, - verse.chapter, verse.verse, version, bible2_version) + verse.chapter, verse.verse, version.value, bible2_version.value) else: + 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), + 'chapter': QtCore.QVariant(verse.chapter), + 'verse': QtCore.QVariant(verse.verse), + 'text': QtCore.QVariant(verse.text) + } bible_text = u' %s %d:%d (%s)' % (verse.book.name, - verse.chapter, verse.verse, bible) + verse.chapter, verse.verse, version.value) bible_verse = QtGui.QListWidgetItem(bible_text) #bible_verse.setData(QtCore.Qt.UserRole, # QtCore.QVariant(bible_text)) From 569377e7d09f281407d27918bdbfde4b40c4fb14 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 3 Aug 2010 12:46:12 +0200 Subject: [PATCH 03/15] fixed second bible when using Keep to create multiple bible verses in one service item --- openlp/plugins/bibles/lib/mediaitem.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 9547f629e..eeb1a3728 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -466,20 +466,14 @@ class BibleMediaItem(MediaManagerItem): items = self.listView.selectedIndexes() if len(items) == 0: return False - old_chapter = u'' - raw_slides = [] - raw_footer = [] bible_text = u'' + old_chapter = u'' + raw_footer = [] + raw_slides = [] + bible2_verses = [] service_item.add_capability(ItemCapabilities.AllowsPreview) service_item.add_capability(ItemCapabilities.AllowsLoop) 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: bitem = self.listView.item(item.row()) reference = bitem.data(QtCore.Qt.UserRole) @@ -501,6 +495,11 @@ class BibleMediaItem(MediaManagerItem): 'bible2_copyright') #bible2_permission = self._decodeQtObject(reference, # '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: verse_text = self.formatVerse(old_chapter, chapter, verse, u'(', u')') @@ -631,6 +630,8 @@ class BibleMediaItem(MediaManagerItem): bible2_permission = bible2_permission.value else: 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): if bible2: vdict = { @@ -668,6 +669,6 @@ class BibleMediaItem(MediaManagerItem): # QtCore.QVariant(bible_text)) bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict)) self.listView.addItem(bible_verse) - row = self.listView.setCurrentRow(count) + row = self.listView.setCurrentRow(count + start_count) if row: row.setSelected(True) From b3d17de18a855d5dd5d3769b5b51b7d19e0afd1b Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 3 Aug 2010 12:49:04 +0200 Subject: [PATCH 04/15] fixed second bible when using Keep to create multiple bible verses in one service item --- openlp/plugins/bibles/lib/mediaitem.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index eeb1a3728..c4b0a766b 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -498,8 +498,6 @@ class BibleMediaItem(MediaManagerItem): 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: verse_text = self.formatVerse(old_chapter, chapter, verse, u'(', u')') From 6df4e2cfefd0f33882f2df8e9d5236b7c2ed516c Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 3 Aug 2010 19:04:08 +0200 Subject: [PATCH 05/15] continued fixing + cleaned my work up --- openlp/plugins/bibles/lib/mediaitem.py | 55 ++++++++++++++------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index c4b0a766b..cbed7633a 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -59,10 +59,10 @@ class BibleMediaItem(MediaManagerItem): self.pluginNameVisible = translate('BiblesPlugin.MediaItem', 'Bible') self.IconPath = u'songs/song' self.ListViewWithDnD_class = BibleListView - self.lastReference = [] MediaManagerItem.__init__(self, parent, icon, title) - # place to store the search results + # place to store the search results for both bibles self.search_results = {} + self.search_results2 = {} QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'bibles_load_list'), self.reloadBibles) @@ -387,7 +387,7 @@ class BibleMediaItem(MediaManagerItem): QtGui.QMessageBox.critical(self, translate('BiblesPlugin.MediaItem', 'No Book Found'), translate('BiblesPlugin.MediaItem', - 'No matching book could be found in this Bible.')) + 'No matching book could be found in this Bible.')) def onAdvancedVersionComboBox(self): self.initialiseBible( @@ -432,10 +432,11 @@ class BibleMediaItem(MediaManagerItem): versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, chapter_to, verse_to) self.search_results = self.parent.manager.get_verses(bible, versetext) + if bible2: + self.search_results2 = self.parent.manager.get_verses(bible2, + versetext) if self.ClearAdvancedSearchComboBox.currentIndex() == 0: self.listView.clear() - self.lastReference = [] - self.lastReference.append(versetext) self.displayResults(bible, bible2) def onAdvancedFromChapter(self): @@ -455,9 +456,9 @@ class BibleMediaItem(MediaManagerItem): text = unicode(self.QuickSearchEdit.text()) if self.ClearQuickSearchComboBox.currentIndex() == 0: self.listView.clear() - self.lastReference = [] - self.lastReference.append(text) self.search_results = self.parent.manager.get_verses(bible, text) + if bible2: + self.search_results2 = self.parent.manager.get_verses(bible2, text) if self.search_results: self.displayResults(bible, bible2) @@ -474,6 +475,7 @@ class BibleMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.AllowsPreview) service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsAdditions) + # Let's loop through the main lot, and assemble our verses. for item in items: bitem = self.listView.item(item.row()) reference = bitem.data(QtCore.Qt.UserRole) @@ -495,9 +497,7 @@ class BibleMediaItem(MediaManagerItem): 'bible2_copyright') #bible2_permission = self._decodeQtObject(reference, # 'bible2_permission') - for scripture in self.lastReference: - bible2_verses.extend(self.parent.manager.get_verses(bible2, - scripture)) + text2 = self._decodeQtObject(reference, 'text2') if self.parent.settings_tab.display_style == 1: verse_text = self.formatVerse(old_chapter, chapter, verse, u'(', u')') @@ -522,7 +522,7 @@ class BibleMediaItem(MediaManagerItem): if footer not in raw_footer: raw_footer.append(footer) bible_text = u'%s %s \n\n %s %s' % (verse_text, text, - verse_text, bible2_verses[item.row()].text) + verse_text, text2) raw_slides.append(bible_text) bible_text = u'' else: @@ -534,17 +534,19 @@ class BibleMediaItem(MediaManagerItem): if self.parent.settings_tab.layout_style == 0: raw_slides.append(bible_text) bible_text = u'' - if not service_item.title: - if bible2: - service_item.title = u'%s (%s, %s) %s' % (book, version, - bible2_version, verse_text) - else: - service_item.title = u'%s (%s) %s' % (book, version, - verse_text) - elif service_item.title.find( - translate('BiblesPlugin.MediaItem', 'etc')) == -1: - service_item.title = u'%s, %s' % (service_item.title, - translate('BiblesPlugin.MediaItem', 'etc')) + # service item title + if not service_item.title: + if bible2: + service_item.title = u'%s (%s, %s) %s' % (book, version, + bible2_version, verse_text) + else: + service_item.title = u'%s (%s) %s' % (book, version, + verse_text) + elif service_item.title.find(translate('BiblesPlugin.MediaItem', + 'etc')) == -1: + service_item.title = u'%s, %s' % (service_item.title, + translate('BiblesPlugin.MediaItem', 'etc')) + # item theme if len(self.parent.settings_tab.bible_theme) == 0: service_item.theme = None else: @@ -636,15 +638,16 @@ class BibleMediaItem(MediaManagerItem): 'bible': QtCore.QVariant(bible), 'version': QtCore.QVariant(version.value), 'copyright': QtCore.QVariant(copyright.value), - 'permission': QtCore.QVariant(permission.value), + #'permission': QtCore.QVariant(permission.value), 'bible2': QtCore.QVariant(bible2), 'bible2_version': QtCore.QVariant(bible2_version.value), 'bible2_copyright': QtCore.QVariant(bible2_copyright.value), - 'bible2_permission': QtCore.QVariant(bible2_permission), + #'bible2_permission': QtCore.QVariant(bible2_permission), 'book': QtCore.QVariant(verse.book.name), 'chapter': QtCore.QVariant(verse.chapter), 'verse': QtCore.QVariant(verse.verse), - 'text': QtCore.QVariant(verse.text) + 'text': QtCore.QVariant(verse.text), + 'text2': QtCore.QVariant(self.search_results2[count].text) } bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name, verse.chapter, verse.verse, version.value, bible2_version.value) @@ -653,7 +656,7 @@ class BibleMediaItem(MediaManagerItem): 'bible': QtCore.QVariant(bible), 'version': QtCore.QVariant(version.value), 'copyright': QtCore.QVariant(copyright.value), - 'permission': QtCore.QVariant(permission.value), + #'permission': QtCore.QVariant(permission.value), 'bible2': QtCore.QVariant(bible2), 'book': QtCore.QVariant(verse.book.name), 'chapter': QtCore.QVariant(verse.chapter), From 444a219a20fd27db47bd35b26e4fa1b51eff4100 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 3 Aug 2010 19:17:09 +0200 Subject: [PATCH 06/15] removed unused list --- 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 cbed7633a..04b46c4bd 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -471,7 +471,6 @@ class BibleMediaItem(MediaManagerItem): old_chapter = u'' raw_footer = [] raw_slides = [] - bible2_verses = [] service_item.add_capability(ItemCapabilities.AllowsPreview) service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsAdditions) From e6f0fde98d91a9d844217a262da956fa801c4fda Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 4 Aug 2010 10:02:52 +0200 Subject: [PATCH 07/15] tweaks and cleanups --- openlp/plugins/bibles/lib/mediaitem.py | 78 +++++++++++++++----------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 04b46c4bd..c4e8a4a88 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -463,6 +463,9 @@ class BibleMediaItem(MediaManagerItem): self.displayResults(bible, bible2) def generateSlideData(self, service_item, item=None): + ''' + Generates and formats the slides for the service item. + ''' log.debug(u'generating slide data') items = self.listView.selectedIndexes() if len(items) == 0: @@ -480,14 +483,14 @@ class BibleMediaItem(MediaManagerItem): reference = bitem.data(QtCore.Qt.UserRole) if isinstance(reference, QtCore.QVariant): reference = reference.toPyObject() - #bible = self._decodeQtObject(reference, 'bible') book = self._decodeQtObject(reference, 'book') chapter = self._decodeQtObject(reference, 'chapter') verse = self._decodeQtObject(reference, 'verse') - text = self._decodeQtObject(reference, 'text') + #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') bible2 = self._decodeQtObject(reference, 'bible2') if bible2: bible2_version = self._decodeQtObject(reference, @@ -496,7 +499,7 @@ class BibleMediaItem(MediaManagerItem): 'bible2_copyright') #bible2_permission = self._decodeQtObject(reference, # 'bible2_permission') - text2 = self._decodeQtObject(reference, 'text2') + bible2_text = self._decodeQtObject(reference, 'bible2_text') if self.parent.settings_tab.display_style == 1: verse_text = self.formatVerse(old_chapter, chapter, verse, u'(', u')') @@ -521,7 +524,7 @@ class BibleMediaItem(MediaManagerItem): if footer not in raw_footer: raw_footer.append(footer) bible_text = u'%s %s \n\n %s %s' % (verse_text, text, - verse_text, text2) + verse_text, bible2_text) raw_slides.append(bible_text) bible_text = u'' else: @@ -533,14 +536,16 @@ class BibleMediaItem(MediaManagerItem): if self.parent.settings_tab.layout_style == 0: raw_slides.append(bible_text) 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 if not service_item.title: if bible2: service_item.title = u'%s (%s, %s) %s' % (book, version, bible2_version, verse_text) else: - service_item.title = u'%s (%s) %s' % (book, version, - verse_text) + service_item.title = u'%s (%s) %s' % (book, version, verse_text) elif service_item.title.find(translate('BiblesPlugin.MediaItem', 'etc')) == -1: service_item.title = u'%s, %s' % (service_item.title, @@ -550,14 +555,11 @@ class BibleMediaItem(MediaManagerItem): service_item.theme = None else: 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: service_item.add_from_text(slide[:30], slide) if service_item.raw_footer: - for foot in raw_footer: - service_item.raw_footer.append(foot) + for footer in raw_footer: + service_item.raw_footer.append(footer) else: service_item.raw_footer = raw_footer return True @@ -589,8 +591,8 @@ class BibleMediaItem(MediaManagerItem): row, QtCore.QVariant(book[u'chapters'])) if first: first = False - self.initialiseChapterVerse( - bible, book[u'name'], book[u'chapters']) + self.initialiseChapterVerse(bible, book[u'name'], + book[u'chapters']) def initialiseChapterVerse(self, bible, book, chapters): 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) if self.verses == 0: self.AdvancedSearchButton.setEnabled(False) - self.AdvancedMessage.setText( - translate('BiblesPlugin.MediaItem', 'Bible not fully loaded.')) + self.AdvancedMessage.setText(translate('BiblesPlugin.MediaItem', + 'Bible not fully loaded.')) else: self.AdvancedSearchButton.setEnabled(True) self.AdvancedMessage.setText(u'') @@ -615,6 +617,10 @@ class BibleMediaItem(MediaManagerItem): combo.addItem(unicode(i)) 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') copyright = self.parent.manager.get_meta_data(bible, u'Copyright') 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): if bible2: vdict = { - 'bible': QtCore.QVariant(bible), - 'version': QtCore.QVariant(version.value), - 'copyright': QtCore.QVariant(copyright.value), - #'permission': QtCore.QVariant(permission.value), - 'bible2': QtCore.QVariant(bible2), - 'bible2_version': QtCore.QVariant(bible2_version.value), - 'bible2_copyright': QtCore.QVariant(bible2_copyright.value), - #'bible2_permission': QtCore.QVariant(bible2_permission), - 'book': QtCore.QVariant(verse.book.name), - 'chapter': QtCore.QVariant(verse.chapter), - 'verse': QtCore.QVariant(verse.verse), - 'text': QtCore.QVariant(verse.text), - 'text2': QtCore.QVariant(self.search_results2[count].text) + '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), + 'bible2':QtCore.QVariant(bible2), + 'bible2_version':QtCore.QVariant(bible2_version.value), + 'bible2_copyright':QtCore.QVariant(bible2_copyright.value), + #'bible2_permission':QtCore.QVariant(bible2_permission), + 'bible2_text':QtCore.QVariant( + self.search_results2[count].text) } bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name, verse.chapter, verse.verse, version.value, bible2_version.value) else: 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), 'chapter': QtCore.QVariant(verse.chapter), '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, verse.chapter, verse.verse, version.value) + # set the row title bible_verse = QtGui.QListWidgetItem(bible_text) #bible_verse.setData(QtCore.Qt.UserRole, # QtCore.QVariant(bible_text)) @@ -672,3 +680,5 @@ class BibleMediaItem(MediaManagerItem): row = self.listView.setCurrentRow(count + start_count) if row: row.setSelected(True) + self.search_results = {} + self.search_results2 = {} From 60b179b2edf21caf80ecff689e5c5008c10fe7f2 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 5 Aug 2010 21:32:58 +0200 Subject: [PATCH 08/15] improved single and dual bible usage in one service item --- openlp/plugins/bibles/lib/mediaitem.py | 51 +++++++++++++++++--------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index c4e8a4a88..7d415b9ee 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -468,7 +468,8 @@ class BibleMediaItem(MediaManagerItem): ''' log.debug(u'generating slide data') items = self.listView.selectedIndexes() - if len(items) == 0: + items_length = len(items) + if items_length == 0: return False bible_text = u'' old_chapter = u'' @@ -486,7 +487,7 @@ class BibleMediaItem(MediaManagerItem): book = self._decodeQtObject(reference, 'book') chapter = self._decodeQtObject(reference, 'chapter') verse = self._decodeQtObject(reference, 'verse') - #bible = self._decodeQtObject(reference, 'bible') + bible = self._decodeQtObject(reference, 'bible') version = self._decodeQtObject(reference, 'version') copyright = self._decodeQtObject(reference, 'copyright') #permission = self._decodeQtObject(reference, 'permission') @@ -528,17 +529,33 @@ class BibleMediaItem(MediaManagerItem): raw_slides.append(bible_text) bible_text = u'' else: - # Paragraph style force new line per verse + # 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 slide + # If we are 'Verse Per Slide' then create a new slide. if self.parent.settings_tab.layout_style == 0: raw_slides.append(bible_text) 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) + # If we are 'Verse Per Slide' we have already been added. + if self.parent.settings_tab.layout_style != 0 and not bible2: + if item.row() < items_length - 1: + log.debug(items.size()) + 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') + bible2_new = self._decodeQtObject(reference, 'bible2') + if bible2_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'' # service item title if not service_item.title: if bible2: @@ -643,7 +660,7 @@ class BibleMediaItem(MediaManagerItem): 'book':QtCore.QVariant(verse.book.name), 'chapter':QtCore.QVariant(verse.chapter), 'verse':QtCore.QVariant(verse.verse), - #'bible':QtCore.QVariant(bible), + 'bible':QtCore.QVariant(bible), 'version':QtCore.QVariant(version.value), 'copyright':QtCore.QVariant(copyright.value), #'permission':QtCore.QVariant(permission.value), @@ -659,15 +676,15 @@ class BibleMediaItem(MediaManagerItem): verse.chapter, verse.verse, version.value, bible2_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), - 'bible2': QtCore.QVariant(bible2) + '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), + 'bible2':QtCore.QVariant(bible2) } bible_text = u' %s %d:%d (%s)' % (verse.book.name, verse.chapter, verse.verse, version.value) From 3bee58e314dfbd33d42394fdeb87682fb787783c Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 6 Aug 2010 09:00:34 +0200 Subject: [PATCH 09/15] 'if' not necessary --- openlp/plugins/bibles/lib/mediaitem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 7d415b9ee..e807315fc 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -538,7 +538,7 @@ class BibleMediaItem(MediaManagerItem): raw_slides.append(bible_text) 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: + else: if item.row() < items_length - 1: log.debug(items.size()) bitem = items[item.row() + 1] From 719268f1214fb3fe48373b76226554c0f8dd9855 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 6 Aug 2010 09:07:20 +0200 Subject: [PATCH 10/15] cleanup --- 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 e807315fc..c26281116 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -537,10 +537,10 @@ class BibleMediaItem(MediaManagerItem): if self.parent.settings_tab.layout_style == 0: raw_slides.append(bible_text) bible_text = u'' - # If we are 'Verse Per Slide' we have already been added. + # If we are not 'Verse Per Slide' we have to make sure, that we + # add more verses. else: if item.row() < items_length - 1: - log.debug(items.size()) bitem = items[item.row() + 1] reference = bitem.data(QtCore.Qt.UserRole) if isinstance(reference, QtCore.QVariant): From 24de78680ee24bc64b64e73d5d6cf09ccaa80ac0 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 6 Aug 2010 09:23:32 +0200 Subject: [PATCH 11/15] cleanup --- openlp/plugins/bibles/lib/mediaitem.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index c26281116..a515c52c9 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -468,8 +468,7 @@ class BibleMediaItem(MediaManagerItem): ''' log.debug(u'generating slide data') items = self.listView.selectedIndexes() - items_length = len(items) - if items_length == 0: + if len(items) == 0: return False bible_text = u'' old_chapter = u'' @@ -540,7 +539,7 @@ class BibleMediaItem(MediaManagerItem): # If we are not 'Verse Per Slide' we have to make sure, that we # add more verses. else: - if item.row() < items_length - 1: + if item.row() < len(items) - 1: bitem = items[item.row() + 1] reference = bitem.data(QtCore.Qt.UserRole) if isinstance(reference, QtCore.QVariant): From 403ee4cd53defdbc8b79cef5ef12a4b9f5375cc8 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 8 Aug 2010 20:05:33 +0200 Subject: [PATCH 12/15] more convenient names --- openlp/plugins/bibles/lib/mediaitem.py | 91 +++++++++++++------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index a515c52c9..a1cefbcea 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -62,7 +62,7 @@ class BibleMediaItem(MediaManagerItem): MediaManagerItem.__init__(self, parent, icon, title) # place to store the search results for both bibles self.search_results = {} - self.search_results2 = {} + self.dual_search_results = {} QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'bibles_load_list'), self.reloadBibles) @@ -423,7 +423,7 @@ class BibleMediaItem(MediaManagerItem): def onAdvancedSearchButton(self): log.debug(u'Advanced Search Button pressed') bible = unicode(self.AdvancedVersionComboBox.currentText()) - bible2 = unicode(self.AdvancedSecondBibleComboBox.currentText()) + dual_bible = unicode(self.AdvancedSecondBibleComboBox.currentText()) book = unicode(self.AdvancedBookComboBox.currentText()) chapter_from = int(self.AdvancedFromChapter.currentText()) chapter_to = int(self.AdvancedToChapter.currentText()) @@ -432,12 +432,12 @@ class BibleMediaItem(MediaManagerItem): versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, chapter_to, verse_to) self.search_results = self.parent.manager.get_verses(bible, versetext) - if bible2: - self.search_results2 = self.parent.manager.get_verses(bible2, - versetext) + if dual_bible: + self.dual_search_results = self.parent.manager.get_verses( + dual_bible, versetext) if self.ClearAdvancedSearchComboBox.currentIndex() == 0: self.listView.clear() - self.displayResults(bible, bible2) + self.displayResults(bible, dual_bible) def onAdvancedFromChapter(self): bible = unicode(self.AdvancedVersionComboBox.currentText()) @@ -452,15 +452,16 @@ class BibleMediaItem(MediaManagerItem): def onQuickSearchButton(self): log.debug(u'Quick Search Button pressed') bible = unicode(self.QuickVersionComboBox.currentText()) - bible2 = unicode(self.QuickSecondBibleComboBox.currentText()) + dual_bible = unicode(self.QuickSecondBibleComboBox.currentText()) text = unicode(self.QuickSearchEdit.text()) if self.ClearQuickSearchComboBox.currentIndex() == 0: self.listView.clear() self.search_results = self.parent.manager.get_verses(bible, text) - if bible2: - self.search_results2 = self.parent.manager.get_verses(bible2, text) + if dual_bible: + self.dual_search_results = self.parent.manager.get_verses( + dual_bible, text) if self.search_results: - self.displayResults(bible, bible2) + self.displayResults(bible, dual_bible) def generateSlideData(self, service_item, item=None): ''' @@ -491,15 +492,15 @@ class BibleMediaItem(MediaManagerItem): copyright = self._decodeQtObject(reference, 'copyright') #permission = self._decodeQtObject(reference, 'permission') text = self._decodeQtObject(reference, 'text') - bible2 = self._decodeQtObject(reference, 'bible2') - if bible2: - bible2_version = self._decodeQtObject(reference, - 'bible2_version') - bible2_copyright = self._decodeQtObject(reference, - 'bible2_copyright') - #bible2_permission = self._decodeQtObject(reference, - # 'bible2_permission') - bible2_text = self._decodeQtObject(reference, 'bible2_text') + dual_bible = self._decodeQtObject(reference, 'dual_bible') + if dual_bible: + dual_version = self._decodeQtObject(reference, + 'dual_version') + dual_copyright = self._decodeQtObject(reference, + 'dual_copyright') + #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')') @@ -517,14 +518,14 @@ class BibleMediaItem(MediaManagerItem): # If not found add to footer if footer not in raw_footer: raw_footer.append(footer) - if bible2: - footer = u'%s (%s %s)' % (book, bible2_version, - bible2_copyright) + if dual_bible: + footer = u'%s (%s %s)' % (book, dual_version, + dual_copyright) # If not found add second version and copyright to footer. if footer not in raw_footer: raw_footer.append(footer) bible_text = u'%s %s \n\n %s %s' % (verse_text, text, - verse_text, bible2_text) + verse_text, dual_text) raw_slides.append(bible_text) bible_text = u'' else: @@ -545,8 +546,8 @@ class BibleMediaItem(MediaManagerItem): if isinstance(reference, QtCore.QVariant): reference = reference.toPyObject() bible_new = self._decodeQtObject(reference, 'bible') - bible2_new = self._decodeQtObject(reference, 'bible2') - if bible2_new: + dual_bible_new = self._decodeQtObject(reference, 'dual_bible') + if dual_bible_new: raw_slides.append(bible_text) bible_text = u'' elif bible != bible_new: @@ -557,9 +558,9 @@ class BibleMediaItem(MediaManagerItem): bible_text = u'' # service item title if not service_item.title: - if bible2: + if dual_bible: service_item.title = u'%s (%s, %s) %s' % (book, version, - bible2_version, verse_text) + dual_version, verse_text) else: service_item.title = u'%s (%s) %s' % (book, version, verse_text) elif service_item.title.find(translate('BiblesPlugin.MediaItem', @@ -632,7 +633,7 @@ class BibleMediaItem(MediaManagerItem): for i in range(int(range_from), int(range_to) + 1): combo.addItem(unicode(i)) - def displayResults(self, bible, bible2=None): + 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. @@ -640,21 +641,21 @@ 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 bible2: - bible2_version = self.parent.manager.get_meta_data(bible2, + if dual_bible: + dual_version = self.parent.manager.get_meta_data(dual_bible, u'Version') - bible2_copyright = self.parent.manager.get_meta_data(bible2, + dual_copyright = self.parent.manager.get_meta_data(dual_bible, u'Copyright') - bible2_permission = self.parent.manager.get_meta_data(bible2, + dual_permission = self.parent.manager.get_meta_data(dual_bible, u'Permissions') - if bible2_permission: - bible2_permission = bible2_permission.value + if dual_permission: + dual_permission = dual_permission.value else: - bible2_permission = u'' + 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 bible2: + if dual_bible: vdict = { 'book':QtCore.QVariant(verse.book.name), 'chapter':QtCore.QVariant(verse.chapter), @@ -664,15 +665,15 @@ class BibleMediaItem(MediaManagerItem): 'copyright':QtCore.QVariant(copyright.value), #'permission':QtCore.QVariant(permission.value), 'text':QtCore.QVariant(verse.text), - 'bible2':QtCore.QVariant(bible2), - 'bible2_version':QtCore.QVariant(bible2_version.value), - 'bible2_copyright':QtCore.QVariant(bible2_copyright.value), - #'bible2_permission':QtCore.QVariant(bible2_permission), - 'bible2_text':QtCore.QVariant( - self.search_results2[count].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, bible2_version.value) + verse.chapter, verse.verse, version.value, dual_version.value) else: vdict = { 'book':QtCore.QVariant(verse.book.name), @@ -683,7 +684,7 @@ class BibleMediaItem(MediaManagerItem): 'copyright':QtCore.QVariant(copyright.value), #'permission':QtCore.QVariant(permission.value), 'text':QtCore.QVariant(verse.text), - 'bible2':QtCore.QVariant(bible2) + 'dual_bible':QtCore.QVariant(dual_bible) } bible_text = u' %s %d:%d (%s)' % (verse.book.name, verse.chapter, verse.verse, version.value) @@ -697,4 +698,4 @@ class BibleMediaItem(MediaManagerItem): if row: row.setSelected(True) self.search_results = {} - self.search_results2 = {} + self.dual_search_results = {} From 47125ba6003a68c119595be01240f3b5af21fba3 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 10 Aug 2010 18:44:04 +0200 Subject: [PATCH 13/15] made lines more readable --- openlp/plugins/bibles/lib/mediaitem.py | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index a1cefbcea..e2caf4e9b 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -290,40 +290,40 @@ class BibleMediaItem(MediaManagerItem): def retranslateUi(self): log.debug(u'retranslateUi') - self.QuickVersionLabel.setText(translate('BiblesPlugin.MediaItem', - 'Version:')) - self.QuickSecondVersionLabel.setText(translate('BiblesPlugin.MediaItem', - 'Dual:')) - self.QuickSearchLabel.setText(translate('BiblesPlugin.MediaItem', - 'Search type:')) - self.QuickSearchLabel.setText(translate('BiblesPlugin.MediaItem', - 'Find:')) - self.QuickSearchButton.setText(translate('BiblesPlugin.MediaItem', - 'Search')) - self.QuickClearLabel.setText(translate('BiblesPlugin.MediaItem', - 'Results:')) - self.AdvancedVersionLabel.setText(translate('BiblesPlugin.MediaItem', - 'Version:')) + self.QuickVersionLabel.setText( + translate('BiblesPlugin.MediaItem', 'Version:')) + self.QuickSecondVersionLabel.setText( + translate('BiblesPlugin.MediaItem', 'Dual:')) + self.QuickSearchLabel.setText( + translate('BiblesPlugin.MediaItem', 'Search type:')) + self.QuickSearchLabel.setText( + translate('BiblesPlugin.MediaItem', 'Find:')) + self.QuickSearchButton.setText( + translate('BiblesPlugin.MediaItem', 'Search')) + self.QuickClearLabel.setText( + translate('BiblesPlugin.MediaItem', 'Results:')) + self.AdvancedVersionLabel.setText( + translate('BiblesPlugin.MediaItem', 'Version:')) self.AdvancedSecondBibleLabel.setText( translate('BiblesPlugin.MediaItem', 'Dual:')) - self.AdvancedBookLabel.setText(translate('BiblesPlugin.MediaItem', - 'Book:')) - self.AdvancedChapterLabel.setText(translate('BiblesPlugin.MediaItem', - 'Chapter:')) - self.AdvancedVerseLabel.setText(translate('BiblesPlugin.MediaItem', - 'Verse:')) - self.AdvancedFromLabel.setText(translate('BiblesPlugin.MediaItem', - 'From:')) - self.AdvancedToLabel.setText(translate('BiblesPlugin.MediaItem', - 'To:')) - self.AdvancedClearLabel.setText(translate('BiblesPlugin.MediaItem', - 'Results:')) - self.AdvancedSearchButton.setText(translate('BiblesPlugin.MediaItem', - 'Search')) - self.QuickSearchComboBox.addItem(translate('BiblesPlugin.MediaItem', - 'Verse Search')) - self.QuickSearchComboBox.addItem(translate('BiblesPlugin.MediaItem', - 'Text Search')) + self.AdvancedBookLabel.setText( + translate('BiblesPlugin.MediaItem', 'Book:')) + self.AdvancedChapterLabel.setText( + translate('BiblesPlugin.MediaItem', 'Chapter:')) + self.AdvancedVerseLabel.setText( + translate('BiblesPlugin.MediaItem', 'Verse:')) + self.AdvancedFromLabel.setText( + translate('BiblesPlugin.MediaItem', 'From:')) + self.AdvancedToLabel.setText( + translate('BiblesPlugin.MediaItem', 'To:')) + self.AdvancedClearLabel.setText( + translate('BiblesPlugin.MediaItem', 'Results:')) + self.AdvancedSearchButton.setText( + translate('BiblesPlugin.MediaItem', 'Search')) + self.QuickSearchComboBox.addItem( + translate('BiblesPlugin.MediaItem', 'Verse Search')) + self.QuickSearchComboBox.addItem( + translate('BiblesPlugin.MediaItem', 'Text Search')) self.ClearQuickSearchComboBox.addItem( translate('BiblesPlugin.MediaItem', 'Clear')) self.ClearQuickSearchComboBox.addItem( From df8b064058c6c08ffd28089c250872c1fb5f03cd Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 10 Aug 2010 18:48:10 +0200 Subject: [PATCH 14/15] made lines more readable --- 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 e2caf4e9b..cd2290142 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -617,8 +617,8 @@ class BibleMediaItem(MediaManagerItem): self.verses = self.parent.manager.get_verse_count(bible, book, 1) if self.verses == 0: self.AdvancedSearchButton.setEnabled(False) - self.AdvancedMessage.setText(translate('BiblesPlugin.MediaItem', - 'Bible not fully loaded.')) + self.AdvancedMessage.setText( + translate('BiblesPlugin.MediaItem', 'Bible not fully loaded.')) else: self.AdvancedSearchButton.setEnabled(True) self.AdvancedMessage.setText(u'') From c41bb80a95704ba1a81fd0ceb4c8f62ca89b27f8 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 10 Aug 2010 18:49:52 +0200 Subject: [PATCH 15/15] made lines more readable --- 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 cd2290142..196329ca8 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -563,8 +563,8 @@ class BibleMediaItem(MediaManagerItem): dual_version, verse_text) else: service_item.title = u'%s (%s) %s' % (book, version, verse_text) - elif service_item.title.find(translate('BiblesPlugin.MediaItem', - 'etc')) == -1: + elif service_item.title.find( + translate('BiblesPlugin.MediaItem', 'etc')) == -1: service_item.title = u'%s, %s' % (service_item.title, translate('BiblesPlugin.MediaItem', 'etc')) # item theme