From dbe9fc51aa16cd6ef23bc579dea42b7b45d244d1 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 1 Apr 2012 13:16:08 +0200 Subject: [PATCH 1/2] clean ups --- openlp/plugins/bibles/lib/mediaitem.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 25ddc695c..abd665929 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -242,9 +242,9 @@ class BibleMediaItem(MediaManagerItem): 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,12 +379,11 @@ class BibleMediaItem(MediaManagerItem): bibles = self.plugin.manager.get_bibles().keys() 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) + tmp_bibles = [bible for bible in bibles if bible] + self.quickVersionComboBox.addItems(tmp_bibles) + self.quickSecondComboBox.addItems(tmp_bibles) + self.advancedVersionComboBox.addItems(tmp_bibles) + self.advancedSecondComboBox.addItems(tmp_bibles) # set the default value bible = QtCore.QSettings().value( self.settingsSection + u'/advanced bible', @@ -522,12 +521,6 @@ class BibleMediaItem(MediaManagerItem): books.sort(cmp=locale.strcoll) add_widget_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, @@ -996,8 +989,7 @@ class BibleMediaItem(MediaManagerItem): # 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): """ From 704795830db7fa0488d74788907cd133fc8cfa98 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 5 Apr 2012 17:16:47 +0200 Subject: [PATCH 2/2] use filter instead of list comprehension --- openlp/plugins/bibles/lib/mediaitem.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index abd665929..316b66e39 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -377,13 +377,13 @@ class BibleMediaItem(MediaManagerItem): 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. - tmp_bibles = [bible for bible in bibles if bible] - self.quickVersionComboBox.addItems(tmp_bibles) - self.quickSecondComboBox.addItems(tmp_bibles) - self.advancedVersionComboBox.addItems(tmp_bibles) - self.advancedSecondComboBox.addItems(tmp_bibles) + 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',