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

equal to trunk

Browse Source
This commit is contained in:
rimach 2010-05-20 23:44:43 +02:00
parent 69cc9cdee3
commit d6e4f343fc
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
openlp.pyw
View File

@ -157,28 +157,11 @@ def main():
help="Set logging to LEVEL level. Valid values are "
"\"debug\", \"info\", \"warning\".")
parser.add_option("-p", "--portable", dest="portable",
default="../openlp-data", metavar="APP_PATH",
help="Specify relative Path where database should be located. E.g. ../openlp-data")
action="store_true",
help="Specify if this should be run as a portable app, "
"off a USB flash drive.")
parser.add_option("-s", "--style", dest="style",
help="Set the Qt4 style (passed directly to Qt4).")
# 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])
if options.portable:
os.environ['PORTABLE'] = options.portable
# Throw the rest of the arguments at Qt, just in case.
qt_args.extend(args)
# Set up logging
log_path = AppLocation.get_directory(AppLocation.ConfigDir)
if not os.path.exists(log_path):
@ -186,10 +169,23 @@ def main():
filename = os.path.join(log_path, u'openlp.log')
logfile = FileHandler(filename, u'w')
logfile.setFormatter(logging.Formatter(
u'%(asctime)s %(name)-20s %(levelname)-8s %(message)s'))
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.

10
openlp/core/utils/__init__.py
View File

@ -56,10 +56,7 @@ class AppLocation(object):
if dir_type == AppLocation.AppDir:
return os.path.abspath(os.path.split(sys.argv[0])[0])
elif dir_type == AppLocation.ConfigDir:
if os.getenv(u'PORTABLE') is not None:
path = os.path.split(os.path.abspath(sys.argv[0]))[0]
path = os.path.join(path, os.getenv(u'PORTABLE'))
elif sys.platform == u'win32':
if sys.platform == u'win32':
path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
elif sys.platform == u'darwin':
path = os.path.join(os.getenv(u'HOME'), u'Library',
@ -73,10 +70,7 @@ class AppLocation(object):
path = os.path.join(os.getenv(u'HOME'), u'.openlp')
return path
elif dir_type == AppLocation.DataDir:
if os.getenv(u'PORTABLE') is not None:
path = os.path.split(os.path.abspath(sys.argv[0]))[0]
path = os.path.join(path, os.getenv(u'PORTABLE'), u'data')
elif sys.platform == u'win32':
if sys.platform == u'win32':
path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
elif sys.platform == u'darwin':
path = os.path.join(os.getenv(u'HOME'), u'Library',