openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #00767
[Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Only hide display on single monitor setups
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14313
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2009-11-02 17:37:41 +0000
+++ openlp/core/ui/maindisplay.py 2009-11-02 18:10:28 +0000
@@ -102,6 +102,7 @@
self.display = QtGui.QLabel(self)
self.display.setScaledContents(True)
self.layout.insertWidget(0, self.display)
+ self.primary = False
self.displayBlank = False
self.blankFrame = None
self.frame = None
@@ -272,19 +273,22 @@
self.mediaLoaded = True
self.display.hide()
self.mediaObject.play()
- self.setVisible(True)
+ if self.primary:
+ self.setVisible(True)
def onMediaPaws(self):
- log.debug(u'Pause the new media')
+ log.debug(u'Media paused by user')
self.mediaObject.pause()
def onMediaStop(self):
+ log.debug(u'Media stopped by user')
self.mediaObject.stop()
self.display.show()
def onMediaFinish(self):
- log.debug(u'Finish playing media')
- self.setVisible(False)
+ log.debug(u'Reached end of media playlist')
+ if self.primary:
+ self.setVisible(False)
self.mediaObject.stop()
self.mediaObject.clearQueue()
self.mediaLoaded = False
Follow ups