← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~j-corwin/openlp/bug-799549 into lp:openlp

 

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/bug-799549 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #792282 in OpenLP: "WIN + D minimises the Display Screen"
  https://bugs.launchpad.net/openlp/+bug/792282
  Bug #799549 in OpenLP: "Videos not working, just show white screen"
  https://bugs.launchpad.net/openlp/+bug/799549

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/bug-799549/+merge/65259

When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay.
-- 
https://code.launchpad.net/~j-corwin/openlp/bug-799549/+merge/65259
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/bug-799549 into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-06-12 16:02:52 +0000
+++ openlp/core/ui/maindisplay.py	2011-06-20 19:50:55 +0000
@@ -49,7 +49,10 @@
     This is the display screen.
     """
     def __init__(self, parent, image_manager, live):
-        QtGui.QGraphicsView.__init__(self, parent)
+        if live:
+            QtGui.QGraphicsView.__init__(self)
+        else:
+            QtGui.QGraphicsView.__init__(self, parent)
         self.isLive = live
         self.image_manager = image_manager
         self.screens = ScreenList.get_instance()


Follow ups