raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Small fixes for powerpoint.

Browse Source
This commit is contained in:
Tomas Groth 2015-04-28 11:55:40 +02:00
parent e21729c14f
commit ed6d454105
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/plugins/presentations/lib/powerpointcontroller.py
View File

@ -121,6 +121,8 @@ class PowerpointDocument(PresentationDocument):
self.presentation = None self.presentation = None
self.index_map = {} self.index_map = {}
self.slide_count = 0 self.slide_count = 0
self.blank_slide = None
self.blank_click = None
def load_presentation(self): def load_presentation(self):
""" """
@ -230,10 +232,12 @@ class PowerpointDocument(PresentationDocument):
self.presentation.SlideShowWindow.View.State = 1 self.presentation.SlideShowWindow.View.State = 1
self.presentation.SlideShowWindow.Activate() self.presentation.SlideShowWindow.Activate()
# Unblanking is broken in PowerPoint 2010 and 2013, need to redisplay # Unblanking is broken in PowerPoint 2010 and 2013, need to redisplay
if float(self.presentation.Application.Version) >= 14.0: if float(self.presentation.Application.Version) >= 14.0 and self.blank_slide:
self.presentation.SlideShowWindow.View.GotoSlide(self.blank_slide, False) self.presentation.SlideShowWindow.View.GotoSlide(self.blank_slide, False)
if self.blank_click: if self.blank_click:
self.presentation.SlideShowWindow.View.GotoClick(self.blank_click) self.presentation.SlideShowWindow.View.GotoClick(self.blank_click)
self.blank_slide = None
self.blank_click = None
except (AttributeError, pywintypes.com_error) as e: except (AttributeError, pywintypes.com_error) as e:
log.exception('Caught exception while in unblank_screen') log.exception('Caught exception while in unblank_screen')
log.exception(e) log.exception(e)
@ -279,7 +283,7 @@ class PowerpointDocument(PresentationDocument):
def stop_presentation(self): def stop_presentation(self):
""" """
Stops the current presentation and hides the output. Stops the current presentation and hides the output. Used when blanking to desktop.
""" """
log.debug('stop_presentation') log.debug('stop_presentation')
try: try:
@ -305,10 +309,11 @@ class PowerpointDocument(PresentationDocument):
except win32ui.error: except win32ui.error:
dpi = 96 dpi = 96
size = ScreenList().current['size'] size = ScreenList().current['size']
ppt_window = None
try: try:
ppt_window = self.presentation.SlideShowSettings.Run() ppt_window = self.presentation.SlideShowSettings.Run()
except (AttributeError, pywintypes.com_error) as e: except (AttributeError, pywintypes.com_error) as e:
log.exception('Caught exception while in get_slide_number') log.exception('Caught exception while in start_presentation')
log.exception(e) log.exception(e)
trace_error_handler(log) trace_error_handler(log)
self.show_error_msg() self.show_error_msg()