From b092f1960638ac2684e15899bfeb0ea8421086a3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 15 Mar 2012 06:15:21 +0000 Subject: [PATCH 1/2] Fix remote Search displaying errors on UI --- openlp/core/lib/mediamanageritem.py | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 6 ++++-- openlp/plugins/custom/lib/mediaitem.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 2 +- openlp/plugins/media/lib/mediaitem.py | 2 +- openlp/plugins/presentations/lib/mediaitem.py | 2 +- openlp/plugins/remotes/lib/httpserver.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index cb77f45ad..d597fcc66 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -641,7 +641,7 @@ class MediaManagerItem(QtGui.QWidget): if item: self.autoSelectId = item.data(QtCore.Qt.UserRole).toInt()[0] - def search(self, string): + def search(self, string, showError=True): """ Performs a plugin specific search for items containing ``string`` """ diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 245d31a80..223229fd6 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -1013,6 +1013,7 @@ class BibleMediaItem(MediaManagerItem): The verse number (int). """ verse_separator = get_reference_separator(u'sep_v_display') + if not self.settings.show_new_chapters or old_chapter != chapter: verse_text = unicode(chapter) + verse_separator + unicode(verse) else: verse_text = unicode(verse) @@ -1024,12 +1025,13 @@ class BibleMediaItem(MediaManagerItem): return u'{su}[%s]{/su}' % verse_text return u'{su}%s{/su}' % verse_text - def search(self, string): + def search(self, string, showError): """ Search for some Bible verses (by reference). """ bible = unicode(self.quickVersionComboBox.currentText()) - search_results = self.plugin.manager.get_verses(bible, string, False) + search_results = self.plugin.manager.get_verses(bible, string, False, + showError) if search_results: versetext = u' '.join([verse.text for verse in search_results]) return [[string, versetext]] diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 443c95f56..cbb5a9fc4 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -267,7 +267,7 @@ class CustomMediaItem(MediaManagerItem): self.searchTextEdit.clear() self.onSearchTextButtonClick() - def search(self, string): + def search(self, string, showError): search_results = self.manager.get_all_objects(CustomSlide, or_(func.lower(CustomSlide.title).like(u'%' + string.lower() + u'%'), diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 80d6360a8..75ace5d6f 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -234,7 +234,7 @@ class ImageMediaItem(MediaManagerItem): 'There was a problem replacing your background, ' 'the image file "%s" no longer exists.')) % filename) - def search(self, string): + def search(self, string, showError): files = SettingsManager.load_list(self.settingsSection, u'images') results = [] string = string.lower() diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index d0aec2691..60518a09e 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -310,7 +310,7 @@ class MediaMediaItem(MediaManagerItem): media = filter(lambda x: os.path.splitext(x)[1] in ext, media) return media - def search(self, string): + def search(self, string, showError): files = SettingsManager.load_list(self.settingsSection, u'media') results = [] string = string.lower() diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 03fdadb1b..3f9c81fc7 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -322,7 +322,7 @@ class PresentationMediaItem(MediaManagerItem): return controller return None - def search(self, string): + def search(self, string, showError): files = SettingsManager.load_list( self.settingsSection, u'presentations') results = [] diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index bdef88720..8daa1c7b0 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -522,7 +522,7 @@ class HttpConnection(object): plugin = self.parent.plugin.pluginManager.get_plugin_by_name(type) if plugin.status == PluginStatus.Active and \ plugin.mediaItem and plugin.mediaItem.hasSearch: - results = plugin.mediaItem.search(text) + results = plugin.mediaItem.search(text, False) else: results = [] return HttpResponse( diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 34a54dee4..8ad9b33ab 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -586,7 +586,7 @@ class SongMediaItem(MediaManagerItem): Receiver.send_message(u'service_item_update', u'%s:%s:%s' % (editId, item._uuid, temporary)) - def search(self, string): + def search(self, string, showError): """ Search for some songs """ From b29f10da0b7d5e59b1e34e3885106ec29748c1ca Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 15 Mar 2012 16:57:23 +0000 Subject: [PATCH 2/2] Remove file --- .idea/inspectionProfiles/profiles_settings.xml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index c60c33bb4..000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file