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

Fix for bug #635515.

Browse Source 
Added an option to disable the error form.

bzr-revno: 1034
This commit is contained in:
Raoul Snyman 2010-09-15 17:03:57 +02:00
commit 28d3544964
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openlp.pyw
View File

@ -147,6 +147,9 @@ class OpenLP(QtGui.QApplication):
return self.exec_() return self.exec_()
def hookException(self, exctype, value, traceback): def hookException(self, exctype, value, traceback):
if not hasattr(self, u'mainWindow'):
log.exception(''.join(format_exception(exctype, value, traceback)))
return
if not hasattr(self, u'exceptionForm'): if not hasattr(self, u'exceptionForm'):
self.exceptionForm = ExceptionForm(self.mainWindow) self.exceptionForm = ExceptionForm(self.mainWindow)
self.exceptionForm.exceptionTextEdit.setPlainText( self.exceptionForm.exceptionTextEdit.setPlainText(
@ -161,16 +164,16 @@ def main():
# Set up command line options. # Set up command line options.
usage = u'Usage: %prog [options] [qt-options]' usage = u'Usage: %prog [options] [qt-options]'
parser = OptionParser(usage=usage) parser = OptionParser(usage=usage)
parser.add_option("-l", "--log-level", dest="loglevel", parser.add_option(u'-e', u'--no-error-form', dest=u'no_error_form',
default="warning", metavar="LEVEL", action=u'store_true', help=u'Disable the error notification form.')
help="Set logging to LEVEL level. Valid values are " parser.add_option(u'-l', u'--log-level', dest=u'loglevel',
"\"debug\", \"info\", \"warning\".") default=u'warning', metavar=u'LEVEL', help=u'Set logging to LEVEL '
parser.add_option("-p", "--portable", dest="portable", u'level. Valid values are "debug", "info", "warning".')
action="store_true", parser.add_option(u'-p', u'--portable', dest=u'portable',
help="Specify if this should be run as a portable app, " action=u'store_true', help=u'Specify if this should be run as a '
"off a USB flash drive.") u'portable app, off a USB flash drive (not implemented).')
parser.add_option("-s", "--style", dest="style", parser.add_option(u'-s', u'--style', dest=u'style',
help="Set the Qt4 style (passed directly to Qt4).") help=u'Set the Qt4 style (passed directly to Qt4).')
# Set up logging # Set up logging
log_path = AppLocation.get_directory(AppLocation.CacheDir) log_path = AppLocation.get_directory(AppLocation.CacheDir)
if not os.path.exists(log_path): if not os.path.exists(log_path):
@ -203,7 +206,8 @@ def main():
language = LanguageManager.get_language() language = LanguageManager.get_language()
appTranslator = LanguageManager.get_translator(language) appTranslator = LanguageManager.get_translator(language)
app.installTranslator(appTranslator) app.installTranslator(appTranslator)
sys.excepthook = app.hookException if not options.no_error_form:
sys.excepthook = app.hookException
sys.exit(app.run()) sys.exit(app.run())
if __name__ == u'__main__': if __name__ == u'__main__':