openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/present into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


A few more small presentation fixes/cosmetics
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/19582
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2010-02-02 18:16:11 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2010-02-18 09:35:21 +0000
@@ -201,7 +201,7 @@
             try:
                 ctx = resolver.resolve(u'uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext')
             except:
-                log.exception(u'Unable to fine running instance ')
+                log.exception(u'Unable to find running instance ')
                 self.start_process()
                 loop += 1
         try:
@@ -233,8 +233,8 @@
     def close_presentation(self):
         """
         Close presentation and clean up objects
-        Triggerent by new object being added to SlideController orOpenLP
-        being shut down
+        Triggered by new object being added to SlideController or OpenLP
+        being shutdown
         """
         log.debug(u'close Presentation OpenOffice')
         if self.document:

=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2010-02-01 20:06:50 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2010-02-18 09:35:21 +0000
@@ -67,8 +67,8 @@
 
     def slide(self, slide, live):
         log.debug(u'Live = %s, slide' % live)
-#        if not isLive:
-#            return
+        if not live:
+            return
         self.activate()
         self.controller.goto_slide(int(slide) + 1)
         self.controller.poll_slidenumber(live)
@@ -136,11 +136,13 @@
         self.controller.blank_screen()
 
     def unblank(self):
-        if not self.is_live:
+        if not self.isLive:
             return
         self.activate()
         self.controller.unblank_screen()
 
+    def poll(self):
+        self.controller.poll_slidenumber(self.isLive)
 
 class MessageListener(object):
     """
@@ -229,16 +231,10 @@
             self.previewHandler.shutdown()
 
     def blank(self):
-        if self.isLive:
-            self.liveHandler.blank()
-        else:
-            self.previewHandler.blank()
+        self.liveHandler.blank()
 
     def unblank(self):
-        if self.isLive:
-            self.liveHandler.unblank()
-        else:
-            self.previewHandler.unblank()
+        self.liveHandler.unblank()
 
     def splitMessage(self, message):
         """
@@ -263,4 +259,4 @@
         return message[0], file, message[4]
 
     def timeout(self):
-        self.controller.poll_slidenumber(self.is_live)
+        self.liveHandler.poll()