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

Headr468 and fix

Browse Source
This commit is contained in:
Tim Bentley 2009-11-02 17:24:27 +00:00
commit 0a6e3f47c7
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,7 @@ class MainDisplay(DisplayLabel):
self.alertTab = None
self.timer_id = 0
self.firstTime = True
self.mediaLoaded = False
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'live_slide_blank'), self.blankDisplay)
QtCore.QObject.connect(Receiver.get_receiver(),
@ -126,7 +127,7 @@ class MainDisplay(DisplayLabel):
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'media_pause'), self.onMediaPaws)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'media_stop'), self.onMediaFinish)
QtCore.SIGNAL(u'media_stop'), self.onMediaStop)
def setup(self, screenNumber):
@ -208,6 +209,10 @@ class MainDisplay(DisplayLabel):
self.displayBlank = False
if self.frame is not None:
self.frameView(self.frame)
if self.parent.LiveController.blackPushButton.isChecked() != \
self.displayBlank:
self.parent.LiveController.blackPushButton.setChecked(
self.displayBlank)
self.parent.generalConfig.set_config(u'Screen Blank',self.displayBlank)
def displayAlert(self, text=u''):
@ -261,6 +266,10 @@ class MainDisplay(DisplayLabel):
def onMediaPlay(self):
log.debug(u'Play the new media')
if not self.mediaLoaded and not self.displayBlank:
self.blankDisplay()
self.firstTime = True
self.mediaLoaded = True
self.display.hide()
self.mediaObject.play()
self.setVisible(True)
@ -269,10 +278,17 @@ class MainDisplay(DisplayLabel):
log.debug(u'Pause the new media')
self.mediaObject.pause()
def onMediaStop(self):
self.mediaObject.stop()
self.display.show()
def onMediaFinish(self):
<<<<<<< TREE
log.debug(u'Finish playing media')
self.setVisible(False)
=======
>>>>>>> MERGE-SOURCE
self.mediaObject.stop()
self.mediaObject.clearQueue()
self.video.close()
self.mediaLoaded = False
self.display.show()

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

@ -241,7 +241,7 @@ class SlideController(QtGui.QWidget):
QtCore.SIGNAL(u'activated(QModelIndex)'), self.onSlideSelected)
if isLive:
QtCore.QObject.connect(self.blackPushButton,
QtCore.SIGNAL(u'toggled(bool)'), self.onBlankScreen)
QtCore.SIGNAL(u'clicked(bool)'), self.onBlankScreen)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'update_spin_delay'), self.receiveSpinDelay)
Receiver().send_message(u'request_spin_delay')

3
openlp/plugins/media/lib/mediaitem.py
View File

@ -60,9 +60,6 @@ class MediaMediaItem(MediaManagerItem):
def retranslateUi(self):
self.OnNewPrompt = self.trUtf8(u'Select Media')
def reTranslateUI(self):
self.OnNewPrompt = self.trUtf8(u'Select Media')
self.OnNewFileMasks = self.trUtf8(u'Videos (*.avi *.mpeg *.mpg'
'*.mp4);;Audio (*.ogg *.mp3 *.wma);;All files (*)')

3
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -62,9 +62,6 @@ class PresentationMediaItem(MediaManagerItem):
def retranslateUi(self):
self.OnNewPrompt = self.trUtf8(u'Select Presentation(s)')
def reTranslateUI(self):
self.OnNewPrompt = self.trUtf8(u'Select Presentation(s)')
self.OnNewFileMasks = self.trUtf8(u'Presentations (*.ppt *.pps *.odp)')
def requiredIcons(self):