← Back to team overview

openlp-core team mailing list archive

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

 

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

Requested reviews:
  Jonathan Corwin (j-corwin)
  Raoul Snyman (raoul-snyman)

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

Hello,

Now I really fixed bug #803602.

- Swapped flags
- do not import Qt, we can access the flags with QtGui as well
-- 
https://code.launchpad.net/~googol/openlp/bug-803602/+merge/101231
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2012-04-08 11:43:14 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2012-04-09 11:38:18 +0000
@@ -28,7 +28,7 @@
 import logging
 import locale
 
-from PyQt4 import QtCore, QtGui, Qt
+from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, \
     translate, create_separated_list
@@ -200,7 +200,7 @@
             self.quickSearchLabel, 0, 0, QtCore.Qt.AlignRight)
         self.quickSearchEdit = SearchEdit(self.quickTab)
         self.quickSearchEdit.setSizePolicy(
-            Qt.QSizePolicy.Expanding, Qt.QSizePolicy.Ignored)
+            QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Fixed)
         self.quickSearchEdit.setObjectName(u'quickSearchEdit')
         self.quickSearchLabel.setBuddy(self.quickSearchEdit)
         self.quickLayout.addWidget(self.quickSearchEdit, 0, 1, 1, 2)


Follow ups