From 43b7951693d12b157be0fce977d4d8cebbccf9ed Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 18 Sep 2009 07:07:10 +0100 Subject: [PATCH] Fix presentation array issue --- openlp/core/ui/slidecontroller.py | 4 ++-- openlp/plugins/presentations/lib/impresscontroller.py | 6 +++--- openlp/plugins/presentations/lib/messagelistener.py | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 393f48388..33c652389 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -254,7 +254,7 @@ class SlideController(QtGui.QWidget): self.enableToolBar(item) if item.service_item_type == ServiceType.Command: Receiver().send_message(u'%s_start'%item.name.lower(), \ - u'%s:%s:%s' % (item.shortname, item.service_item_path, item.service_frames[0][u'title'])) + [item.shortname, item.service_item_path, item.service_frames[0][u'title']]) else: self.displayServiceManagerItems(item, 0) @@ -272,7 +272,7 @@ class SlideController(QtGui.QWidget): self.enableToolBar(item) if item.service_item_type == ServiceType.Command: Receiver().send_message(u'%s_start'%item.name.lower(), \ - u'%s:%s:%s' % (item.shortname, item.service_item_path, item.service_frames[0][u'title'])) + [item.shortname, item.service_item_path, item.service_frames[0][u'title']]) else: self.displayServiceManagerItems(item, slideno) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index dbcf4c0a4..935dddaaa 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -89,12 +89,12 @@ class ImpressController(object): log.debug(u'LoadPresentation') if os.name == u'nt': desktop = self.getCOMDesktop() - url = u'file:///' + presentation.replace(u'\\', u'/').replace(u':', u'|').replace(u' ', u'%20') + url = u'file:///' + presentation.replace(u'\\', u'/').replace(u':', u'|').replace(u' ', u'%20') else: desktop = self.getUNODesktop() url = uno.systemPathToFileUrl(presentation) - if(desktop==None): - return + if desktop==None: + return try: properties = [] properties = tuple(properties) diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index d18b93a02..b34db57e2 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -83,6 +83,5 @@ class MessageListener(object): ``message`` Message containing Presentaion handler name and file to be presented. """ - bits = message.split(u':') - file = os.path.join(bits[1], bits[2]) - return bits[0], file + file = os.path.join(message[1], message[2]) + return message[0], file