openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #07968
[Merge] lp:~googol-hush/openlp/bibles into lp:openlp
Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bibles into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Jonathan Corwin (j-corwin)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/57501
Hello,
- fixed the advanced bible initialisation
- append a space to the each bible book name to simplify working with the completer (you cannot search just for a book, you always need <book>*space*<reference>)
--
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/57501
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-04-11 18:27:01 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-04-13 14:39:28 +0000
@@ -291,7 +291,11 @@
log.debug(u'bible manager initialise')
self.parent.manager.media = self
self.loadBibles()
- self.updateAutoCompleter(False)
+ bible = QtCore.QSettings().value(
+ self.settingsSection + u'/quick bible', QtCore.QVariant(
+ self.quickVersionComboBox.currentText())).toString()
+ find_and_set_in_combo_box(self.quickVersionComboBox, bible)
+ self.updateAutoCompleter()
self.configUpdated()
log.debug(u'bible manager initialise complete')
@@ -328,6 +332,8 @@
if bible in bibles:
find_and_set_in_combo_box(self.advancedVersionComboBox, bible)
self.initialiseAdvancedBible(unicode(bible))
+ elif len(bibles):
+ self.initialiseAdvancedBible(bibles[0])
def reloadBibles(self):
log.debug(u'Reloading Bibles')
@@ -374,20 +380,14 @@
self.adjustComboBox(1, verse_count, self.advancedFromVerse)
self.adjustComboBox(1, verse_count, self.advancedToVerse)
- def updateAutoCompleter(self, updateConfig=True):
+ def updateAutoCompleter(self):
"""
This updates the bible book completion list for the search field. The
completion depends on the bible. It is only updated when we are doing a
reference search, otherwise the auto completion list is removed.
"""
- if updateConfig:
- QtCore.QSettings().setValue(self.settingsSection + u'/quick bible',
- QtCore.QVariant(self.quickVersionComboBox.currentText()))
- else:
- book = QtCore.QSettings().value(
- self.settingsSection + u'/quick bible',
- QtCore.QVariant(u'')).toString()
- find_and_set_in_combo_box(self.quickVersionComboBox, book)
+ QtCore.QSettings().setValue(self.settingsSection + u'/quick bible',
+ QtCore.QVariant(self.quickVersionComboBox.currentText()))
books = []
# We have to do a 'Reference Search'.
if self.quickSearchEdit.currentSearchType() == BibleSearch.Reference:
@@ -395,7 +395,7 @@
bible = unicode(self.quickVersionComboBox.currentText())
if bible:
book_data = bibles[bible].get_books()
- books = [book.name for book in book_data]
+ books = map(lambda x: x.name + u' ', book_data)
books.sort()
add_widget_completer(books, self.quickSearchEdit)
Follow ups