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

Presentation display fixes

This commit is contained in:
Tim Bentley 2010-01-23 09:49:01 +00:00
parent 2d7c9dd402
commit c35ff6b8d1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@ class MainDisplay(DisplayWidget):
""" """
log.debug(u'display alert called %s' % text) log.debug(u'display alert called %s' % text)
self.alertList.append(text) self.alertList.append(text)
if self.timer_id != 0: if self.timer_id != 0 or self.mediaLoaded:
return return
self.generateAlert() self.generateAlert()
@ -299,6 +299,7 @@ class MainDisplay(DisplayWidget):
self.firstTime = True self.firstTime = True
self.mediaLoaded = True self.mediaLoaded = True
self.display.hide() self.display.hide()
self.alertDisplay.hide()
self.video.setFullScreen(True) self.video.setFullScreen(True)
self.video.setVisible(True) self.video.setVisible(True)
self.mediaObject.play() self.mediaObject.play()

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

@ -493,6 +493,7 @@ class SlideController(QtGui.QWidget):
""" """
Blank the screen. Blank the screen.
""" """
print "onbl", 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:
@ -550,7 +551,7 @@ class SlideController(QtGui.QWidget):
def grabMainDisplay(self): def grabMainDisplay(self):
rm = self.parent.RenderManager rm = self.parent.RenderManager
winid = QtGui.QApplication.desktop().winId() winid = QtGui.QApplication.desktop().winId()
rect = rm.screen_list[rm.current_display][u'size'] rect = rm.screens.current[u'size']
winimg = QtGui.QPixmap.grabWindow(winid, rect.x(), winimg = QtGui.QPixmap.grabWindow(winid, rect.x(),
rect.y(), rect.width(), rect.height()) rect.y(), rect.width(), rect.height())
self.SlidePreview.setPixmap(winimg) self.SlidePreview.setPixmap(winimg)
@ -666,7 +667,7 @@ class SlideController(QtGui.QWidget):
def onMediaStop(self): def onMediaStop(self):
if self.isLive: if self.isLive:
Receiver.send_message(u'%s_stop'% self.serviceItem.name.lower()) Receiver.send_message(u'%s_stop'% self.serviceItem.name.lower(), self.isLive)
else: else:
self.mediaObject.stop() self.mediaObject.stop()
self.video.hide() self.video.hide()

14
openlp/plugins/presentations/lib/impresscontroller.py
View File

@ -232,13 +232,13 @@ class ImpressController(PresentationController):
""" """
if self.document: if self.document:
if self.presentation: if self.presentation:
self.presentation.end() try:
self.presentation = None self.presentation.end()
try: self.presentation = None
self.document.dispose() self.document.dispose()
except: except:
#We tried! #We tried!
pass pass
self.document = None self.document = None
def is_loaded(self): def is_loaded(self):