OpenLP

Merge lp:~j-corwin/openlp/bug-880169 into lp:openlp

  1. bug-880169
  2. Merge into trunk
Proposed by Jonathan Corwin
Status: Merged
Approved by: Tim Bentley
Approved revision: 1841
Merged at revision: 1852
Proposed branch: lp:~j-corwin/openlp/bug-880169
Merge into: lp:openlp
Diff against target: 59 lines (+13/-4)
2 files modified
openlp/core/ui/exceptionform.py (+7/-1)
openlp/core/ui/maindisplay.py (+6/-3)
To merge this branch: bzr merge lp:~j-corwin/openlp/bug-880169
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Andreas Preikschat (community) Approve
Review via email: mp+86702@code.launchpad.net

This proposal supersedes a proposal from 2011-12-22.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
32import sqlalchemy32import sqlalchemy
33import BeautifulSoup33import BeautifulSoup
34from lxml import etree34from lxml import etree
35from PyQt4 import Qt, QtCore, QtGui35from PyQt4 import Qt, QtCore, QtGui, QtWebKit
3636
37try:37try:
38 from PyQt4.phonon import Phonon38 from PyQt4.phonon import Phonon
@@ -77,6 +77,11 @@
77 UNO_VERSION = node.getByName(u'ooSetupVersion')77 UNO_VERSION = node.getByName(u'ooSetupVersion')
78except ImportError:78except ImportError:
79 UNO_VERSION = u'-'79 UNO_VERSION = u'-'
80try:
81 WEBKIT_VERSION = QtWebKit.qWebKitVersion()
82except AttributeError:
83 WEBKIT_VERSION = u'-'
84
8085
81from openlp.core.lib import translate, SettingsManager86from openlp.core.lib import translate, SettingsManager
82from openlp.core.lib.ui import UiStrings87from openlp.core.lib.ui import UiStrings
@@ -111,6 +116,7 @@
111 u'Qt4: %s\n' % Qt.qVersion() + \116 u'Qt4: %s\n' % Qt.qVersion() + \
112 u'Phonon: %s\n' % PHONON_VERSION + \117 u'Phonon: %s\n' % PHONON_VERSION + \
113 u'PyQt4: %s\n' % Qt.PYQT_VERSION_STR + \118 u'PyQt4: %s\n' % Qt.PYQT_VERSION_STR + \
119 u'QtWebkit: %s\n' % WEBKIT_VERSION + \
114 u'SQLAlchemy: %s\n' % sqlalchemy.__version__ + \120 u'SQLAlchemy: %s\n' % sqlalchemy.__version__ + \
115 u'SQLAlchemy Migrate: %s\n' % MIGRATE_VERSION + \121 u'SQLAlchemy Migrate: %s\n' % MIGRATE_VERSION + \
116 u'BeautifulSoup: %s\n' % BeautifulSoup.__version__ + \122 u'BeautifulSoup: %s\n' % BeautifulSoup.__version__ + \
117123
=== 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 @@
29and play multimedia within OpenLP.29and play multimedia within OpenLP.
30"""30"""
31import logging31import logging
32import os
3233
33from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL34from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
34from PyQt4.phonon import Phonon35from PyQt4.phonon import Phonon
@@ -120,9 +121,11 @@
120 self.audioPlayer = None121 self.audioPlayer = None
121 self.firstTime = True122 self.firstTime = True
122 self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')123 self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
123 self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |124 windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \
124 QtCore.Qt.WindowStaysOnTopHint |125 QtCore.Qt.WindowStaysOnTopHint
125 QtCore.Qt.X11BypassWindowManagerHint)126 if os.environ.get(u'XDG_CURRENT_DESKTOP') == u'Unity':
127 windowFlags = windowFlags | QtCore.Qt.X11BypassWindowManagerHint
128 self.setWindowFlags(windowFlags)
126 self.setAttribute(QtCore.Qt.WA_DeleteOnClose)129 self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
127 if self.isLive:130 if self.isLive:
128 QtCore.QObject.connect(Receiver.get_receiver(),131 QtCore.QObject.connect(Receiver.get_receiver(),