Head

openlp.pyw

@@ -29,12 +29,14 @@ import os
 import sys
 import logging
 from optparse import OptionParser
+from traceback import format_exception
 
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver
 from openlp.core.resources import qInitResources
 from openlp.core.ui.mainwindow import MainWindow
+from openlp.core.ui.exceptionform import ExceptionForm
 from openlp.core.ui import SplashScreen, ScreenList
 from openlp.core.utils import AppLocation, LanguageManager, VersionThread
 
@@ -144,6 +146,13 @@ class OpenLP(QtGui.QApplication):
         VersionThread(self.mainWindow, app_version).start()
         return self.exec_()
 
+    def hookException(self, exctype, value, traceback):
+        if not hasattr(self, u'exceptionForm'):
+            self.exceptionForm = ExceptionForm(self.mainWindow)
+        self.exceptionForm.exceptionTextEdit.setPlainText(
+            ''.join(format_exception(exctype, value, traceback)))
+        self.exceptionForm.exec_()
+
 def main():
     """
     The main function which parses command line options and then runs
@@ -194,7 +203,7 @@ def main():
     language = LanguageManager.get_language()
     appTranslator = LanguageManager.get_translator(language)
     app.installTranslator(appTranslator)
-
+    sys.excepthook = app.hookException
     sys.exit(app.run())
 
 if __name__ == u'__main__':

openlp/core/ui/exceptiondialog.py

@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+
+class Ui_ExceptionDialog(object):
+    def setupUi(self, exceptionDialog):
+        exceptionDialog.setObjectName(u'exceptionDialog')
+        exceptionDialog.resize(580, 407)
+        self.exceptionLayout = QtGui.QVBoxLayout(exceptionDialog)
+        self.exceptionLayout.setSpacing(8)
+        self.exceptionLayout.setMargin(8)
+        self.exceptionLayout.setObjectName(u'exceptionLayout')
+        self.messageLayout = QtGui.QHBoxLayout()
+        self.messageLayout.setSpacing(0)
+        self.messageLayout.setContentsMargins(0, -1, 0, -1)
+        self.messageLayout.setObjectName(u'messageLayout')
+        self.bugLabel = QtGui.QLabel(exceptionDialog)
+        self.bugLabel.setMinimumSize(QtCore.QSize(64, 64))
+        self.bugLabel.setMaximumSize(QtCore.QSize(64, 64))
+        self.bugLabel.setText(u'')
+        self.bugLabel.setPixmap(QtGui.QPixmap(u':/graphics/exception.png'))
+        self.bugLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.bugLabel.setObjectName(u'bugLabel')
+        self.messageLayout.addWidget(self.bugLabel)
+        self.messageLabel = QtGui.QLabel(exceptionDialog)
+        self.messageLabel.setWordWrap(True)
+        self.messageLabel.setObjectName(u'messageLabel')
+        self.messageLayout.addWidget(self.messageLabel)
+        self.exceptionLayout.addLayout(self.messageLayout)
+        self.exceptionTextEdit = QtGui.QPlainTextEdit(exceptionDialog)
+        self.exceptionTextEdit.setReadOnly(True)
+        self.exceptionTextEdit.setBackgroundVisible(False)
+        self.exceptionTextEdit.setObjectName(u'exceptionTextEdit')
+        self.exceptionLayout.addWidget(self.exceptionTextEdit)
+        self.exceptionButtonBox = QtGui.QDialogButtonBox(exceptionDialog)
+        self.exceptionButtonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.exceptionButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
+        self.exceptionButtonBox.setObjectName(u'exceptionButtonBox')
+        self.exceptionLayout.addWidget(self.exceptionButtonBox)
+
+        self.retranslateUi(exceptionDialog)
+        QtCore.QObject.connect(self.exceptionButtonBox,
+            QtCore.SIGNAL(u'accepted()'), exceptionDialog.accept)
+        QtCore.QObject.connect(self.exceptionButtonBox,
+            QtCore.SIGNAL(u'rejected()'), exceptionDialog.reject)
+        QtCore.QMetaObject.connectSlotsByName(exceptionDialog)
+
+    def retranslateUi(self, exceptionDialog):
+        exceptionDialog.setWindowTitle(
+            translate('OpenLP.ExceptionDialog', 'Error Occured'))
+        self.messageLabel.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
+            'OpenLP hit a problem, and couldn\'t recover. The text in the box '
+            'below contains information that might be helpful to the OpenLP '
+            'developers, so please e-mail it to bugs@openlp.org, along with a '
+            'detailed description of what you were doing when the problem '
+            'occurred.'))

openlp/core/ui/exceptionform.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from exceptiondialog import Ui_ExceptionDialog
+from openlp.core.lib import translate
+
+class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
+    """
+    The exception dialog
+    """
+    def __init__(self, parent):
+        QtGui.QDialog.__init__(self, parent)
+        self.setupUi(self)

resources/forms/exceptiondialog.ui

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExceptionDialog</class>
+ <widget class="QDialog" name="ExceptionDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>580</width>
+    <height>407</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="exceptionLayout">
+   <property name="spacing">
+    <number>8</number>
+   </property>
+   <property name="margin">
+    <number>8</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="messageLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="bugLabel">
+       <property name="minimumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../images/openlp-2.qrc">:/graphics/exception.png</pixmap>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="messageLabel">
+       <property name="text">
+        <string>Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred.</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QPlainTextEdit" name="exceptionTextEdit">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="backgroundVisible">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="exceptionButtonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>exceptionButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ExceptionDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>exceptionButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ExceptionDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

resources/images/openlp-2.qrc

@@ -62,6 +62,7 @@
     <file>openlp-logo-256x256.png</file>
   </qresource>
   <qresource prefix="graphics">
+    <file>exception.png</file>
     <file>openlp-about-logo.png</file>
     <file>openlp-splash-screen.png</file>
   </qresource>