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

- Remove darwin specific dead code

Browse Source 
- Move app.setOrganization and app.setApplication to orgininal place
This commit is contained in:
Martin Zibricky 2011-08-25 17:33:21 +02:00
parent 7b33bc3c4a
commit 20c431a6e5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/__init__.py
View File

@ -98,10 +98,6 @@ class OpenLP(QtGui.QApplication):
""" """
Run the OpenLP application. Run the OpenLP application.
""" """
self.setOrganizationName(u'OpenLP')
self.setOrganizationDomain(u'openlp.org')
self.setApplicationName(u'OpenLP')
self.setApplicationVersion(get_application_version()[u'version'])
# On Windows, the args passed into the constructor are # On Windows, the args passed into the constructor are
# ignored. Not very handy, so set the ones we want to use. # ignored. Not very handy, so set the ones we want to use.
self.args.extend(args) self.args.extend(args)
@ -261,6 +257,10 @@ def main(args=None):
qInitResources() qInitResources()
# Now create and actually run the application. # Now create and actually run the application.
app = OpenLP(qt_args) app = OpenLP(qt_args)
app.setOrganizationName(u'OpenLP')
app.setOrganizationDomain(u'openlp.org')
app.setApplicationName(u'OpenLP')
app.setApplicationVersion(get_application_version()[u'version'])
# Instance check # Instance check
if app.isAlreadyRunning(): if app.isAlreadyRunning():
sys.exit() sys.exit()
@ -270,9 +270,6 @@ def main(args=None):
if not FirstTimeLanguageForm().exec_(): if not FirstTimeLanguageForm().exec_():
# if cancel then stop processing # if cancel then stop processing
sys.exit() sys.exit()
#if sys.platform == u'darwin':
# OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath()
# + "/qt4_plugins")
# i18n Set Language # i18n Set Language
language = LanguageManager.get_language() language = LanguageManager.get_language()
app_translator, default_translator = \ app_translator, default_translator = \