OpenLP

Merge lp:~googol-deactivatedaccount/openlp/bug-863846 into lp:openlp

  1. bug-863846
  2. Merge into trunk
Proposed by Andreas Preikschat
Status: Merged
Approved by: Tim Bentley
Approved revision: 1772
Merged at revision: 1773
Proposed branch: lp:~googol-deactivatedaccount/openlp/bug-863846
Merge into: lp:openlp
Diff against target: 13 lines (+1/-2)
1 file modified
openlp/core/ui/splashscreen.py (+1/-2)
To merge this branch: bzr merge lp:~googol-deactivatedaccount/openlp/bug-863846
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+78712@code.launchpad.net

Commit message

- fixed bug 863846 (splash screen always on top)

Description of the change

Hello,

- fixed bug 863846 (splash screen always on top)

I removed the WindowStaysOnTopHint flag and I still found the splash screen to behave like a splash screen. (By the way, I always disabled the splash screen, because it behaved in the way described in the bug report.)

To post a comment you must log in.
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
1=== modified file 'openlp/core/ui/splashscreen.py'
2--- openlp/core/ui/splashscreen.py 2011-06-12 16:02:52 +0000
3+++ openlp/core/ui/splashscreen.py 2011-10-08 13:33:23 +0000
4@@ -36,8 +36,7 @@
5 QtCore.SIGNAL(u'close_splash'), self.close)
6
7 def setupUi(self):
8- self.setObjectName(u'splash_screen')
9- self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
10+ self.setObjectName(u'splashScreen')
11 self.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
12 splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
13 self.setPixmap(splash_image)