forked from openlp/openlp
Put the messagelistener back
This commit is contained in:
Tim Bentley
parent
17a08e3847
commit
377f3ad6ea
|
|
@ -4,8 +4,8 @@
|
|||
###############################################################################
|
||||
# OpenLP - Open Source Lyrics Projection #
|
||||
# --------------------------------------------------------------------------- #
|
||||
# Copyright (c) 2008-2009 Raoul Snyman #
|
||||
# Portions copyright (c) 2008-2009 Tim Bentley, Jonathan Corwin, Michael #
|
||||
# Copyright (c) 2008-2010 Raoul Snyman #
|
||||
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
|
||||
# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
||||
# Carsten Tinggaard #
|
||||
# --------------------------------------------------------------------------- #
|
||||
|
|
@ -30,6 +30,118 @@ from PyQt4 import QtCore
|
|||
|
||||
from openlp.core.lib import Receiver
|
||||
|
||||
class Controller(object):
|
||||
"""
|
||||
This is the Presentation listener who acts on events from the slide
|
||||
controller and passes the messages on the the correct presentation handlers
|
||||
"""
|
||||
global log
|
||||
log = logging.getLogger(u'Controller')
|
||||
log.info(u'Controller loaded')
|
||||
|
||||
def __init__(self, live):
|
||||
self.isLive = live
|
||||
log.info(u'%s controller loaded' % live)
|
||||
|
||||
def addHandler(self, controller, file):
|
||||
log.debug(u'Live = %s, addHandler %s' % (self.isLive, file))
|
||||
self.controller = controller
|
||||
if self.controller.is_loaded():
|
||||
self.shutdown()
|
||||
self.controller.load_presentation(file)
|
||||
if self.isLive:
|
||||
self.controller.start_presentation()
|
||||
Receiver.send_message(u'live_slide_hide')
|
||||
self.controller.slidenumber = 0
|
||||
|
||||
def activate(self):
|
||||
log.debug(u'Live = %s, activate' % self.isLive)
|
||||
if self.controller.is_active():
|
||||
return
|
||||
if not self.controller.is_loaded():
|
||||
self.controller.load_presentation(self.controller.filepath)
|
||||
if self.isLive:
|
||||
self.controller.start_presentation()
|
||||
if self.controller.slidenumber > 1:
|
||||
self.controller.goto_slide(self.controller.slidenumber)
|
||||
|
||||
def slide(self, slide, live):
|
||||
log.debug(u'Live = %s, slide' % live)
|
||||
# if not isLive:
|
||||
# return
|
||||
self.activate()
|
||||
self.controller.goto_slide(int(slide) + 1)
|
||||
self.controller.poll_slidenumber(live)
|
||||
|
||||
def first(self):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the first slide
|
||||
"""
|
||||
log.debug(u'Live = %s, first' % self.isLive)
|
||||
if not self.isLive:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.start_presentation()
|
||||
self.controller.poll_slidenumber(self.isLive)
|
||||
|
||||
def last(self):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the first slide
|
||||
"""
|
||||
log.debug(u'Live = %s, last' % self.isLive)
|
||||
if not self.isLive:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.goto_slide(self.controller.get_slide_count())
|
||||
self.controller.poll_slidenumber(self.isLive)
|
||||
|
||||
def next(self):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the next slide event
|
||||
"""
|
||||
log.debug(u'Live = %s, next' % self.isLive)
|
||||
if not self.isLive:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.next_step()
|
||||
self.controller.poll_slidenumber(self.isLive)
|
||||
|
||||
def previous(self):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the previous slide event
|
||||
"""
|
||||
log.debug(u'Live = %s, previous' % self.isLive)
|
||||
if not self.isLive:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.previous_step()
|
||||
self.controller.poll_slidenumber(self.isLive)
|
||||
|
||||
def shutdown(self):
|
||||
"""
|
||||
Based on the handler passed at startup triggers slide show to shut down
|
||||
"""
|
||||
log.debug(u'Live = %s, shutdown' % self.isLive)
|
||||
self.controller.close_presentation()
|
||||
self.controller.slidenumber = 0
|
||||
#self.timer.stop()
|
||||
|
||||
def blank(self):
|
||||
if not self.isLive:
|
||||
return
|
||||
if not self.controller.is_loaded():
|
||||
return
|
||||
if not self.controller.is_active():
|
||||
return
|
||||
self.controller.blank_screen()
|
||||
|
||||
def unblank(self):
|
||||
if not self.is_live:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.unblank_screen()
|
||||
|
||||
|
||||
class MessageListener(object):
|
||||
"""
|
||||
This is the Presentation listener who acts on events from the slide
|
||||
|
|
@ -41,8 +153,8 @@ class MessageListener(object):
|
|||
|
||||
def __init__(self, controllers):
|
||||
self.controllers = controllers
|
||||
self.handler = None
|
||||
self.is_live = None
|
||||
self.previewHandler = Controller(False)
|
||||
self.liveHandler = Controller(True)
|
||||
# messages are sent from core.ui.slidecontroller
|
||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||
QtCore.SIGNAL(u'presentations_start'), self.startup)
|
||||
|
|
@ -71,133 +183,62 @@ class MessageListener(object):
|
|||
Start of new presentation
|
||||
Save the handler as any new presentations start here
|
||||
"""
|
||||
log.debug(u'startup %s ' % message)
|
||||
self.handler, file, self.is_live = self.decodeMessage(message)
|
||||
self.controller = self.controllers[self.handler]
|
||||
if self.controller.is_loaded():
|
||||
self.shutdown(None)
|
||||
print "aaa ", self.is_live
|
||||
self.controller.load_presentation(file)
|
||||
if self.is_live:
|
||||
self.controller.start_presentation()
|
||||
Receiver.send_message(u'live_slide_hide')
|
||||
self.controller.slidenumber = 0
|
||||
self.timer.start()
|
||||
|
||||
def activate(self):
|
||||
log.debug(u'activate')
|
||||
if self.controller.is_active():
|
||||
return
|
||||
if not self.controller.is_loaded():
|
||||
self.controller.load_presentation(self.controller.filepath)
|
||||
log.debug(u'activate 2')
|
||||
print "activate 2"
|
||||
self.controller.start_presentation()
|
||||
log.debug(u'activate 3')
|
||||
print "activate 3"
|
||||
if self.controller.slidenumber > 1:
|
||||
self.controller.goto_slide(self.controller.slidenumber)
|
||||
log.debug(u'Startup called with message %s' % message)
|
||||
self.handler, file, isLive = self.decodeMessage(message)
|
||||
if isLive:
|
||||
self.liveHandler.addHandler(self.controllers[self.handler], file)
|
||||
else:
|
||||
self.previewHandler.addHandler(self.controllers[self.handler], file)
|
||||
|
||||
def slide(self, message):
|
||||
log.debug(u'slide %s ' % message)
|
||||
#Not wanted for preview frame
|
||||
if not self.is_live:
|
||||
return
|
||||
slide, live = self.splitMessage(message)
|
||||
self.activate()
|
||||
print ">>> ", message
|
||||
if message:
|
||||
print message[0], self.is_live
|
||||
self.controller.goto_slide(int(slide) + 1)
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
if live:
|
||||
self.liveHandler.slide(slide, live)
|
||||
else:
|
||||
self.previewHandler.slide(slide, live)
|
||||
|
||||
def first(self, message):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the first slide
|
||||
"""
|
||||
log.debug(u'first %s ' % message)
|
||||
#Not wanted for preview frame
|
||||
if not self.is_live:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.start_presentation()
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
def first(self, isLive):
|
||||
if isLive:
|
||||
self.liveHandler.first()
|
||||
else:
|
||||
self.previewHandler.first()
|
||||
|
||||
def last(self, message):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the first slide
|
||||
"""
|
||||
log.debug(u'last %s ' % message)
|
||||
#Not wanted for preview frame
|
||||
if not self.is_live:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.goto_slide(self.controller.get_slide_count())
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
def last(self, isLive):
|
||||
if isLive:
|
||||
self.liveHandler.last()
|
||||
else:
|
||||
self.previewHandler.last()
|
||||
|
||||
def next(self, message):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the next slide event
|
||||
"""
|
||||
log.debug(u'next ', message)
|
||||
#Not wanted for preview frame
|
||||
if not self.is_live:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.next_step()
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
def next(self, isLive):
|
||||
if isLive:
|
||||
self.liveHandler.next()
|
||||
else:
|
||||
self.previewHandler.next()
|
||||
|
||||
def previous(self, message):
|
||||
"""
|
||||
Based on the handler passed at startup triggers the previous slide event
|
||||
"""
|
||||
log.debug(u'previous %s' % message)
|
||||
if not self.is_live:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.previous_step()
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
def previous(self, isLive):
|
||||
if isLive:
|
||||
self.liveHandler.previous()
|
||||
else:
|
||||
self.previewHandler.previous()
|
||||
|
||||
def shutdown(self, message):
|
||||
"""
|
||||
Based on the handler passed at startup triggers slide show to shut down
|
||||
"""
|
||||
log.debug(u'shutdown %s ' % message)
|
||||
if self.is_live:
|
||||
def shutdown(self, isLive):
|
||||
if isLive:
|
||||
self.liveHandler.shutdown()
|
||||
Receiver.send_message(u'live_slide_show')
|
||||
self.controller.close_presentation()
|
||||
self.controller.slidenumber = 0
|
||||
self.timer.stop()
|
||||
else:
|
||||
self.previewHandler.shutdown()
|
||||
|
||||
def blank(self):
|
||||
log.debug(u'blank')
|
||||
if not self.is_live:
|
||||
return
|
||||
if not self.controller.is_loaded():
|
||||
return
|
||||
if not self.controller.is_active():
|
||||
return
|
||||
self.controller.blank_screen()
|
||||
if self.isLive:
|
||||
self.liveHandler.blank()
|
||||
else:
|
||||
self.previewHandler.blank()
|
||||
|
||||
def unblank(self):
|
||||
log.debug(u'unblank')
|
||||
if not self.is_live:
|
||||
return
|
||||
self.activate()
|
||||
self.controller.unblank_screen()
|
||||
|
||||
def decodeMessage(self, message):
|
||||
"""
|
||||
Splits the message from the SlideController into it's component parts
|
||||
|
||||
``message``
|
||||
Message containing Presentaion handler name and file to be presented.
|
||||
"""
|
||||
file = os.path.join(message[1], message[2])
|
||||
return message[0], file, message[4]
|
||||
|
||||
def timeout(self):
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
if self.isLive:
|
||||
self.liveHandler.unblank()
|
||||
else:
|
||||
self.previewHandler.unblank()
|
||||
|
||||
def splitMessage(self, message):
|
||||
"""
|
||||
|
|
@ -209,3 +250,17 @@ class MessageListener(object):
|
|||
"""
|
||||
bits = message.split(u':')
|
||||
return bits[0], bits[1]
|
||||
|
||||
def decodeMessage(self, message):
|
||||
"""
|
||||
Splits the initial message from the SlideController
|
||||
into it's component parts
|
||||
|
||||
``message``
|
||||
Message containing Presentaion handler name and file to be presented.
|
||||
"""
|
||||
file = os.path.join(message[1], message[2])
|
||||
return message[0], file, message[4]
|
||||
|
||||
def timeout(self):
|
||||
self.controller.poll_slidenumber(self.is_live)
|
||||
|
|
|
|||
Loading…
Reference in New Issue