raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Impress and OpenLP so it now starts .

Browse Source 
Fix Spelling
Remove QLocale code for now as not supported by PyQt

Fixes: https://launchpad.net/bugs/902115
This commit is contained in:
Tim Bentley 2012-02-25 13:01:47 +00:00
parent ea2fc37563
commit c1c1de5472
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/core/lib/__init__.py
View File

@ -56,7 +56,7 @@ class SlideLimits(object):
class ServiceItemAction(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 items by left/right arrow keys
""" """
Previous = 1 Previous = 1
@ -321,15 +321,16 @@ def check_directory_exists(dir):
def create_separated_list(stringlist): def create_separated_list(stringlist):
""" """
Returns a string that represents a join of a list of strings with a 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 QLocale::createSeparatedList which was introduced in Qt 4.8 and implements
the algorithm from http://www.unicode.org/reports/tr35/#ListPatterns the algorithm from http://www.unicode.org/reports/tr35/#ListPatterns
``stringlist`` ``stringlist``
List of unicode strings List of unicode strings
""" """
if Qt.qVersion() >= u'4.8': #Not available via pyqt yet so will not work!
return unicode(QtCore.QLocale.createSeparatedList(stringlist)) #if Qt.qVersion() >= u'4.8':
# return unicode(QtCore.QLocale.createSeparatedList(stringlist))
if not stringlist: if not stringlist:
return u'' return u''
elif len(stringlist) == 1: elif len(stringlist) == 1:

1
openlp/plugins/presentations/lib/impresscontroller.py
View File

@ -105,7 +105,6 @@ class ImpressController(PresentationController):
cmd = get_uno_command() cmd = get_uno_command()
self.process = QtCore.QProcess() self.process = QtCore.QProcess()
self.process.startDetached(cmd) self.process.startDetached(cmd)
self.process.waitForStarted()
def get_uno_desktop(self): def get_uno_desktop(self):
""" """

1
openlp/plugins/songs/lib/oooimport.py
View File

@ -142,7 +142,6 @@ class OooImport(SongImport):
cmd = get_uno_command() cmd = get_uno_command()
process = QtCore.QProcess() process = QtCore.QProcess()
process.startDetached(cmd) process.startDetached(cmd)
process.waitForStarted()
self.processStarted = True self.processStarted = True
except: except:
log.exception("startOooProcess failed") log.exception("startOooProcess failed")