Merge lp:~trb143/openlp/bug-902115 into lp:openlp

[Tim Bentley]

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

[Andreas Preikschat (googol-deactivatedaccount)]

Should work (when I removed process.waitForStarted() it worked)....

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

(see bug #909673)

[Jonathan Corwin (j-corwin)]

Does it work OK on slower machines where it might take a while for Impress to start, and so code which tries to access the Impress API might do so before it has finished loading?

review: Needs Information

[Raoul Snyman (raoul-snyman)]

What would be better is to check if the user is running PyQt4 version 4.9 or higher.

review: Needs Fixing

[Raoul Snyman (raoul-snyman)]

Looks good to me.

review: Approve

[Raoul Snyman (raoul-snyman)]

Oh wait... you need to modify line 27 to say:

  return unicode(QtCore.QLocale().createSeparatedList(stringlist))

(extra set of brackets)

review: Needs Fixing

[Jonathan Corwin (j-corwin)]

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== 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")