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

Headr651

Browse Source
This commit is contained in:
Tim Bentley 2009-11-03 06:16:27 +00:00
commit 89e0aee373
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,7 @@ class MainDisplay(DisplayLabel):
self.display = QtGui.QLabel(self) self.display = QtGui.QLabel(self)
self.display.setScaledContents(True) self.display.setScaledContents(True)
self.layout.insertWidget(0, self.display) self.layout.insertWidget(0, self.display)
self.primary = False
self.displayBlank = False self.displayBlank = False
self.blankFrame = None self.blankFrame = None
self.frame = None self.frame = None
@ -272,19 +273,22 @@ class MainDisplay(DisplayLabel):
self.mediaLoaded = True self.mediaLoaded = True
self.display.hide() self.display.hide()
self.mediaObject.play() self.mediaObject.play()
self.setVisible(True) if self.primary:
self.setVisible(True)
def onMediaPaws(self): def onMediaPaws(self):
log.debug(u'Pause the new media') log.debug(u'Media paused by user')
self.mediaObject.pause() self.mediaObject.pause()
def onMediaStop(self): def onMediaStop(self):
log.debug(u'Media stopped by user')
self.mediaObject.stop() self.mediaObject.stop()
self.display.show() self.display.show()
def onMediaFinish(self): def onMediaFinish(self):
log.debug(u'Finish playing media') log.debug(u'Reached end of media playlist')
self.setVisible(False) if self.primary:
self.setVisible(False)
self.mediaObject.stop() self.mediaObject.stop()
self.mediaObject.clearQueue() self.mediaObject.clearQueue()
self.mediaLoaded = False self.mediaLoaded = False

2
version.txt
View File

@ -1 +1 @@
1.9.0-650 1.9.0-651