OpenLP

Merge lp:~mzibricky/openlp/bug-907857 into lp:openlp

  1. bug-907857
  2. Merge into trunk
Proposed by matysek
Status: Merged
Approved by: Raoul Snyman
Approved revision: 1853
Merged at revision: 1853
Proposed branch: lp:~mzibricky/openlp/bug-907857
Merge into: lp:openlp
Diff against target: 25 lines (+7/-1)
1 file modified
openlp/core/ui/maindisplay.py (+7/-1)
To merge this branch: bzr merge lp:~mzibricky/openlp/bug-907857
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Jonathan Corwin (community) Approve
Review via email: mp+86735@code.launchpad.net

Description of the change

Fix for display screen on mac.

To post a comment you must log in.
Revision history for this message
Jonathan Corwin (j-corwin) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-12-22 13:23:04 +0000
+++ openlp/core/ui/maindisplay.py 2011-12-22 18:35:29 +0000
@@ -30,6 +30,7 @@
30"""30"""
31import logging31import logging
32import os32import os
33import sys
3334
34from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL35from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
35from PyQt4.phonon import Phonon36from PyQt4.phonon import Phonon
@@ -61,7 +62,12 @@
61 self.controller = controller62 self.controller = controller
62 self.screen = {}63 self.screen = {}
63 self.plugins = PluginManager.get_instance().plugins64 self.plugins = PluginManager.get_instance().plugins
64 self.setViewport(QtOpenGL.QGLWidget())65 # FIXME: On Mac OS X (tested on 10.7) the display screen is corrupt with
66 # OpenGL. Only white blank screen is shown on the 2nd monitor all the
67 # time. We need to investigate more how to use OpenGL properly on Mac OS
68 # X.
69 if sys.platform != 'darwin':
70 self.setViewport(QtOpenGL.QGLWidget())
6571
66 def setup(self):72 def setup(self):
67 """73 """