diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 9390ef650..2df8f23c2 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -56,7 +56,7 @@ class SlideLimits(object): 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,16 @@ def check_directory_exists(dir): 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)) + #Not available via pyqt yet so will not work! + #if Qt.qVersion() >= u'4.8': + # return unicode(QtCore.QLocale.createSeparatedList(stringlist)) if not stringlist: return u'' elif len(stringlist) == 1: diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 3e6c5450a..0fd725b83 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -105,7 +105,6 @@ class ImpressController(PresentationController): cmd = get_uno_command() self.process = QtCore.QProcess() self.process.startDetached(cmd) - self.process.waitForStarted() def get_uno_desktop(self): """ diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py index f98cf2dda..5820b1e94 100644 --- a/openlp/plugins/songs/lib/oooimport.py +++ b/openlp/plugins/songs/lib/oooimport.py @@ -142,7 +142,6 @@ class OooImport(SongImport): cmd = get_uno_command() process = QtCore.QProcess() process.startDetached(cmd) - process.waitForStarted() self.processStarted = True except: log.exception("startOooProcess failed")