From 9fe4e6fc6daad22b6d31efcd8acac23e1fcb7233 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 2 Feb 2011 13:02:18 +0100 Subject: [PATCH 1/2] --- openlp/core/lib/mediamanageritem.py | 1 + openlp/core/lib/serviceitem.py | 4 ++++ openlp/plugins/images/lib/mediaitem.py | 1 + 3 files changed, 6 insertions(+) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 7bbdb4f06..d2d70225c 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -507,6 +507,7 @@ class MediaManagerItem(QtGui.QWidget): 'No Service Item Selected'), translate('OpenLP.MediaManagerItem', 'You must select an existing service item to add to.')) + # Needs fixing. elif self.title.lower() == serviceItem.name.lower(): self.generateSlideData(serviceItem) self.parent.serviceManager.addServiceItem(serviceItem, diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index c74b89144..299761689 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -314,6 +314,8 @@ class ServiceItem(object): self.add_from_command( path, text_image[u'title'], text_image[u'image'] ) self._new_item() + print self.shortname + print self.from_plugin def get_display_title(self): """ @@ -328,6 +330,8 @@ class ServiceItem(object): return self.title else: return self._raw_frames[0][u'title'] + print self.shortname + print self.from_plugin def merge(self, other): """ diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 25d9811f1..bc8a9b7e6 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -182,6 +182,7 @@ class ImageMediaItem(MediaManagerItem): filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) (path, name) = os.path.split(filename) service_item.add_from_image(filename, name) + print self.shortname return True else: return False From 31a451274b46fa611fb327bdfc62dca2283107f0 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 2 Feb 2011 14:22:43 +0100 Subject: [PATCH 2/2] fixed double white space --- openlp/core/lib/mediamanageritem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index ce8178f8e..39c37e2a9 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -245,7 +245,7 @@ class MediaManagerItem(QtGui.QWidget): preview_string[u'title'], preview_string[u'tooltip'], u':/general/general_preview.png', self.onPreviewClick) - ## Live Button ## + ## Live Button ## live_string = self.plugin.getString(StringContent.Live) self.addToolbarButton( live_string[u'title'],