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

Clean up Alerts code to use correct timmers

Browse Source 
code now allows slides and songs to change with alert still active
This commit is contained in:
Tim Bentley 2009-07-19 08:40:31 +01:00
parent 4552fb543a
commit 6861877c3d
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA Place, Suite 330, Boston, MA 02111-1307 USA
""" """
from PyQt4 import QtCore, QtGui, QtTest from PyQt4 import QtCore, QtGui
from time import sleep from time import sleep
from openlp.core.lib import translate from openlp.core.lib import translate
@ -41,6 +41,7 @@ class MainDisplay(QtGui.QWidget):
self.alertactive = False self.alertactive = False
self.alerttext = u'' self.alerttext = u''
self.alertTab = None self.alertTab = None
self.timer_id = 0
def setup(self, screenNumber): def setup(self, screenNumber):
""" """
@ -69,11 +70,18 @@ class MainDisplay(QtGui.QWidget):
self.frameView(self.blankFrame) self.frameView(self.blankFrame)
def frameView(self, frame): def frameView(self, frame):
"""
Called from a slide controller to display a frame
if the alert is in progress the alert is added on top
``frame``
Image frame to be rendered
"""
self.frame = frame self.frame = frame
if not self.displayBlank: if self.timer_id != 0 :
self.display.setPixmap(QtGui.QPixmap.fromImage(frame))
elif self.alertactive:
self.displayAlert() self.displayAlert()
elif not self.displayBlank:
self.display.setPixmap(QtGui.QPixmap.fromImage(frame))
def blankDisplay(self): def blankDisplay(self):
if not self.displayBlank: if not self.displayBlank:
@ -85,17 +93,17 @@ class MainDisplay(QtGui.QWidget):
def alert(self, alertTab, text): def alert(self, alertTab, text):
""" """
Called from the Alert Tab Called from the Alert Tab to display an alert
alertTab = details from AlertTab ``alertTab``
text = display text details from AlertTab
screen = screen number to be displayed on.
``text``
display text
""" """
self.alerttext = text self.alerttext = text
self.alertTab = alertTab self.alertTab = alertTab
if len(text) > 0: if len(text) > 0:
self.alertactive = True
self.displayAlert() self.displayAlert()
self.alertactive = False
def displayAlert(self): def displayAlert(self):
alertframe = QtGui.QPixmap.fromImage(self.frame) alertframe = QtGui.QPixmap.fromImage(self.frame)
@ -113,5 +121,12 @@ class MainDisplay(QtGui.QWidget):
painter.drawText(x, y+metrics.height()-metrics.descent()-1, self.alerttext) painter.drawText(x, y+metrics.height()-metrics.descent()-1, self.alerttext)
painter.end() painter.end()
self.display.setPixmap(alertframe) self.display.setPixmap(alertframe)
QtTest.QTest.qWait(self.alertTab.timeout*1000) # check to see if we have a timer running
self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame)) if self.timer_id == 0:
self.timer_id = self.startTimer(int(self.alertTab.timeout) * 1000)
def timerEvent(self, event):
if event.timerId() == self.timer_id:
self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame))
self.killTimer(self.timer_id)
self.timer_id = 0