raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Updated from review comments

Browse Source
This commit is contained in:
Martin Thompson 2010-05-09 21:02:38 +01:00
parent efa1e8c2d9
commit a8a7e675a4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/maindisplay.py
View File

@ -118,7 +118,8 @@ class MainDisplay(DisplayWidget):
DisplayWidget.__init__(self, parent) DisplayWidget.__init__(self, parent)
self.parent = parent self.parent = parent
self.setWindowTitle(u'OpenLP Display') self.setWindowTitle(u'OpenLP Display')
try: # WA_TranslucentBackground not available in QT4.4 # WA_TranslucentBackground is not available in QT4.4
try:
self.setAttribute(QtCore.Qt.WA_TranslucentBackground) self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
except AttributeError: except AttributeError:
pass pass
@ -344,7 +345,8 @@ class VideoDisplay(Phonon.VideoWidget):
Phonon.createPath(self.mediaObject, self) Phonon.createPath(self.mediaObject, self)
Phonon.createPath(self.mediaObject, self.audioObject) Phonon.createPath(self.mediaObject, self.audioObject)
flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
try: # WindowsStaysOnBottomHint is not available in QT4.4 # WindowsStaysOnBottomHint is not available in QT4.4
try:
flags = flags | QtCore.Qt.WindowStaysOnBottomHint flags = flags | QtCore.Qt.WindowStaysOnBottomHint
except AttributeError: except AttributeError:
pass pass

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -337,7 +337,7 @@ class BibleMediaItem(MediaManagerItem):
# load bibles into the combo boxes # load bibles into the combo boxes
first = True first = True
for bible in bibles: for bible in bibles:
if bible is not None: if bible:
self.QuickVersionComboBox.addItem(bible) self.QuickVersionComboBox.addItem(bible)
self.QuickSecondBibleComboBox.addItem(bible) self.QuickSecondBibleComboBox.addItem(bible)
self.AdvancedVersionComboBox.addItem(bible) self.AdvancedVersionComboBox.addItem(bible)