From 08a3a7aba6b5a36e50914e93e1f7968f42219737 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 12 Jun 2011 15:01:46 +0200 Subject: [PATCH] hard coded misleading arguments --- openlp/plugins/images/lib/mediaitem.py | 7 +++---- openlp/plugins/media/lib/mediaitem.py | 8 +++----- openlp/plugins/presentations/lib/mediaitem.py | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index abd34f4e7..76a22b89d 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,7 +108,7 @@ 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, images, initialLoad=False): if not initialLoad: @@ -217,8 +217,7 @@ class ImageMediaItem(MediaManagerItem): 'the image file "%s" no longer exists.')) % filename) def search(self, string): - files = SettingsManager.load_list(self.settingsSection, - self.settingsSection) + files = SettingsManager.load_list(self.settingsSection, u'images') results = [] string = string.lower() for file in files: diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index a9b59844b..77727b454 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -182,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): """ @@ -196,7 +195,7 @@ 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, files): # Sort the themes by its filename considering language specific @@ -217,8 +216,7 @@ class MediaMediaItem(MediaManagerItem): self.mediaObject = Phonon.MediaObject(self) def search(self, string): - files = SettingsManager.load_list(self.settingsSection, - self.settingsSection) + files = SettingsManager.load_list(self.settingsSection, u'media') results = [] string = string.lower() for file in files: diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index dcf7c41f1..f9ccd7337 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -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): """ @@ -313,7 +313,7 @@ class PresentationMediaItem(MediaManagerItem): def search(self, string): files = SettingsManager.load_list( - self.settingsSection, self.settingsSection) + self.settingsSection, u'presentations') results = [] string = string.lower() for file in files: