diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 4cc9b067c..cb8273327 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -984,7 +984,6 @@ class BibleMediaItem(MediaManagerItem): """ bible = unicode(self.quickVersionComboBox.currentText()) search_results = self.plugin.manager.get_verses(bible, string, False, False) - results = [] if search_results: versetext = u' '.join([verse.text for verse in search_results]) return [[string, versetext]] diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index c51726d95..481b55c09 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -80,7 +80,7 @@ class ImageMediaItem(MediaManagerItem): u'thumbnails') check_directory_exists(self.servicePath) self.loadList(SettingsManager.load_list( - self.settingsSection, self.settingsSection), True) + self.settingsSection, u'images'), True) def addListViewToToolBar(self): MediaManagerItem.addListViewToToolBar(self) @@ -108,16 +108,16 @@ class ImageMediaItem(MediaManagerItem): unicode(text.text()))) self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, - self.settingsSection, self.getFileList()) + u'images', self.getFileList()) - def loadList(self, list, initialLoad=False): + def loadList(self, images, initialLoad=False): if not initialLoad: - self.plugin.formparent.displayProgressBar(len(list)) + self.plugin.formparent.displayProgressBar(len(images)) # Sort the themes by its filename considering language specific # characters. lower() is needed for windows! - list.sort(cmp=locale.strcoll, + images.sort(cmp=locale.strcoll, key=lambda filename: os.path.split(unicode(filename))[1].lower()) - for imageFile in list: + for imageFile in images: if not initialLoad: self.plugin.formparent.incrementProgressBar() filename = os.path.split(unicode(imageFile))[1] @@ -155,7 +155,7 @@ class ImageMediaItem(MediaManagerItem): for bitem in items: filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) if not os.path.exists(filename): - missing_items.append(item) + missing_items.append(bitem) missing_items_filenames.append(filename) for item in missing_items: items.remove(item) @@ -217,11 +217,10 @@ class ImageMediaItem(MediaManagerItem): 'the image file "%s" no longer exists.')) % filename) def search(self, string): - list = SettingsManager.load_list(self.settingsSection, - self.settingsSection) + files = SettingsManager.load_list(self.settingsSection, u'images') results = [] string = string.lower() - for file in list: + for file in files: filename = os.path.split(unicode(file))[1] if filename.lower().find(string) > -1: results.append([file, filename]) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index da2d338fa..1e39a0426 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -139,8 +139,6 @@ class MediaMediaItem(MediaManagerItem): self.mediaObject.clearQueue() self.mediaObject.setCurrentSource(Phonon.MediaSource(filename)) if not self.mediaStateWait(Phonon.StoppedState): - # Due to string freeze, borrow a message from presentations - # This will be corrected in 1.9.6 critical_error_message_box(UiStrings().UnsupportedFile, UiStrings().UnsupportedFile) return False @@ -150,8 +148,6 @@ class MediaMediaItem(MediaManagerItem): if not self.mediaStateWait(Phonon.PlayingState) \ or self.mediaObject.currentSource().type() \ == Phonon.MediaSource.Invalid: - # Due to string freeze, borrow a message from presentations - # This will be corrected in 1.9.6 self.mediaObject.stop() critical_error_message_box(UiStrings().UnsupportedFile, UiStrings().UnsupportedFile) @@ -186,8 +182,7 @@ class MediaMediaItem(MediaManagerItem): def initialise(self): self.listView.clear() self.listView.setIconSize(QtCore.QSize(88, 50)) - self.loadList(SettingsManager.load_list(self.settingsSection, - self.settingsSection)) + self.loadList(SettingsManager.load_list(self.settingsSection, u'media')) def onDeleteClick(self): """ @@ -200,14 +195,14 @@ class MediaMediaItem(MediaManagerItem): for row in row_list: self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, - self.settingsSection, self.getFileList()) + u'media', self.getFileList()) - def loadList(self, list): + def loadList(self, files): # Sort the themes by its filename considering language specific # characters. lower() is needed for windows! - list.sort(cmp=locale.strcoll, + files.sort(cmp=locale.strcoll, key=lambda filename: os.path.split(unicode(filename))[1].lower()) - for file in list: + for file in files: filename = os.path.split(unicode(file))[1] item_name = QtGui.QListWidgetItem(filename) img = QtGui.QPixmap(u':/media/media_video.png').toImage() @@ -221,11 +216,10 @@ class MediaMediaItem(MediaManagerItem): self.mediaObject = Phonon.MediaObject(self) def search(self, string): - list = SettingsManager.load_list(self.settingsSection, - self.settingsSection) + files = SettingsManager.load_list(self.settingsSection, u'media') results = [] string = string.lower() - for file in list: + for file in files: filename = os.path.split(unicode(file))[1] if filename.lower().find(string) > -1: results.append([file, filename]) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 1b9d8cff6..07b490d83 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -119,9 +119,9 @@ class PresentationMediaItem(MediaManagerItem): Populate the media manager tab """ self.listView.setIconSize(QtCore.QSize(88, 50)) - list = SettingsManager.load_list( + files = SettingsManager.load_list( self.settingsSection, u'presentations') - self.loadList(list, True) + self.loadList(files, True) self.populateDisplayTypes() def rebuild(self): @@ -228,7 +228,7 @@ class PresentationMediaItem(MediaManagerItem): for row in row_list: self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, - self.settingsSection, self.getFileList()) + u'presentations', self.getFileList()) def generateSlideData(self, service_item, item=None, xmlVersion=False): """ @@ -312,10 +312,12 @@ class PresentationMediaItem(MediaManagerItem): return None def search(self, string): - list = SettingsManager.load_list(self.settingsSection, u'presentations') + files = SettingsManager.load_list( + self.settingsSection, u'presentations') results = [] string = string.lower() - for file in list: - if file.lower().find(string) > -1: - results.append([file, file]) + for file in files: + filename = os.path.split(unicode(file))[1] + if filename.lower().find(string) > -1: + results.append([file, filename]) return results