openlp-core team mailing list archive

[Martin Thompson <martin@xxxxxxxxxxxxxxxxxx>]

Martin Thompson has proposed merging lp:~mjthompson/openlp/qt4.4 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Some tweaks to catch bits fo qt4.5 which are not available in qt4.4.

Also I somehow got the Bible plugin confused enough to try adding a "None" bible, so there's a quick check for that. 
-- 
https://code.launchpad.net/~mjthompson/openlp/qt4.4/+merge/24931
Your team OpenLP Core is requested to review the proposed merge of lp:~mjthompson/openlp/qt4.4 into lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2010-04-28 17:07:36 +0000
+++ openlp.pyw	2010-05-07 20:39:24 +0000
@@ -169,7 +169,7 @@
     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.

=== modified file 'openlp/core/lib/settingsmanager.py'
--- openlp/core/lib/settingsmanager.py	2010-04-28 14:17:42 +0000
+++ openlp/core/lib/settingsmanager.py	2010-05-07 20:39:24 +0000
@@ -53,7 +53,7 @@
         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',

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-05-01 06:50:43 +0000
+++ openlp/core/ui/maindisplay.py	2010-05-07 20:39:24 +0000
@@ -118,7 +118,10 @@
         DisplayWidget.__init__(self, parent)
         self.parent = parent
         self.setWindowTitle(u'OpenLP Display')
-        self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+        try: # WA_TranslucentBackground not available in QT4.4
+            self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+        except AttributeError:
+            pass
         self.screens = screens
         self.display_image = QtGui.QLabel(self)
         self.display_image.setScaledContents(True)
@@ -340,8 +343,13 @@
         self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
         Phonon.createPath(self.mediaObject, self)
         Phonon.createPath(self.mediaObject, self.audioObject)
-        self.setWindowFlags(QtCore.Qt.WindowStaysOnBottomHint |
-            QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog)
+        flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
+        try: # WindowsStaysOnBottomHint is not available in QT4.4
+            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
+        except AttributeError:
+            pass
+        self.setWindowFlags(flags)
+            
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'maindisplay_hide'), self.mediaHide)
         QtCore.QObject.connect(Receiver.get_receiver(),

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2010-05-01 20:00:01 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2010-05-07 20:39:24 +0000
@@ -337,13 +337,14 @@
         # 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(),

=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py	2010-04-30 22:38:15 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py	2010-05-07 20:39:24 +0000
@@ -105,7 +105,7 @@
         if self.available:
             self.enabled = QtCore.QSettings().value(
                 self.settingsSection + u'/' + name,
-                QtCore.Qt.Unchecked).toInt()[0] == QtCore.Qt.Checked
+                QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0] == QtCore.Qt.Checked
         else:
             self.enabled = False
         self.thumbnailroot = os.path.join(

=== modified file 'openlp/plugins/songs/lib/manager.py'
--- openlp/plugins/songs/lib/manager.py	2010-04-28 14:17:42 +0000
+++ openlp/plugins/songs/lib/manager.py	2010-05-07 20:39:24 +0000
@@ -50,7 +50,7 @@
         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')