From 6f8e3f7ea2d571a7c9bfefbf946ed5520e31a8b9 Mon Sep 17 00:00:00 2001 From: Martin Thompson Date: Wed, 5 May 2010 20:57:20 +0100 Subject: [PATCH 1/4] Fixed a qt4.5ism --- openlp/core/lib/settingsmanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/settingsmanager.py b/openlp/core/lib/settingsmanager.py index de1401d56..d6b987db4 100644 --- a/openlp/core/lib/settingsmanager.py +++ b/openlp/core/lib/settingsmanager.py @@ -53,7 +53,7 @@ class SettingsManager(object): self.slidecontroller_image = self.slidecontroller - 50 self.showPreviewPanel = QtCore.QSettings().value( - u'user interface/preview panel', True).toBool() + u'user interface/preview panel', QtCore.QVariant(True)).toBool() def togglePreviewPanel(self, isVisible): QtCore.QSettings().setValue(u'user interface/preview panel', From d04d75ad41d53edcf6b0a6146e45bb4f67abe69a Mon Sep 17 00:00:00 2001 From: Martin Thompson Date: Thu, 6 May 2010 21:41:42 +0100 Subject: [PATCH 2/4] More changes to suit pyqt4.4 --- openlp/plugins/songs/lib/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/manager.py b/openlp/plugins/songs/lib/manager.py index ff9231fe2..dc275cc98 100644 --- a/openlp/plugins/songs/lib/manager.py +++ b/openlp/plugins/songs/lib/manager.py @@ -50,7 +50,7 @@ class SongManager(): settings.beginGroup(u'songs') self.db_url = u'' db_type = unicode( - settings.value(u'songs/db type', u'sqlite').toString()) + settings.value(u'songs/db type', QtCore.QVariant(u'sqlite')).toString()) if db_type == u'sqlite': self.db_url = u'sqlite:///%s/songs.sqlite' % \ AppLocation.get_section_data_path(u'songs') From efa1e8c2d9b33f5711ea4893e1a2ef5de6f9f1d6 Mon Sep 17 00:00:00 2001 From: Martin Thompson Date: Fri, 7 May 2010 21:29:21 +0100 Subject: [PATCH 3/4] Quick fix to handle Bible config gets confused and returns None --- openlp.pyw | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index 0c1227b6a..5fe962f82 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -169,7 +169,7 @@ def main(): filename = os.path.join(log_path, u'openlp.log') logfile = FileHandler(filename, u'w') logfile.setFormatter(logging.Formatter( - u'%(asctime)s %(name)-20s %(levelname)-8s %(message)s')) + u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s')) log.addHandler(logfile) logging.addLevelName(15, u'Timer') # Parse command line options and deal with them. diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index e44c424a4..e84e732e7 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -337,13 +337,14 @@ class BibleMediaItem(MediaManagerItem): # load bibles into the combo boxes first = True for bible in bibles: - self.QuickVersionComboBox.addItem(bible) - self.QuickSecondBibleComboBox.addItem(bible) - self.AdvancedVersionComboBox.addItem(bible) - self.AdvancedSecondBibleComboBox.addItem(bible) - if first: - first = False - self.initialiseBible(bible) + if bible is not None: + self.QuickVersionComboBox.addItem(bible) + self.QuickSecondBibleComboBox.addItem(bible) + self.AdvancedVersionComboBox.addItem(bible) + self.AdvancedSecondBibleComboBox.addItem(bible) + if first: + first = False + self.initialiseBible(bible) def onListViewResize(self, width, height): self.SearchProgress.setGeometry(self.ListView.geometry().x(), From a8a7e675a410647cdcdbe5258396e9a86144e5ef Mon Sep 17 00:00:00 2001 From: Martin Thompson Date: Sun, 9 May 2010 21:02:38 +0100 Subject: [PATCH 4/4] Updated from review comments --- openlp/core/ui/maindisplay.py | 6 ++++-- openlp/plugins/bibles/lib/mediaitem.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index d67823908..4b2c4d268 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -118,7 +118,8 @@ class MainDisplay(DisplayWidget): DisplayWidget.__init__(self, parent) self.parent = parent 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) except AttributeError: pass @@ -344,7 +345,8 @@ class VideoDisplay(Phonon.VideoWidget): Phonon.createPath(self.mediaObject, self) Phonon.createPath(self.mediaObject, self.audioObject) 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 except AttributeError: pass diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index e84e732e7..136f45633 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -337,7 +337,7 @@ class BibleMediaItem(MediaManagerItem): # load bibles into the combo boxes first = True for bible in bibles: - if bible is not None: + if bible: self.QuickVersionComboBox.addItem(bible) self.QuickSecondBibleComboBox.addItem(bible) self.AdvancedVersionComboBox.addItem(bible)