openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #880169 in OpenLP: "No windows stay to the front."
  https://bugs.launchpad.net/openlp/+bug/880169

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

For bug 774802 the X11BypassWindowManagerHint was added to fix a problem on Unity.
This causes problems elsewhere, so this fix now only adds this flag when the desktop is Unity.

-- 
https://code.launchpad.net/~j-corwin/openlp/bug-880169/+merge/86702
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/bug-880169 into lp:openlp.

=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py	2011-10-23 17:22:11 +0000
+++ openlp/core/ui/exceptionform.py	2011-12-22 13:38:48 +0000
@@ -32,7 +32,7 @@
 import sqlalchemy
 import BeautifulSoup
 from lxml import etree
-from PyQt4 import Qt, QtCore, QtGui
+from PyQt4 import Qt, QtCore, QtGui, QtWebKit
 
 try:
     from PyQt4.phonon import Phonon
@@ -77,6 +77,11 @@
     UNO_VERSION = node.getByName(u'ooSetupVersion')
 except ImportError:
     UNO_VERSION = u'-'
+try:
+    WEBKIT_VERSION = QtWebKit.qWebKitVersion()
+except AttributeError:
+    WEBKIT_VERSION = u'-'
+
 
 from openlp.core.lib import translate, SettingsManager
 from openlp.core.lib.ui import UiStrings
@@ -111,6 +116,7 @@
             u'Qt4: %s\n' % Qt.qVersion() + \
             u'Phonon: %s\n' % PHONON_VERSION + \
             u'PyQt4: %s\n' % Qt.PYQT_VERSION_STR + \
+            u'QtWebkit: %s\n' % WEBKIT_VERSION + \
             u'SQLAlchemy: %s\n' % sqlalchemy.__version__ + \
             u'SQLAlchemy Migrate: %s\n' % MIGRATE_VERSION + \
             u'BeautifulSoup: %s\n' % BeautifulSoup.__version__ + \

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-12-10 14:34:28 +0000
+++ openlp/core/ui/maindisplay.py	2011-12-22 13:38:48 +0000
@@ -29,6 +29,7 @@
 and play multimedia within OpenLP.
 """
 import logging
+import os
 
 from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
 from PyQt4.phonon import Phonon
@@ -120,9 +121,11 @@
             self.audioPlayer = None
         self.firstTime = True
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
-        self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
-            QtCore.Qt.WindowStaysOnTopHint |
-            QtCore.Qt.X11BypassWindowManagerHint)
+        windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \
+                QtCore.Qt.WindowStaysOnTopHint
+        if os.environ.get(u'XDG_CURRENT_DESKTOP') == u'Unity':
+            windowFlags = windowFlags | QtCore.Qt.X11BypassWindowManagerHint
+        self.setWindowFlags(windowFlags)
         self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),