Presentation cleanup - finished for now

This commit is contained in:
Tim Bentley 2009-12-14 17:05:53 +00:00
parent 1271eac76e
commit 2f09c70274
1 changed files with 8 additions and 10 deletions

View File

@ -65,15 +65,13 @@ class Controller(object):
if self.controller.slidenumber > 1: if self.controller.slidenumber > 1:
self.controller.goto_slide(self.controller.slidenumber) self.controller.goto_slide(self.controller.slidenumber)
def slide(self, message): def slide(self, slide, live):
log.debug(u'Live = %s, slide' % self.isLive) log.debug(u'Live = %s, slide' % live)
print "slide ", message # if not isLive:
if not self.isLive: # return
return
self.activate() self.activate()
if message: self.controller.goto_slide(int(slide) + 1)
self.controller.goto_slide(message[0] + 1) self.controller.poll_slidenumber(live)
self.controller.poll_slidenumber(self.isLive)
def first(self, message): def first(self, message):
""" """
@ -200,9 +198,9 @@ class MessageListener(object):
def slide(self, message): def slide(self, message):
slide, live = self.splitMessage(message) slide, live = self.splitMessage(message)
if live: if live:
self.liveHandler.activate() self.liveHandler.slide(slide, live)
else: else:
self.previewHandler.activate() self.previewHandler.slide(slide, live)
def first(self, message): def first(self, message):
if self.isLive: if self.isLive: