forked from openlp/openlp
fixes
This commit is contained in:
parent
1613610853
commit
bfee664c94
@ -412,9 +412,13 @@ class SlideController(QtGui.QWidget):
|
|||||||
if item.is_media():
|
if item.is_media():
|
||||||
self.onMediaStart(item)
|
self.onMediaStart(item)
|
||||||
elif item.is_command():
|
elif item.is_command():
|
||||||
|
if self.isLive:
|
||||||
|
blanked = self.blankButton.isChecked()
|
||||||
|
else:
|
||||||
|
blanked = False
|
||||||
Receiver.send_message(u'%s_start' % item.name.lower(), \
|
Receiver.send_message(u'%s_start' % item.name.lower(), \
|
||||||
[item.title, item.service_item_path,
|
[item.title, item.service_item_path,
|
||||||
item.get_frame_title(), slideno, self.isLive, self.blankButton.isChecked()])
|
item.get_frame_title(), slideno, self.isLive, blanked])
|
||||||
self.displayServiceManagerItems(item, slideno)
|
self.displayServiceManagerItems(item, slideno)
|
||||||
|
|
||||||
def displayServiceManagerItems(self, serviceItem, slideno):
|
def displayServiceManagerItems(self, serviceItem, slideno):
|
||||||
|
@ -220,9 +220,10 @@ class MessageListener(object):
|
|||||||
return
|
return
|
||||||
|
|
||||||
if isLive:
|
if isLive:
|
||||||
self.liveHandler.addHandler(self.controllers[self.handler], file, isBlank)
|
controller = self.liveHandler
|
||||||
else:
|
else:
|
||||||
self.previewHandler.addHandler(self.controllers[self.handler], file)
|
controller = self.previewHandler
|
||||||
|
controller.addHandler(self.controllers[self.handler], file, isBlank)
|
||||||
|
|
||||||
def slide(self, message):
|
def slide(self, message):
|
||||||
slide, live = self.splitMessage(message)
|
slide, live = self.splitMessage(message)
|
||||||
|
Loading…
Reference in New Issue
Block a user