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

Fixed Bug #727710

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

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

@ -245,7 +245,8 @@ 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.
Receiver.send_message(u'maindisplay_active') if self.isLive:
Receiver.send_message(u'maindisplay_active')
def resetImage(self): def resetImage(self):
""" """
@ -259,7 +260,8 @@ class MainDisplay(DisplayWidget):
self.displayImage(None) self.displayImage(None)
self.override = {} self.override = {}
# Update the preview frame. # Update the preview frame.
Receiver.send_message(u'maindisplay_active') if self.isLive:
Receiver.send_message(u'maindisplay_active')
def resetVideo(self): def resetVideo(self):
""" """
@ -276,7 +278,8 @@ 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.
Receiver.send_message(u'maindisplay_active') if self.isLive:
Receiver.send_message(u'maindisplay_active')
def videoPlay(self): def videoPlay(self):
""" """
@ -347,7 +350,8 @@ 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.
Receiver.send_message(u'maindisplay_active') if self.isLive:
Receiver.send_message(u'maindisplay_active')
return self.preview() return self.preview()
def videoStart(self, newState, oldState): def videoStart(self, newState, oldState):
@ -481,7 +485,8 @@ 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
Receiver.send_message(u'maindisplay_active') if self.isLive:
Receiver.send_message(u'maindisplay_active')
def __hideMouse(self): def __hideMouse(self):
# Hide mouse cursor when moved over display if enabled in settings # Hide mouse cursor when moved over display if enabled in settings

2
openlp/core/ui/slidecontroller.py
View File

@ -162,7 +162,7 @@ class SlideController(QtGui.QWidget):
self.themeScreen.setText( self.themeScreen.setText(
translate('OpenLP.SlideController', 'Blank to Theme')) translate('OpenLP.SlideController', 'Blank to Theme'))
self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen', self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
u':/slides/slide_desktop.png', False) u':/slides/slide_desktop.png', False)
self.desktopScreen.setText( self.desktopScreen.setText(
translate('OpenLP.SlideController', 'Show Desktop')) translate('OpenLP.SlideController', 'Show Desktop'))
self.hideMenu.setDefaultAction(self.blankScreen) self.hideMenu.setDefaultAction(self.blankScreen)