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

Comments

Browse Source
This commit is contained in:
Tim Bentley 2010-04-17 12:27:12 +01:00
parent a766542854
commit 1948da79ff
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,11 @@ log = logging.getLogger(__name__)
class DisplayManager(QtGui.QWidget): class DisplayManager(QtGui.QWidget):
"""
Wrapper class to hold the display widgets.
I will provide API's in future to access the screens allow for
extra displays to be added.
"""
def __init__(self, screens): def __init__(self, screens):
QtGui.QWidget.__init__(self) QtGui.QWidget.__init__(self)
self.screens = screens self.screens = screens
@ -132,7 +137,7 @@ class MainDisplay(DisplayWidget):
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'live_slide_show'), self.showDisplay) QtCore.SIGNAL(u'live_slide_show'), self.showDisplay)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'media_start'), self.onMediaQueue) QtCore.SIGNAL(u'media_start'), self.hideDisplay)
def setup(self): def setup(self):
""" """
@ -291,11 +296,6 @@ class MainDisplay(DisplayWidget):
elif self.display_frame: elif self.display_frame:
self.frameView(self.display_frame) self.frameView(self.display_frame)
def onMediaQueue(self, message):
log.debug(u'Queue new media message %s' % message)
#self.activateWindow()
self.hideDisplay()
class VideoWidget(QtGui.QWidget): class VideoWidget(QtGui.QWidget):
""" """
Customised version of QTableWidget which can respond to keyboard Customised version of QTableWidget which can respond to keyboard
@ -399,4 +399,3 @@ class VideoDisplay(VideoWidget):
self.mediaObject.clearQueue() self.mediaObject.clearQueue()
self.video.setVisible(False) self.video.setVisible(False)
self.setVisible(False) self.setVisible(False)

1
openlp/core/ui/mainwindow.py
View File

@ -74,7 +74,6 @@ class VersionThread(QtCore.QThread):
if version != self.app_version[u'full']: if version != self.app_version[u'full']:
Receiver.send_message(u'version_check', u'%s' % version) Receiver.send_message(u'version_check', u'%s' % version)
class Ui_MainWindow(object): class Ui_MainWindow(object):
def setupUi(self, MainWindow): def setupUi(self, MainWindow):
""" """