From 24041c7f17a7b772a30ac91744ccf33e850aabbf Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Thu, 11 Oct 2012 23:03:54 +0100
Subject: [PATCH 1/7] Presentation error traps

---
 .../presentations/lib/impresscontroller.py    |  4 ++
 .../presentations/lib/messagelistener.py      | 50 ++++++++++++++++---
 .../presentations/lib/powerpointcontroller.py |  6 ++-
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index a85f43592..ceb793cb2 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -155,6 +155,8 @@ class ImpressController(PresentationController):
             desktop = self.manager.createInstance(u'com.sun.star.frame.Desktop')
         except AttributeError:
             log.warn(u'Failure to find desktop - Impress may have closed')
+        except pywintypes.com_error:
+            log.warn(u'Failure to find desktop - Impress may have closed')
         return desktop if desktop else None
 
     def get_com_servicemanager(self):
@@ -284,6 +286,8 @@ class ImpressDocument(PresentationDocument):
         props = tuple(props)
         doc = self.document
         pages = doc.getDrawPages()
+        if not pages:
+            return
         if not os.path.isdir(self.get_temp_folder()):
             os.makedirs(self.get_temp_folder())
         for idx in range(pages.getCount()):
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index cb8f7b7b8..dc8ac79d1 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -88,29 +88,40 @@ class Controller(object):
         Use the last slide number.
         """
         log.debug(u'Live = %s, activate' % self.is_live)
+        if not self.doc:
+            return False
         if self.doc.is_active():
-            return
+            return True
         if not self.doc.is_loaded():
             if not self.doc.load_presentation():
-                return
+                log.warn(u'Failed to activate %s' % self.doc.filepath)
+                return False
         if self.is_live:
             self.doc.start_presentation()
             if self.doc.slidenumber > 1:
                 if self.doc.slidenumber > self.doc.get_slide_count():
                     self.doc.slidenumber = self.doc.get_slide_count()
                 self.doc.goto_slide(self.doc.slidenumber)
+        if self.doc.is_active():
+            return True
+        else:
+            log.warn(u'Failed to activate %s' % self.doc.filepath)
+            return False
 
     def slide(self, slide):
         """
         Go to a specific slide
         """
         log.debug(u'Live = %s, slide' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if self.doc.is_blank():
             self.doc.slidenumber = int(slide) + 1
             return
-        self.activate()
+        if not self.activate():
+            return
         self.doc.goto_slide(int(slide) + 1)
         self.doc.poll_slidenumber(self.is_live)
 
@@ -119,12 +130,15 @@ class Controller(object):
         Based on the handler passed at startup triggers the first slide
         """
         log.debug(u'Live = %s, first' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if self.doc.is_blank():
             self.doc.slidenumber = 1
             return
-        self.activate()
+        if not self.activate():
+            return
         self.doc.start_presentation()
         self.doc.poll_slidenumber(self.is_live)
 
@@ -133,12 +147,15 @@ class Controller(object):
         Based on the handler passed at startup triggers the last slide
         """
         log.debug(u'Live = %s, last' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if self.doc.is_blank():
             self.doc.slidenumber = self.doc.get_slide_count()
             return
-        self.activate()
+        if not self.activate():
+            return
         self.doc.goto_slide(self.doc.get_slide_count())
         self.doc.poll_slidenumber(self.is_live)
 
@@ -147,6 +164,8 @@ class Controller(object):
         Based on the handler passed at startup triggers the next slide event
         """
         log.debug(u'Live = %s, next' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if self.doc.is_blank():
@@ -158,7 +177,8 @@ class Controller(object):
         # contain animations that need to be stepped through.
         if self.doc.slidenumber > self.doc.get_slide_count():
             return
-        self.activate()
+        if not self.activate():
+            return
         self.doc.next_step()
         self.doc.poll_slidenumber(self.is_live)
 
@@ -167,13 +187,16 @@ class Controller(object):
         Based on the handler passed at startup triggers the previous slide event
         """
         log.debug(u'Live = %s, previous' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if self.doc.is_blank():
             if self.doc.slidenumber > 1:
                 self.doc.slidenumber = self.doc.slidenumber - 1
             return
-        self.activate()
+        if not self.activate():
+            return
         self.doc.previous_step()
         self.doc.poll_slidenumber(self.is_live)
 
@@ -182,6 +205,8 @@ class Controller(object):
         Based on the handler passed at startup triggers slide show to shut down
         """
         log.debug(u'Live = %s, shutdown' % self.is_live)
+        if not self.doc:
+            return
         self.doc.close_presentation()
         self.doc = None
 
@@ -190,6 +215,8 @@ class Controller(object):
         Instruct the controller to blank the presentation
         """
         log.debug(u'Live = %s, blank' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if not self.doc.is_loaded():
@@ -205,6 +232,8 @@ class Controller(object):
         Instruct the controller to stop and hide the presentation
         """
         log.debug(u'Live = %s, stop' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
         if not self.doc.is_loaded():
@@ -218,9 +247,12 @@ class Controller(object):
         Instruct the controller to unblank the presentation
         """
         log.debug(u'Live = %s, unblank' % self.is_live)
+        if not self.doc:
+            return
         if not self.is_live:
             return
-        self.activate()
+        if not self.activate():
+            return
         if self.doc.slidenumber and \
             self.doc.slidenumber != self.doc.get_slide_number():
             self.doc.goto_slide(self.doc.slidenumber)
@@ -228,6 +260,8 @@ class Controller(object):
         Receiver.send_message(u'live_display_hide', HideMode.Screen)
 
     def poll(self):
+        if not self.doc:
+            return
         self.doc.poll_slidenumber(self.is_live)
 
 
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 54b9c2144..63183e7b5 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -94,9 +94,9 @@ class PowerpointController(PresentationController):
                 self.docs[0].close_presentation()
             if self.process is None:
                 return
-            if self.process.Presentations.Count > 0:
-                return
             try:
+                if self.process.Presentations.Count > 0:
+                    return
                 self.process.Quit()
             except pywintypes.com_error:
                 pass
@@ -253,6 +253,8 @@ class PowerpointDocument(PresentationDocument):
             renderer = self.controller.plugin.renderer
             rect = renderer.screens.current[u'size']
             ppt_window = self.presentation.SlideShowSettings.Run()
+            if not ppt_window:
+                return
             ppt_window.Top = rect.y() * 72 / dpi
             ppt_window.Height = rect.height() * 72 / dpi
             ppt_window.Left = rect.x() * 72 / dpi

From efef105c3facf0e02bb39202a846581b08321eb1 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 12 Oct 2012 20:15:36 +0100
Subject: [PATCH 2/7] ppt problems

---
 openlp/plugins/presentations/lib/powerpointcontroller.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 63183e7b5..c00c6d559 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -210,6 +210,13 @@ class PowerpointDocument(PresentationDocument):
         self.presentation.SlideShowSettings.Run()
         self.presentation.SlideShowWindow.View.State = 1
         self.presentation.SlideShowWindow.Activate()
+        if self.presentation.Application.Version == u'14.0':
+            # Unblanking is broken in PowerPoint 2010, need to redisplay
+            slide = self.presentation.SlideShowWindow.View.CurrentShowPosition
+            click = self.presentation.SlideShowWindow.View.GetClickIndex()
+            self.presentation.SlideShowWindow.View.GotoSlide(slide)
+            if click:
+                self.presentation.SlideShowWindow.View.GotoClick(click)
 
     def blank_screen(self):
         """

From c7e555e0e8660d71ae1edece85f981f9c807c32f Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 12 Oct 2012 22:33:10 +0100
Subject: [PATCH 3/7] Various end of show issues

---
 openlp/plugins/presentations/lib/impresscontroller.py  | 10 ++++++++--
 .../plugins/presentations/lib/powerpointcontroller.py  |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index ceb793cb2..b1c0bcc82 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -363,7 +363,9 @@ class ImpressDocument(PresentationDocument):
         log.debug(u'is active OpenOffice')
         if not self.is_loaded():
             return False
-        return self.control is not None
+        if not self.control:
+            return False
+        return self.control.isRunning()
 
     def unblank_screen(self):
         """
@@ -384,7 +386,7 @@ class ImpressDocument(PresentationDocument):
         Returns true if screen is blank
         """
         log.debug(u'is blank OpenOffice')
-        if self.control:
+        if self.control and self.control.isRunning():
             return self.control.isPaused()
         else:
             return False
@@ -440,7 +442,11 @@ class ImpressDocument(PresentationDocument):
         """
         Triggers the next effect of slide on the running presentation
         """
+        is_paused = self.control.isPaused()
         self.control.gotoNextEffect()
+        time.sleep(0.1)
+        if not is_paused and self.control.isPaused():
+            self.control.gotoPreviousEffect()
 
     def previous_step(self):
         """
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index c00c6d559..7da9a95d7 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -295,6 +295,8 @@ class PowerpointDocument(PresentationDocument):
         """
         log.debug(u'next_step')
         self.presentation.SlideShowWindow.View.Next()
+        if self.get_slide_number() > self.get_slide_count():
+            self.previous_step()
 
     def previous_step(self):
         """

From 0ddeef9d8ff19218e27b9d111918b9622819cea6 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 12 Oct 2012 23:13:58 +0100
Subject: [PATCH 4/7] Blank desktop issues

---
 .../presentations/lib/messagelistener.py      | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index dc8ac79d1..fdceda4ab 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -49,6 +49,7 @@ class Controller(object):
         """
         self.is_live = live
         self.doc = None
+        self.hide_mode = None
         log.info(u'%s controller loaded' % live)
 
     def add_handler(self, controller, file, hide_mode, slide_no):
@@ -67,6 +68,7 @@ class Controller(object):
             # Inform slidecontroller that the action failed?
             return
         self.doc.slidenumber = slide_no
+        self.hide_mode = hide_mode
         if self.is_live:
             if hide_mode == HideMode.Screen:
                 Receiver.send_message(u'live_display_hide', HideMode.Screen)
@@ -117,7 +119,7 @@ class Controller(object):
             return
         if not self.is_live:
             return
-        if self.doc.is_blank():
+        if self.hide_mode:
             self.doc.slidenumber = int(slide) + 1
             return
         if not self.activate():
@@ -134,7 +136,7 @@ class Controller(object):
             return
         if not self.is_live:
             return
-        if self.doc.is_blank():
+        if self.hide_mode:
             self.doc.slidenumber = 1
             return
         if not self.activate():
@@ -151,7 +153,7 @@ class Controller(object):
             return
         if not self.is_live:
             return
-        if self.doc.is_blank():
+        if self.hide_mode:
             self.doc.slidenumber = self.doc.get_slide_count()
             return
         if not self.activate():
@@ -168,7 +170,7 @@ class Controller(object):
             return
         if not self.is_live:
             return
-        if self.doc.is_blank():
+        if self.hide_mode:
             if self.doc.slidenumber < self.doc.get_slide_count():
                 self.doc.slidenumber = self.doc.slidenumber + 1
             return
@@ -191,7 +193,7 @@ class Controller(object):
             return
         if not self.is_live:
             return
-        if self.doc.is_blank():
+        if self.hide_mode:
             if self.doc.slidenumber > 1:
                 self.doc.slidenumber = self.doc.slidenumber - 1
             return
@@ -215,23 +217,28 @@ class Controller(object):
         Instruct the controller to blank the presentation
         """
         log.debug(u'Live = %s, blank' % self.is_live)
+        self.hide_mode = hide_mode
         if not self.doc:
             return
         if not self.is_live:
             return
-        if not self.doc.is_loaded():
-            return
-        if not self.doc.is_active():
-            return
         if hide_mode == HideMode.Theme:
+            if not self.doc.is_loaded():
+                return
+            if not self.doc.is_active():
+                return
             Receiver.send_message(u'live_display_hide', HideMode.Theme)
-        self.doc.blank_screen()
+        elif hide_mode == HideMode.Blank:
+            if not self.activate():
+                return
+            self.doc.blank_screen()
 
     def stop(self):
         """
         Instruct the controller to stop and hide the presentation
         """
         log.debug(u'Live = %s, stop' % self.is_live)
+        self.hide_mode = HideMode.Screen
         if not self.doc:
             return
         if not self.is_live:
@@ -247,6 +254,7 @@ class Controller(object):
         Instruct the controller to unblank the presentation
         """
         log.debug(u'Live = %s, unblank' % self.is_live)
+        self.hide_mode = None
         if not self.doc:
             return
         if not self.is_live:

From 4c1fe14fd2f018292eb15e2eff05c96fb94a86e6 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 13 Oct 2012 19:32:32 +0100
Subject: [PATCH 5/7] Raoul's kicks

---
 openlp/plugins/presentations/lib/impresscontroller.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index b1c0bcc82..3d78f7bdb 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -153,9 +153,7 @@ class ImpressController(PresentationController):
         desktop = None
         try:
             desktop = self.manager.createInstance(u'com.sun.star.frame.Desktop')
-        except AttributeError:
-            log.warn(u'Failure to find desktop - Impress may have closed')
-        except pywintypes.com_error:
+        except (AttributeError, pywintypes.com_error):
             log.warn(u'Failure to find desktop - Impress may have closed')
         return desktop if desktop else None
 
@@ -363,9 +361,7 @@ class ImpressDocument(PresentationDocument):
         log.debug(u'is active OpenOffice')
         if not self.is_loaded():
             return False
-        if not self.control:
-            return False
-        return self.control.isRunning()
+        return self.control.isRunning() if self.control else False
 
     def unblank_screen(self):
         """

From 9f5ed9589bdd08ab4361f540275ba1901f028441 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 13 Oct 2012 20:07:30 +0100
Subject: [PATCH 6/7] Slide counts can only be got if active

---
 openlp/plugins/presentations/lib/messagelistener.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index fdceda4ab..bf46191ac 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -171,16 +171,18 @@ class Controller(object):
         if not self.is_live:
             return
         if self.hide_mode:
+            if not self.doc.is_active():
+                return
             if self.doc.slidenumber < self.doc.get_slide_count():
                 self.doc.slidenumber = self.doc.slidenumber + 1
             return
+        if not self.activate():
+            return
         # The "End of slideshow" screen is after the last slide
         # Note, we can't just stop on the last slide, since it may
         # contain animations that need to be stepped through.
         if self.doc.slidenumber > self.doc.get_slide_count():
             return
-        if not self.activate():
-            return
         self.doc.next_step()
         self.doc.poll_slidenumber(self.is_live)
 
@@ -194,6 +196,8 @@ class Controller(object):
         if not self.is_live:
             return
         if self.hide_mode:
+            if not self.doc.is_active():
+                return
             if self.doc.slidenumber > 1:
                 self.doc.slidenumber = self.doc.slidenumber - 1
             return

From bbbf426cf2a9c19a5d6632f259bf40acfd8c69ae Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 13 Oct 2012 20:48:58 +0100
Subject: [PATCH 7/7] If change slides whilst blank, update slidecontroller

---
 .../presentations/lib/messagelistener.py      | 19 ++++++++++++-------
 .../lib/presentationcontroller.py             | 11 ++++++-----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index bf46191ac..7cc12c7f9 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -80,7 +80,7 @@ class Controller(object):
             else:
                 self.doc.start_presentation()
                 Receiver.send_message(u'live_display_hide', HideMode.Screen)
-                self.doc.slidenumber = 0
+                self.doc.slidenumber = 1
                 if slide_no > 1:
                     self.slide(slide_no)
 
@@ -121,11 +121,12 @@ class Controller(object):
             return
         if self.hide_mode:
             self.doc.slidenumber = int(slide) + 1
+            self.poll()
             return
         if not self.activate():
             return
         self.doc.goto_slide(int(slide) + 1)
-        self.doc.poll_slidenumber(self.is_live)
+        self.poll()
 
     def first(self):
         """
@@ -138,11 +139,12 @@ class Controller(object):
             return
         if self.hide_mode:
             self.doc.slidenumber = 1
+            self.poll()
             return
         if not self.activate():
             return
         self.doc.start_presentation()
-        self.doc.poll_slidenumber(self.is_live)
+        self.poll()
 
     def last(self):
         """
@@ -155,11 +157,12 @@ class Controller(object):
             return
         if self.hide_mode:
             self.doc.slidenumber = self.doc.get_slide_count()
+            self.poll()
             return
         if not self.activate():
             return
         self.doc.goto_slide(self.doc.get_slide_count())
-        self.doc.poll_slidenumber(self.is_live)
+        self.poll()
 
     def next(self):
         """
@@ -175,6 +178,7 @@ class Controller(object):
                 return
             if self.doc.slidenumber < self.doc.get_slide_count():
                 self.doc.slidenumber = self.doc.slidenumber + 1
+                self.poll()
             return
         if not self.activate():
             return
@@ -184,7 +188,7 @@ class Controller(object):
         if self.doc.slidenumber > self.doc.get_slide_count():
             return
         self.doc.next_step()
-        self.doc.poll_slidenumber(self.is_live)
+        self.poll()
 
     def previous(self):
         """
@@ -200,11 +204,12 @@ class Controller(object):
                 return
             if self.doc.slidenumber > 1:
                 self.doc.slidenumber = self.doc.slidenumber - 1
+                self.poll()
             return
         if not self.activate():
             return
         self.doc.previous_step()
-        self.doc.poll_slidenumber(self.is_live)
+        self.poll()
 
     def shutdown(self):
         """
@@ -274,7 +279,7 @@ class Controller(object):
     def poll(self):
         if not self.doc:
             return
-        self.doc.poll_slidenumber(self.is_live)
+        self.doc.poll_slidenumber(self.is_live, self.hide_mode)
 
 
 class MessageListener(object):
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index b72e1e9d4..4006cbc3e 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -260,16 +260,17 @@ class PresentationDocument(object):
         else:
             return None
 
-    def poll_slidenumber(self, is_live):
+    def poll_slidenumber(self, is_live, hide_mode):
         """
         Check the current slide number
         """
         if not self.is_active():
             return
-        current = self.get_slide_number()
-        if current == self.slidenumber:
-            return
-        self.slidenumber = current
+        if not hide_mode:
+            current = self.get_slide_number()
+            if current == self.slidenumber:
+                return
+            self.slidenumber = current
         if is_live:
             prefix = u'live'
         else: