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

Fixed: replacing background with video unblank screen even if "Blanked to Theme" and shows content.

Browse Source 
Fixes: https://launchpad.net/bugs/1225763
This commit is contained in:
Dmitriy Marmyshev 2013-09-18 19:18:06 +04:00
parent c17826937c
commit 7998ca7702
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -2,6 +2,7 @@
*.*~ *.*~
\#*\# \#*\#
*.eric4project *.eric4project
*.eric5project
*.ropeproject *.ropeproject
*.e4* *.e4*
.eric4project .eric4project

3
openlp/core/ui/media/mediacontroller.py
View File

@ -423,10 +423,11 @@ class MediaController(object):
controller.volumeSlider.blockSignals(False) controller.volumeSlider.blockSignals(False)
return False return False
if status: if status:
if not controller.media_info.is_background:
display.frame.evaluateJavaScript(u'show_blank("desktop");') display.frame.evaluateJavaScript(u'show_blank("desktop");')
self.curDisplayMediaPlayer[display].set_visible(display, self.curDisplayMediaPlayer[display].set_visible(display,
True) True)
if controller.isLive: if controller.isLive and not controller.media_info.is_background:
if controller.hideMenu.defaultAction().isChecked(): if controller.hideMenu.defaultAction().isChecked():
controller.hideMenu.defaultAction().trigger() controller.hideMenu.defaultAction().trigger()
# Start Timer for ui updates # Start Timer for ui updates