Merge lp:~j-corwin/openlp/presentations into lp:openlp

[Jonathan Corwin]

[Jonathan Corwin (j-corwin)]

Got powerpoint viewer working!

[lp:~j-corwin/openlp/presentations]

570. By Jon Tibble on 2009-09-25

PPTViewer fixes

571. By Jon Tibble on 2009-09-25

Imports clean up

572. By Tim Bentley on 2009-09-25

Plugin changes to Audit, Song and Custom

573. By Jon Tibble on 2009-09-26

None testing and clean ups

574. By Tim Bentley on 2009-09-26

Plugin updates

575. By Jonathan Corwin on 2009-09-27

Jons Presentation merge with hack to fix conflicts

576. By Tim Bentley on 2009-09-27

Audit changes and cleanups

577. By Jonathan Corwin on 2009-09-28

Presentation merge with gotos

578. By Jon Tibble on 2009-09-28

Fix presentation starting

579. By Jonathan Corwin on 2009-09-29

Controllers are now completely self contained.

580. By Jonathan Corwin on 2009-09-29

Reinstate lost import

Unmerged revisions

580. By Jonathan Corwin on 2009-09-29

Reinstate lost import

579. By Jonathan Corwin on 2009-09-29

Controllers are now completely self contained.

=== modified file 'openlp/plugins/presentations/lib/__init__.py'
--- openlp/plugins/presentations/lib/__init__.py	2009-09-24 18:46:16 +0000
+++ openlp/plugins/presentations/lib/__init__.py	2009-09-24 21:48:12 +0000
@@ -21,6 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+
 import os
 
 from impresscontroller import ImpressController

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2009-09-24 07:35:30 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2009-09-24 21:48:12 +0000
@@ -27,6 +27,7 @@
 import time
 import sys
 import win32api
+
 from ctypes import *
 from ctypes.wintypes import RECT
 
@@ -72,19 +73,16 @@
         and started.
 
         ``presentation``
-        The file name of the presentatios to the run.
+        The file name of the presentations to run.
         """
         log.debug(u'LoadPresentation')
-        if(self.pptid>=0):
-            self.CloseClick()
-        rect = RECT()
-        rect.left = 0
-        rect.top = 0
-        rect.width = 0
-        rect.hight = 0
+        if self.pptid >= 0:
+            self.closePresentation()
+        rect = RECT(0, 0, 800, 600) # until such time I can get screen info
+        filename = str(presentation.replace(u'/', u'\\'));
         try:
-            tempfolder = None #r'c:\temp\pptviewlib\' + presentation
-            self.pptid = self.presentation.OpenPPT(presentation, None, rect, tempfolder)
+            tempfolder = None #r'c:\temp\pptviewlib\' + filename.split('u\\')[-1]
+            self.pptid = self.presentation.OpenPPT(filename, None, rect, tempfolder)
         except:
             log.exception(u'Failed to load presentation')
         #self.slidecount = pptdll.GetSlideCount(self.pptid)
@@ -95,62 +93,95 @@
         Triggerent by new object being added to SlideController orOpenLP
         being shut down
         """
-        if(self.pptid<0): return
-        self.presentation.Close(self.pptid)
+        if self.pptid < 0:
+            return
+        self.presentation.ClosePPT(self.pptid)
         self.pptid = -1
 
+    def nextStep(self):
+        """
+        Triggers the next effect of slide on the running presentation
+        """
+        if self.pptid < 0:
+            return
+        self.presentation.NextStep(self.pptid)
+
+    def previousStep(self):
+        """
+        Triggers the previous slide on the running presentation
+        """
+        if self.pptid < 0:
+            return
+        self.presentation.PrevStep(self.pptid)
+
     def isActive(self):
+        """
+        Returns true if a presentation is currently active
+        """
         return self.pptid >= 0
 
     def resume(self):
-        if(self.pptid<0): return
+        """
+        Resumes a previously paused presentation
+        """
+        if self.pptid < 0:
+            return
         self.presentation.Resume(self.pptid)
 
     def pause(self):
+        """
+        Not implemented (pauses a presentation)
+        """
         return
 
     def blankScreen(self):
-        if(self.pptid<0): return
+        """
+        Blanks the screen
+        """
+        if self.pptid < 0:
+            return
         self.presentation.Blank(self.pptid)
 
     def unblankScreen(self):
-        if(self.pptid<0): return
+        """
+        Unblanks (restores) the presentationn
+        """
+        if self.pptid < 0:
+            return
         self.presentation.Unblank(self.pptid)
 
     def stop(self):
-        if(self.pptid<0): return
+        """
+        Stops the current presentation and hides the output
+        """
+        if self.pptid < 0:
+            return
         self.presentation.Stop(self.pptid)
 
     def go(self):
-        if(self.pptid<0): return
+        """
+        Starts a presentation from the beginning
+        """
+        if self.pptid < 0:
+            return
         self.presentation.RestartShow(self.pptid)
 
     def getSlideNumber(self):
-        if(self.pptid<0): return -1
+        """
+        Returns the current slide number
+        """
+        if self.pptid < 0:
+            return -1
         return self.presentation.GetCurrentSlide(self.pptid)
 
     def setSlideNumber(self, slideno):
-        if(self.pptid<0): return
+        """
+        Moves to a specific slide in the presentation
+        """
+        if self.pptid < 0:
+            return
         self.presentation.GotoSlide(self.pptid, slideno)
 
     slideNumber = property(getSlideNumber, setSlideNumber)
 
-    def nextStep(self):
-        """
-        Triggers the next effect of slide on the running presentation
-        """
-        if(self.pptid<0): return
-        self.presentation.NextStep(self.pptid)
-
-    def previousStep(self):
-        """
-        Triggers the previous slide on the running presentation
-        """
-        if self.pptid<0: return
-        self.presentation.PrevStep(self.pptid)
-
-    def NextClick(self):
-        if(self.pptid<0): return
-        pptdll.NextStep(self.pptid)
-        self.slideEdit.setText(pptdll.GetCurrentSlide(self.pptid))