← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol/openlp/bug-863846 into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-863846 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #863846 in OpenLP: "splash screen always on top"
  https://bugs.launchpad.net/openlp/+bug/863846

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-863846/+merge/78712

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.)
-- 
https://code.launchpad.net/~googol/openlp/bug-863846/+merge/78712
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-863846 into lp:openlp.
=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py	2011-06-12 16:02:52 +0000
+++ openlp/core/ui/splashscreen.py	2011-10-08 13:33:23 +0000
@@ -36,8 +36,7 @@
             QtCore.SIGNAL(u'close_splash'), self.close)
 
     def setupUi(self):
-        self.setObjectName(u'splash_screen')
-        self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
+        self.setObjectName(u'splashScreen')
         self.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
         splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
         self.setPixmap(splash_image)


Follow ups