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

[matysek]

This fixes bug #906926.

[Jonathan Corwin (j-corwin)]

I think we normally use sys.platform == u'darwin' rather than platform.system()

[Andreas Preikschat (googol-deactivatedaccount)]

Why do need to add lines 33-41?

review: Needs Information

[Tim Bentley (trb143)]

Will not apply after gushies code is merge

review: Needs Fixing

[lp:~mzibricky/openlp/bug-906926]

1853. By matysek on 2011-12-22

remove disabling opengl - done in new branch

1854. By matysek on 2011-12-22

refactoring: merge with trunk and use sys.platform

Unmerged revisions

=== 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:36:26 +0000
@@ -30,6 +30,7 @@
 """
 import logging
 import os
+import sys
 
 from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
 from PyQt4.phonon import Phonon
@@ -125,6 +126,11 @@
                 QtCore.Qt.WindowStaysOnTopHint
         if os.environ.get(u'XDG_CURRENT_DESKTOP') == u'Unity':
             windowFlags = windowFlags | QtCore.Qt.X11BypassWindowManagerHint
+        # FIXME: QtCore.Qt.SplashScreen is workaround to make display screen
+        # stay always on top on Mac OS X. For details see bug 906926.
+        # It needs more investigation to fix it properly.
+        if sys.platform == 'darwin':
+            windowFlags = windowFlags | QtCore.Qt.SplashScreen
         self.setWindowFlags(windowFlags)
         self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
         if self.isLive: