Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
#693150 Custom Slide Display footer option
https://bugs.launchpad.net/bugs/693150
#693202 delete theme
https://bugs.launchpad.net/bugs/693202
For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/47165
A few bible cleanups to sort out icon and update "Search" button quicker.
Updated Verses database to handle 3 wrong chapters
--
https://code.launchpad.net/~trb143/openlp/bugs/+merge/47165
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/bugs into lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-01-15 20:06:25 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-01-22 19:22:54 +0000
@@ -507,6 +507,7 @@
"""
log.debug(u'Advanced Search Button pressed')
self.advancedSearchButton.setEnabled(False)
+ Receiver.send_message(u'openlp_process_events')
bible = unicode(self.advancedVersionComboBox.currentText())
second_bible = unicode(self.advancedSecondComboBox.currentText())
book = unicode(self.advancedBookComboBox.currentText())
@@ -519,6 +520,7 @@
verse_range = chapter_from + verse_separator + verse_from + \
range_separator + chapter_to + verse_separator + verse_to
versetext = u'%s %s' % (book, verse_range)
+ Receiver.send_message(u'cursor_busy')
self.search_results = self.parent.manager.get_verses(bible, versetext)
if second_bible:
self.second_search_results = self.parent.manager.get_verses(
@@ -541,7 +543,9 @@
self.displayResults(bible, second_bible)
else:
self.displayResults(bible, second_bible)
+ Receiver.send_message(u'cursor_normal')
self.advancedSearchButton.setEnabled(True)
+ Receiver.send_message(u'openlp_process_events')
def onQuickSearchButton(self):
"""
@@ -550,6 +554,7 @@
"""
log.debug(u'Quick Search Button pressed')
self.quickSearchButton.setEnabled(False)
+ Receiver.send_message(u'openlp_process_events')
bible = unicode(self.quickVersionComboBox.currentText())
second_bible = unicode(self.quickSecondComboBox.currentText())
text = unicode(self.quickSearchEdit.text())
@@ -591,6 +596,7 @@
self.displayResults(bible, second_bible)
self.quickSearchButton.setEnabled(True)
Receiver.send_message(u'cursor_normal')
+ Receiver.send_message(u'openlp_process_events')
def displayResults(self, bible, second_bible=u''):
"""
=== modified file 'openlp/plugins/bibles/resources/httpbooks.sqlite'
Binary files openlp/plugins/bibles/resources/httpbooks.sqlite 2010-09-14 18:18:47 +0000 and openlp/plugins/bibles/resources/httpbooks.sqlite 2011-01-22 19:22:54 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
