From 1bf1aeacd44f6aaa309f590a9c1fa5d0550b1cb6 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 8 Oct 2010 19:37:34 +0200 Subject: [PATCH] minor fixes for proposal --- openlp/plugins/bibles/lib/mediaitem.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 4daa1bc93..f985c7471 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -539,14 +539,15 @@ class BibleMediaItem(MediaManagerItem): bible = unicode(self.QuickVersionComboBox.currentText()) dual_bible = unicode(self.QuickSecondBibleComboBox.currentText()) text = unicode(self.QuickSearchEdit.text()) - if self.QuickSearchComboBox.currentIndex() == 0: # Verse Search + if self.QuickSearchComboBox.currentIndex() == 0: + # We are doing a 'Verse Search'. self.search_results = self.parent.manager.get_verses(bible, text) if dual_bible and self.search_results: self.dual_search_results = self.parent.manager.get_verses( dual_bible, text) - else: # Text Search + else: + # We are doing a ' Text Search'. bibles = self.parent.manager.get_bibles() - #self.search_results = bibles[bible].verse_search(text) self.search_results = self.parent.manager.verse_search(bible, text) if dual_bible and self.search_results: text = [] @@ -718,16 +719,19 @@ class BibleMediaItem(MediaManagerItem): if bible_text: raw_slides.append(bible_text) bible_text = u'' + # Service Item: Capabilities if self.parent.settings_tab.layout_style == 2 and not 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: Title for title in raw_title: if not service_item.title: service_item.title = title else: service_item.title += u', ' + title + # Service Item: Theme if len(self.parent.settings_tab.bible_theme) == 0: service_item.theme = None else: