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

Partly revert to old unblanking workaround for powerpoint 2010.

This commit is contained in:
Tomas Groth 2015-04-30 16:57:26 +02:00
parent d044821483
commit cdb564c4f3
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,7 @@ if is_win():
import winreg import winreg
import win32ui import win32ui
import pywintypes import pywintypes
import win32con
import win32api
from openlp.core.lib import ScreenList from openlp.core.lib import ScreenList
from openlp.core.lib.ui import UiStrings, critical_error_message_box, translate from openlp.core.lib.ui import UiStrings, critical_error_message_box, translate
@ -123,6 +122,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 = 1
self.blank_click = None
def load_presentation(self): def load_presentation(self):
""" """
@ -227,24 +228,13 @@ class PowerpointDocument(PresentationDocument):
""" """
log.debug('unblank_screen') log.debug('unblank_screen')
try: try:
# Powerpoint 2010 (14.0) has a bug that prevents unblanking from working, self.presentation.SlideShowWindow.Activate()
# so we have to works around it by sending a keystroke to Powerpoint. self.presentation.SlideShowWindow.View.State = 1
# The keystroke 'U' should not have any bindings in Powerpoint so we use that # Unblanking is broken in PowerPoint 2010 (14.0), need to redisplay
if float(self.presentation.Application.Version) == 14.0: if 15.0 > float(self.presentation.Application.Version) >= 14.0:
loops = 0 self.presentation.SlideShowWindow.View.GotoSlide(self.index_map[self.blank_slide], False)
while self.presentation.SlideShowWindow.View.State == 3: if self.blank_click:
if loops >= 10: self.presentation.SlideShowWindow.View.GotoClick(self.blank_click)
log.warning('Tried to unblank 10 times, break to avoid hang, leaving presentation blanked.')
break
log.debug('Unblanking by sending "U"')
self.presentation.SlideShowWindow.Activate()
win32api.keybd_event(ord('U'), 0, 0, 0)
time.sleep(0.01)
win32api.keybd_event(ord('U'), 0, win32con.KEYEVENTF_KEYUP, 0)
loops += 1
else:
# ppSlideShowRunning = 1
self.presentation.SlideShowWindow.View.State = 1
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)
@ -259,6 +249,10 @@ class PowerpointDocument(PresentationDocument):
""" """
log.debug('blank_screen') log.debug('blank_screen')
try: try:
# Unblanking is broken in PowerPoint 2010 (14.0), need to save info for later
if 15.0 > float(self.presentation.Application.Version) >= 14.0:
self.blank_slide = self.get_slide_number()
self.blank_click = self.presentation.SlideShowWindow.View.GetClickIndex()
# ppSlideShowBlackScreen = 3 # ppSlideShowBlackScreen = 3
self.presentation.SlideShowWindow.View.State = 3 self.presentation.SlideShowWindow.View.State = 3
except (AttributeError, pywintypes.com_error) as e: except (AttributeError, pywintypes.com_error) as e: