openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bibles into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)

For more details, see:
https://code.launchpad.net/~googol/openlp/bibles/+merge/100995

Hello,

Just a few trivial clean ups.
-- 
https://code.launchpad.net/~googol/openlp/bibles/+merge/100995
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2012-03-04 20:10:17 +0000
+++ openlp/plugins/bibles/lib/manager.py	2012-04-05 15:43:39 +0000
@@ -293,7 +293,7 @@
                 - Genesis 1:1-10,15-20
                 - Genesis 1:1-2:10
                 - Genesis 1:1-10,2:1-10
-        
+
         ``book_ref_id``
             Unicode. The book referece id from the book in versetext.
             For second bible this is necessary.

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2012-04-02 00:19:16 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2012-04-05 15:43:39 +0000
@@ -244,9 +244,9 @@
         self.addSearchFields(u'advanced', UiStrings().Advanced)
         # Combo Boxes
         QtCore.QObject.connect(self.quickVersionComboBox,
-            QtCore.SIGNAL(u'activated(int)'), self.onQuickVersionComboBox)
+            QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
         QtCore.QObject.connect(self.quickSecondComboBox,
-            QtCore.SIGNAL(u'activated(int)'), self.onQuickSecondComboBox)
+            QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
         QtCore.QObject.connect(self.advancedVersionComboBox,
             QtCore.SIGNAL(u'activated(int)'), self.onAdvancedVersionComboBox)
         QtCore.QObject.connect(self.advancedSecondComboBox,
@@ -379,14 +379,13 @@
         self.advancedSecondComboBox.addItem(u'')
         # Get all bibles and sort the list.
         bibles = self.plugin.manager.get_bibles().keys()
+        bibles = filter(None, bibles)
         bibles.sort(cmp=locale.strcoll)
         # Load the bibles into the combo boxes.
-        for bible in bibles:
-            if bible:
-                self.quickVersionComboBox.addItem(bible)
-                self.quickSecondComboBox.addItem(bible)
-                self.advancedVersionComboBox.addItem(bible)
-                self.advancedSecondComboBox.addItem(bible)
+        self.quickVersionComboBox.addItems(bibles)
+        self.quickSecondComboBox.addItems(bibles)
+        self.advancedVersionComboBox.addItems(bibles)
+        self.advancedSecondComboBox.addItems(bibles)
         # set the default value
         bible = QtCore.QSettings().value(
             self.settingsSection + u'/advanced bible',
@@ -524,12 +523,6 @@
                 books.sort(cmp=locale.strcoll)
         set_case_insensitive_completer(books, self.quickSearchEdit)
 
-    def onQuickVersionComboBox(self):
-        self.updateAutoCompleter()
-
-    def onQuickSecondComboBox(self):
-        self.updateAutoCompleter()
-
     def onImportClick(self):
         if not hasattr(self, u'import_wizard'):
             self.import_wizard = BibleImportForm(self, self.plugin.manager,
@@ -998,8 +991,7 @@
             # last verse of the chapter or the current verse is not the
             # first one of the chapter.
             return True
-        else:
-            return False
+        return False
 
     def formatVerse(self, old_chapter, chapter, verse):
         """