OpenLP

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

  1. bug-906926
  2. Merge into trunk
Proposed by matysek
Status: Merged
Approved by: Jonathan Corwin
Approved revision: 1854
Merged at revision: 1854
Proposed branch: lp:~mzibricky/openlp/bug-906926
Merge into: lp:openlp
Diff against target: 23 lines (+6/-0)
1 file modified
openlp/core/ui/maindisplay.py (+6/-0)
To merge this branch: bzr merge lp:~mzibricky/openlp/bug-906926
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Jonathan Corwin (community) Approve
Raoul Snyman Approve
Andreas Preikschat Pending
Review via email: mp+86736@code.launchpad.net

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

Description of the change

This fixes bug #906926.

uses sys.platform and updated for latest trunk.

To post a comment you must log in.
Revision history for this message
Jonathan Corwin (j-corwin) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) wrote : Posted in a previous version of this proposal

Why do need to add lines 33-41?

review: Needs Information
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Will not apply after gushies code is merge

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

If this helps, then I'm OK with it. Right now I don't think we'll get any better than this.

review: Approve
Revision history for this message
Jonathan Corwin (j-corwin) wrote :

I'm OK with it too.

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/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-12-22 13:23:04 +0000
+++ openlp/core/ui/maindisplay.py 2011-12-22 18:35:31 +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
@@ -125,6 +126,11 @@
125 QtCore.Qt.WindowStaysOnTopHint126 QtCore.Qt.WindowStaysOnTopHint
126 if os.environ.get(u'XDG_CURRENT_DESKTOP') == u'Unity':127 if os.environ.get(u'XDG_CURRENT_DESKTOP') == u'Unity':
127 windowFlags = windowFlags | QtCore.Qt.X11BypassWindowManagerHint128 windowFlags = windowFlags | QtCore.Qt.X11BypassWindowManagerHint
129 # FIXME: QtCore.Qt.SplashScreen is workaround to make display screen
130 # stay always on top on Mac OS X. For details see bug 906926.
131 # It needs more investigation to fix it properly.
132 if sys.platform == 'darwin':
133 windowFlags = windowFlags | QtCore.Qt.SplashScreen
128 self.setWindowFlags(windowFlags)134 self.setWindowFlags(windowFlags)
129 self.setAttribute(QtCore.Qt.WA_DeleteOnClose)135 self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
130 if self.isLive:136 if self.isLive: