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)
Related bugs:
  #598361 AttributeError: 'NoneType' object has no attribute 'isPaused'
  https://bugs.launchpad.net/bugs/598361


TRB143 needs to change the water in his mop bucket more often if he wants to clean as well as Meths!
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/29241
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/present into lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2010-06-27 22:34:33 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2010-07-05 22:23:28 +0000
@@ -222,7 +222,7 @@
             return
         self.presentation = self.document.getPresentation()
         self.presentation.Display = \
-            self.controller.plugin.render_manager.screens.current_display + 1
+            self.controller.plugin.renderManager.screens.current_display + 1
         self.control = None
         self.create_thumbnails()
 

=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2010-07-05 16:00:48 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2010-07-05 22:23:28 +0000
@@ -173,7 +173,7 @@
         return True
 
 
-    def isActive(self):
+    def is_active(self):
         """
         Returns true if a presentation is currently active
         """
@@ -206,7 +206,7 @@
         """
         Returns true if screen is blank
         """
-        if self.isActive():
+        if self.is_active():
             return self.presentation.SlideShowWindow.View.State == 3
         else:
             return False
@@ -233,7 +233,7 @@
                     dpi = 96
             self.presentation.SlideShowSettings.Run()
             self.presentation.SlideShowWindow.View.GotoSlide(1)
-            rendermanager = self.controller.plugin.render_manager
+            rendermanager = self.controller.plugin.renderManager
             rect = rendermanager.screens.current[u'size']
             self.presentation.SlideShowWindow.Top = rect.y() * 72 / dpi
             self.presentation.SlideShowWindow.Height = rect.height() * 72 / dpi