openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-902115 into lp:openlp.

Requested reviews:
  Andreas Preikschat (googol)
  Raoul Snyman (raoul-snyman)
  Jonathan Corwin (j-corwin)
Related bugs:
  Bug #902115 in OpenLP: "OpenLP will not start with QT4.8 with Impress enabled"
  https://bugs.launchpad.net/openlp/+bug/902115
  Bug #909673 in OpenLP: "OpenLP does not start on Arch Linux"
  https://bugs.launchpad.net/openlp/+bug/909673

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-902115/+merge/94663

Fix thread bug which on linux causing OpenLP and Impress to fail.
Fix Spelling
Fix Qlocale test to handle versions of PyQt less than 4.9
-- 
https://code.launchpad.net/~trb143/openlp/bug-902115/+merge/94663
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2012-02-19 20:53:41 +0000
+++ openlp/core/lib/__init__.py	2012-02-25 18:59:18 +0000
@@ -56,7 +56,7 @@
 
 class ServiceItemAction(object):
     """
-    Provides an enumeration for the required action moving between service 
+    Provides an enumeration for the required action moving between service
     items by left/right arrow keys
     """
     Previous = 1
@@ -321,15 +321,15 @@
 def create_separated_list(stringlist):
     """
     Returns a string that represents a join of a list of strings with a
-    localized separator. This function corresponts to
+    localized separator. This function corresponds to
     QLocale::createSeparatedList which was introduced in Qt 4.8 and implements
     the algorithm from http://www.unicode.org/reports/tr35/#ListPatterns
 
     ``stringlist``
         List of unicode strings
     """
-    if Qt.qVersion() >= u'4.8':
-        return unicode(QtCore.QLocale.createSeparatedList(stringlist))
+    if Qt.PYQT_VERSION_STR >= u'4.9':
+        return unicode(QtCore.QLocale().createSeparatedList(stringlist))
     if not stringlist:
         return u''
     elif len(stringlist) == 1:

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2011-12-27 10:33:55 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2012-02-25 18:59:18 +0000
@@ -105,7 +105,6 @@
             cmd = get_uno_command()
             self.process = QtCore.QProcess()
             self.process.startDetached(cmd)
-            self.process.waitForStarted()
 
     def get_uno_desktop(self):
         """

=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py	2011-12-27 10:33:55 +0000
+++ openlp/plugins/songs/lib/oooimport.py	2012-02-25 18:59:18 +0000
@@ -142,7 +142,6 @@
                 cmd = get_uno_command()
                 process = QtCore.QProcess()
                 process.startDetached(cmd)
-                process.waitForStarted()
             self.processStarted = True
         except:
             log.exception("startOooProcess failed")