forked from openlp/openlp
minor fixes for proposal
This commit is contained in:
parent
2a21349a6e
commit
1bf1aeacd4
@ -539,14 +539,15 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
bible = unicode(self.QuickVersionComboBox.currentText())
|
bible = unicode(self.QuickVersionComboBox.currentText())
|
||||||
dual_bible = unicode(self.QuickSecondBibleComboBox.currentText())
|
dual_bible = unicode(self.QuickSecondBibleComboBox.currentText())
|
||||||
text = unicode(self.QuickSearchEdit.text())
|
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)
|
self.search_results = self.parent.manager.get_verses(bible, text)
|
||||||
if dual_bible and self.search_results:
|
if dual_bible and self.search_results:
|
||||||
self.dual_search_results = self.parent.manager.get_verses(
|
self.dual_search_results = self.parent.manager.get_verses(
|
||||||
dual_bible, text)
|
dual_bible, text)
|
||||||
else: # Text Search
|
else:
|
||||||
|
# We are doing a ' Text Search'.
|
||||||
bibles = self.parent.manager.get_bibles()
|
bibles = self.parent.manager.get_bibles()
|
||||||
#self.search_results = bibles[bible].verse_search(text)
|
|
||||||
self.search_results = self.parent.manager.verse_search(bible, text)
|
self.search_results = self.parent.manager.verse_search(bible, text)
|
||||||
if dual_bible and self.search_results:
|
if dual_bible and self.search_results:
|
||||||
text = []
|
text = []
|
||||||
@ -718,16 +719,19 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
if bible_text:
|
if bible_text:
|
||||||
raw_slides.append(bible_text)
|
raw_slides.append(bible_text)
|
||||||
bible_text = u''
|
bible_text = u''
|
||||||
|
# Service Item: Capabilities
|
||||||
if self.parent.settings_tab.layout_style == 2 and not dual_bible:
|
if self.parent.settings_tab.layout_style == 2 and not dual_bible:
|
||||||
# Split the line but do not replace line breaks in renderer.
|
# Split the line but do not replace line breaks in renderer.
|
||||||
service_item.add_capability(ItemCapabilities.NoLineBreaks)
|
service_item.add_capability(ItemCapabilities.NoLineBreaks)
|
||||||
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
service_item.add_capability(ItemCapabilities.AllowsPreview)
|
||||||
service_item.add_capability(ItemCapabilities.AllowsLoop)
|
service_item.add_capability(ItemCapabilities.AllowsLoop)
|
||||||
|
# Service Item: Title
|
||||||
for title in raw_title:
|
for title in raw_title:
|
||||||
if not service_item.title:
|
if not service_item.title:
|
||||||
service_item.title = title
|
service_item.title = title
|
||||||
else:
|
else:
|
||||||
service_item.title += u', ' + title
|
service_item.title += u', ' + title
|
||||||
|
# Service Item: Theme
|
||||||
if len(self.parent.settings_tab.bible_theme) == 0:
|
if len(self.parent.settings_tab.bible_theme) == 0:
|
||||||
service_item.theme = None
|
service_item.theme = None
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user