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

fixed Bug #727710

Browse Source 
Fixes: https://launchpad.net/bugs/727710
This commit is contained in:
Andreas Preikschat 2011-03-07 19:04:40 +01:00
parent d35ee103a0
commit e535c4e040
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/ui/maindisplay.py
View File

@ -245,6 +245,7 @@ class MainDisplay(DisplayWidget):
js = u'show_image("");' js = u'show_image("");'
self.frame.evaluateJavaScript(js) self.frame.evaluateJavaScript(js)
# Update the preview frame. # Update the preview frame.
if self.isLive:
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
def resetImage(self): def resetImage(self):
@ -259,6 +260,7 @@ class MainDisplay(DisplayWidget):
self.displayImage(None) self.displayImage(None)
self.override = {} self.override = {}
# Update the preview frame. # Update the preview frame.
if self.isLive:
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
def resetVideo(self): def resetVideo(self):
@ -276,6 +278,7 @@ class MainDisplay(DisplayWidget):
self.frame.evaluateJavaScript(u'show_video("close");') self.frame.evaluateJavaScript(u'show_video("close");')
self.override = {} self.override = {}
# Update the preview frame. # Update the preview frame.
if self.isLive:
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
def videoPlay(self): def videoPlay(self):
@ -347,6 +350,7 @@ class MainDisplay(DisplayWidget):
self.videoWidget.setVisible(True) self.videoWidget.setVisible(True)
self.audio.setVolume(vol) self.audio.setVolume(vol)
# Update the preview frame. # Update the preview frame.
if self.isLive:
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
return self.preview() return self.preview()
@ -481,6 +485,7 @@ class MainDisplay(DisplayWidget):
self.videoPlay() self.videoPlay()
self.hideMode = None self.hideMode = None
# Trigger actions when display is active again # Trigger actions when display is active again
if self.isLive:
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
def __hideMouse(self): def __hideMouse(self):