forked from openlp/openlp
presentation fixes
bzr-revno: 548
This commit is contained in:
commit
dcc52fd8f7
@ -63,7 +63,7 @@ class RenderManager(object):
|
|||||||
else:
|
else:
|
||||||
self.current_display = screen_number
|
self.current_display = screen_number
|
||||||
self.renderer = Renderer()
|
self.renderer = Renderer()
|
||||||
#self.calculate_default(self.screen_list[self.current_display][u'size'])
|
self.calculate_default(self.screen_list[self.current_display][u'size'])
|
||||||
self.theme = u''
|
self.theme = u''
|
||||||
self.service_theme = u''
|
self.service_theme = u''
|
||||||
self.global_style = u''
|
self.global_style = u''
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ class ImpressController(object):
|
|||||||
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 = []
|
||||||
|
@ -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
|
|
||||||
|
Loading…
Reference in New Issue
Block a user