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

Media and Blank screen now play together nicely.

Browse Source
This commit is contained in:
Tim Bentley 2010-01-24 15:18:26 +00:00
parent ad40020169
commit e6e6eeb7c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,6 +298,7 @@ class MainDisplay(DisplayWidget):
log.debug(u'Play the new media, Live ') log.debug(u'Play the new media, Live ')
if not self.mediaLoaded and not self.displayBlank: if not self.mediaLoaded and not self.displayBlank:
self.blankDisplay() self.blankDisplay()
self.display_frame = self.blankFrame
self.firstTime = True self.firstTime = True
self.mediaLoaded = True self.mediaLoaded = True
self.display.hide() self.display.hide()
@ -326,3 +327,4 @@ class MainDisplay(DisplayWidget):
self.mediaLoaded = False self.mediaLoaded = False
self.video.setVisible(False) self.video.setVisible(False)
self.display.show() self.display.show()
self.blankDisplay(False)

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

@ -441,7 +441,6 @@ class SlideController(QtGui.QWidget):
self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag), self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag),
self.onSongBarHandler) self.onSongBarHandler)
item.setText(frame[u'text']) item.setText(frame[u'text'])
#print {u'x':frame[u'text']}
else: else:
label = QtGui.QLabel() label = QtGui.QLabel()
label.setMargin(4) label.setMargin(4)
@ -493,7 +492,6 @@ class SlideController(QtGui.QWidget):
""" """
Blank the screen. Blank the screen.
""" """
print "Button Pressed", blanked
if self.serviceItem is not None: if self.serviceItem is not None:
if self.serviceItem.is_command(): if self.serviceItem.is_command():
if blanked: if blanked: