forked from openlp/openlp
Fix presentation array issue
This commit is contained in:
parent
5d90e86f94
commit
43b7951693
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user