forked from openlp/openlp
Move main() from openlp.pyw to openlp.core.__init__
This commit is contained in:
parent
68facbf2b5
commit
7fae06483a
99
openlp.pyw
99
openlp.pyw
@ -25,110 +25,15 @@
|
|||||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import logging
|
|
||||||
# Import uuid now, to avoid the rare bug described in the support system:
|
# Import uuid now, to avoid the rare bug described in the support system:
|
||||||
# http://support.openlp.org/issues/102
|
# http://support.openlp.org/issues/102
|
||||||
# If https://bugs.gentoo.org/show_bug.cgi?id=317557 is fixed, the import can be
|
# If https://bugs.gentoo.org/show_bug.cgi?id=317557 is fixed, the import can be
|
||||||
# removed.
|
# removed.
|
||||||
import uuid
|
import uuid
|
||||||
from optparse import OptionParser
|
|
||||||
from traceback import format_exception
|
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from openlp.core import main
|
||||||
|
|
||||||
from openlp.core import OpenLP
|
|
||||||
from openlp.core.lib import Receiver, check_directory_exists
|
|
||||||
from openlp.core.lib.ui import UiStrings
|
|
||||||
from openlp.core.resources import qInitResources
|
|
||||||
from openlp.core.ui.mainwindow import MainWindow
|
|
||||||
from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
|
|
||||||
from openlp.core.ui.firsttimeform import FirstTimeForm
|
|
||||||
from openlp.core.ui.exceptionform import ExceptionForm
|
|
||||||
from openlp.core.ui import SplashScreen, ScreenList
|
|
||||||
from openlp.core.utils import AppLocation, LanguageManager, VersionThread, \
|
|
||||||
get_application_version, DelayStartThread
|
|
||||||
|
|
||||||
log = logging.getLogger()
|
|
||||||
|
|
||||||
def main():
|
|
||||||
"""
|
|
||||||
The main function which parses command line options and then runs
|
|
||||||
the PyQt4 Application.
|
|
||||||
"""
|
|
||||||
# Set up command line options.
|
|
||||||
usage = 'Usage: %prog [options] [qt-options]'
|
|
||||||
parser = OptionParser(usage=usage)
|
|
||||||
parser.add_option('-e', '--no-error-form', dest='no_error_form',
|
|
||||||
action='store_true', help='Disable the error notification form.')
|
|
||||||
parser.add_option('-l', '--log-level', dest='loglevel',
|
|
||||||
default='warning', metavar='LEVEL', help='Set logging to LEVEL '
|
|
||||||
'level. Valid values are "debug", "info", "warning".')
|
|
||||||
parser.add_option('-p', '--portable', dest='portable',
|
|
||||||
action='store_true', help='Specify if this should be run as a '
|
|
||||||
'portable app, off a USB flash drive (not implemented).')
|
|
||||||
parser.add_option('-d', '--dev-version', dest='dev_version',
|
|
||||||
action='store_true', help='Ignore the version file and pull the '
|
|
||||||
'version directly from Bazaar')
|
|
||||||
parser.add_option('-s', '--style', dest='style',
|
|
||||||
help='Set the Qt4 style (passed directly to Qt4).')
|
|
||||||
# Set up logging
|
|
||||||
log_path = AppLocation.get_directory(AppLocation.CacheDir)
|
|
||||||
check_directory_exists(log_path)
|
|
||||||
filename = os.path.join(log_path, u'openlp.log')
|
|
||||||
logfile = logging.FileHandler(filename, u'w')
|
|
||||||
logfile.setFormatter(logging.Formatter(
|
|
||||||
u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
|
|
||||||
log.addHandler(logfile)
|
|
||||||
logging.addLevelName(15, u'Timer')
|
|
||||||
# Parse command line options and deal with them.
|
|
||||||
(options, args) = parser.parse_args()
|
|
||||||
qt_args = []
|
|
||||||
if options.loglevel.lower() in ['d', 'debug']:
|
|
||||||
log.setLevel(logging.DEBUG)
|
|
||||||
print 'Logging to:', filename
|
|
||||||
elif options.loglevel.lower() in ['w', 'warning']:
|
|
||||||
log.setLevel(logging.WARNING)
|
|
||||||
else:
|
|
||||||
log.setLevel(logging.INFO)
|
|
||||||
if options.style:
|
|
||||||
qt_args.extend(['-style', options.style])
|
|
||||||
# Throw the rest of the arguments at Qt, just in case.
|
|
||||||
qt_args.extend(args)
|
|
||||||
# Initialise the resources
|
|
||||||
qInitResources()
|
|
||||||
# Now create and actually run the application.
|
|
||||||
app = OpenLP(qt_args)
|
|
||||||
# Instance check
|
|
||||||
if app.isAlreadyRunning():
|
|
||||||
sys.exit()
|
|
||||||
app.setOrganizationName(u'OpenLP')
|
|
||||||
app.setOrganizationDomain(u'openlp.org')
|
|
||||||
app.setApplicationName(u'OpenLP')
|
|
||||||
app.setApplicationVersion(get_application_version()[u'version'])
|
|
||||||
# First time checks in settings
|
|
||||||
if not QtCore.QSettings().value(u'general/has run wizard',
|
|
||||||
QtCore.QVariant(False)).toBool():
|
|
||||||
if not FirstTimeLanguageForm().exec_():
|
|
||||||
# if cancel then stop processing
|
|
||||||
sys.exit()
|
|
||||||
if sys.platform == u'darwin':
|
|
||||||
OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath()
|
|
||||||
+ "/qt4_plugins")
|
|
||||||
# i18n Set Language
|
|
||||||
language = LanguageManager.get_language()
|
|
||||||
app_translator, default_translator = \
|
|
||||||
LanguageManager.get_translator(language)
|
|
||||||
if not app_translator.isEmpty():
|
|
||||||
app.installTranslator(app_translator)
|
|
||||||
if not default_translator.isEmpty():
|
|
||||||
app.installTranslator(default_translator)
|
|
||||||
else:
|
|
||||||
log.debug(u'Could not find default_translator.')
|
|
||||||
if not options.no_error_form:
|
|
||||||
sys.excepthook = app.hookException
|
|
||||||
sys.exit(app.run(qt_args))
|
|
||||||
|
|
||||||
if __name__ == u'__main__':
|
if __name__ == u'__main__':
|
||||||
"""
|
"""
|
||||||
|
@ -30,11 +30,6 @@ __all__ = ('OpenLP', 'main')
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
# Import uuid now, to avoid the rare bug described in the support system:
|
|
||||||
# http://support.openlp.org/issues/102
|
|
||||||
# If https://bugs.gentoo.org/show_bug.cgi?id=317557 is fixed, the import can be
|
|
||||||
# removed.
|
|
||||||
import uuid
|
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
from traceback import format_exception
|
from traceback import format_exception
|
||||||
|
|
||||||
@ -83,6 +78,7 @@ QToolBar
|
|||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
class OpenLP(QtGui.QApplication):
|
class OpenLP(QtGui.QApplication):
|
||||||
"""
|
"""
|
||||||
The core application class. This class inherits from Qt's QApplication
|
The core application class. This class inherits from Qt's QApplication
|
||||||
@ -102,6 +98,10 @@ 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)
|
||||||
@ -207,3 +207,76 @@ class OpenLP(QtGui.QApplication):
|
|||||||
return QtGui.QApplication.event(self, event)
|
return QtGui.QApplication.event(self, event)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""
|
||||||
|
The main function which parses command line options and then runs
|
||||||
|
the PyQt4 Application.
|
||||||
|
"""
|
||||||
|
# Set up command line options.
|
||||||
|
usage = 'Usage: %prog [options] [qt-options]'
|
||||||
|
parser = OptionParser(usage=usage)
|
||||||
|
parser.add_option('-e', '--no-error-form', dest='no_error_form',
|
||||||
|
action='store_true', help='Disable the error notification form.')
|
||||||
|
parser.add_option('-l', '--log-level', dest='loglevel',
|
||||||
|
default='warning', metavar='LEVEL', help='Set logging to LEVEL '
|
||||||
|
'level. Valid values are "debug", "info", "warning".')
|
||||||
|
parser.add_option('-p', '--portable', dest='portable',
|
||||||
|
action='store_true', help='Specify if this should be run as a '
|
||||||
|
'portable app, off a USB flash drive (not implemented).')
|
||||||
|
parser.add_option('-d', '--dev-version', dest='dev_version',
|
||||||
|
action='store_true', help='Ignore the version file and pull the '
|
||||||
|
'version directly from Bazaar')
|
||||||
|
parser.add_option('-s', '--style', dest='style',
|
||||||
|
help='Set the Qt4 style (passed directly to Qt4).')
|
||||||
|
# Set up logging
|
||||||
|
log_path = AppLocation.get_directory(AppLocation.CacheDir)
|
||||||
|
check_directory_exists(log_path)
|
||||||
|
filename = os.path.join(log_path, u'openlp.log')
|
||||||
|
logfile = logging.FileHandler(filename, u'w')
|
||||||
|
logfile.setFormatter(logging.Formatter(
|
||||||
|
u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
|
||||||
|
log.addHandler(logfile)
|
||||||
|
logging.addLevelName(15, u'Timer')
|
||||||
|
# Parse command line options and deal with them.
|
||||||
|
(options, args) = parser.parse_args()
|
||||||
|
qt_args = []
|
||||||
|
if options.loglevel.lower() in ['d', 'debug']:
|
||||||
|
log.setLevel(logging.DEBUG)
|
||||||
|
print 'Logging to:', filename
|
||||||
|
elif options.loglevel.lower() in ['w', 'warning']:
|
||||||
|
log.setLevel(logging.WARNING)
|
||||||
|
else:
|
||||||
|
log.setLevel(logging.INFO)
|
||||||
|
if options.style:
|
||||||
|
qt_args.extend(['-style', options.style])
|
||||||
|
# Throw the rest of the arguments at Qt, just in case.
|
||||||
|
qt_args.extend(args)
|
||||||
|
# Initialise the resources
|
||||||
|
qInitResources()
|
||||||
|
# Now create and actually run the application.
|
||||||
|
app = OpenLP(qt_args)
|
||||||
|
# Instance check
|
||||||
|
if app.isAlreadyRunning():
|
||||||
|
sys.exit()
|
||||||
|
# First time checks in settings
|
||||||
|
if not QtCore.QSettings().value(u'general/has run wizard',
|
||||||
|
QtCore.QVariant(False)).toBool():
|
||||||
|
if not FirstTimeLanguageForm().exec_():
|
||||||
|
# if cancel then stop processing
|
||||||
|
sys.exit()
|
||||||
|
#if sys.platform == u'darwin':
|
||||||
|
# OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath()
|
||||||
|
# + "/qt4_plugins")
|
||||||
|
# i18n Set Language
|
||||||
|
language = LanguageManager.get_language()
|
||||||
|
app_translator, default_translator = \
|
||||||
|
LanguageManager.get_translator(language)
|
||||||
|
if not app_translator.isEmpty():
|
||||||
|
app.installTranslator(app_translator)
|
||||||
|
if not default_translator.isEmpty():
|
||||||
|
app.installTranslator(default_translator)
|
||||||
|
else:
|
||||||
|
log.debug(u'Could not find default_translator.')
|
||||||
|
if not options.no_error_form:
|
||||||
|
sys.excepthook = app.hookException
|
||||||
|
sys.exit(app.run(qt_args))
|
||||||
|
Loading…
Reference in New Issue
Block a user