raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix presentation array issue

This commit is contained in:
Tim Bentley 2009-09-18 07:07:10 +01:00
parent 5d90e86f94
commit 43b7951693
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/slidecontroller.py
View File

@ -254,7 +254,7 @@ class SlideController(QtGui.QWidget):
self.enableToolBar(item) self.enableToolBar(item)
if item.service_item_type == ServiceType.Command: if item.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_start'%item.name.lower(), \ 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: else:
self.displayServiceManagerItems(item, 0) self.displayServiceManagerItems(item, 0)
@ -272,7 +272,7 @@ class SlideController(QtGui.QWidget):
self.enableToolBar(item) self.enableToolBar(item)
if item.service_item_type == ServiceType.Command: if item.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_start'%item.name.lower(), \ 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: else:
self.displayServiceManagerItems(item, slideno) self.displayServiceManagerItems(item, slideno)

6
openlp/plugins/presentations/lib/impresscontroller.py
View File

@ -89,12 +89,12 @@ class ImpressController(object):
log.debug(u'LoadPresentation') log.debug(u'LoadPresentation')
if os.name == u'nt': if os.name == u'nt':
desktop = self.getCOMDesktop() 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: else:
desktop = self.getUNODesktop() desktop = self.getUNODesktop()
url = uno.systemPathToFileUrl(presentation) url = uno.systemPathToFileUrl(presentation)
if(desktop==None): if desktop==None:
return return
try: try:
properties = [] properties = []
properties = tuple(properties) properties = tuple(properties)

5
openlp/plugins/presentations/lib/messagelistener.py
View File

@ -83,6 +83,5 @@ class MessageListener(object):
``message`` ``message``
Message containing Presentaion handler name and file to be presented. Message containing Presentaion handler name and file to be presented.
""" """
bits = message.split(u':') file = os.path.join(message[1], message[2])
file = os.path.join(bits[1], bits[2]) return message[0], file
return bits[0], file