forked from openlp/openlp
Fix setup.py so it works following file removal.
Fix settings to work with -d option Upgrade Exception form to allow an attachment. Upgrade Exception form to force a 20 character error description bzr-revno: 1267
This commit is contained in:
commit
3bde520041
@ -76,7 +76,7 @@ class OpenLP(QtGui.QApplication):
|
|||||||
"""
|
"""
|
||||||
Load and store current Application Version
|
Load and store current Application Version
|
||||||
"""
|
"""
|
||||||
if u'--dev-version' in sys.argv:
|
if u'--dev-version' in sys.argv or u'-d' in sys.argv:
|
||||||
# If we're running the dev version, let's use bzr to get the version
|
# If we're running the dev version, let's use bzr to get the version
|
||||||
try:
|
try:
|
||||||
# If bzrlib is availble, use it
|
# If bzrlib is availble, use it
|
||||||
@ -216,6 +216,7 @@ class OpenLP(QtGui.QApplication):
|
|||||||
Sets the Busy Cursor for the Application
|
Sets the Busy Cursor for the Application
|
||||||
"""
|
"""
|
||||||
self.setOverrideCursor(QtCore.Qt.BusyCursor)
|
self.setOverrideCursor(QtCore.Qt.BusyCursor)
|
||||||
|
self.processEvents()
|
||||||
|
|
||||||
def setNormalCursor(self):
|
def setNormalCursor(self):
|
||||||
"""
|
"""
|
||||||
|
@ -46,6 +46,15 @@ class Ui_ExceptionDialog(object):
|
|||||||
self.messageLabel.setObjectName(u'messageLabel')
|
self.messageLabel.setObjectName(u'messageLabel')
|
||||||
self.messageLayout.addWidget(self.messageLabel)
|
self.messageLayout.addWidget(self.messageLabel)
|
||||||
self.exceptionLayout.addLayout(self.messageLayout)
|
self.exceptionLayout.addLayout(self.messageLayout)
|
||||||
|
self.descriptionExplanation = QtGui.QLabel(exceptionDialog)
|
||||||
|
self.descriptionExplanation.setObjectName(u'descriptionExplanation')
|
||||||
|
self.exceptionLayout.addWidget(self.descriptionExplanation)
|
||||||
|
self.descriptionTextEdit = QtGui.QPlainTextEdit(exceptionDialog)
|
||||||
|
self.descriptionTextEdit.setObjectName(u'descriptionTextEdit')
|
||||||
|
self.exceptionLayout.addWidget(self.descriptionTextEdit)
|
||||||
|
self.descriptionWordCount = QtGui.QLabel(exceptionDialog)
|
||||||
|
self.descriptionWordCount.setObjectName(u'descriptionWordCount')
|
||||||
|
self.exceptionLayout.addWidget(self.descriptionWordCount)
|
||||||
self.exceptionTextEdit = QtGui.QPlainTextEdit(exceptionDialog)
|
self.exceptionTextEdit = QtGui.QPlainTextEdit(exceptionDialog)
|
||||||
self.exceptionTextEdit.setReadOnly(True)
|
self.exceptionTextEdit.setReadOnly(True)
|
||||||
self.exceptionTextEdit.setObjectName(u'exceptionTextEdit')
|
self.exceptionTextEdit.setObjectName(u'exceptionTextEdit')
|
||||||
@ -65,19 +74,31 @@ class Ui_ExceptionDialog(object):
|
|||||||
self.saveReportButton.setObjectName(u'saveReportButton')
|
self.saveReportButton.setObjectName(u'saveReportButton')
|
||||||
self.exceptionButtonBox.addButton(self.saveReportButton,
|
self.exceptionButtonBox.addButton(self.saveReportButton,
|
||||||
QtGui.QDialogButtonBox.ActionRole)
|
QtGui.QDialogButtonBox.ActionRole)
|
||||||
|
self.attachFileButton = QtGui.QPushButton(exceptionDialog)
|
||||||
|
self.attachFileButton.setIcon(build_icon(u':/general/general_open.png'))
|
||||||
|
self.attachFileButton.setObjectName(u'attachFileButton')
|
||||||
|
self.exceptionButtonBox.addButton(self.attachFileButton,
|
||||||
|
QtGui.QDialogButtonBox.ActionRole)
|
||||||
|
|
||||||
self.retranslateUi(exceptionDialog)
|
self.retranslateUi(exceptionDialog)
|
||||||
|
QtCore.QObject.connect(self.descriptionTextEdit,
|
||||||
|
QtCore.SIGNAL(u'textChanged()'), self.onDescriptionUpdated)
|
||||||
QtCore.QObject.connect(self.exceptionButtonBox,
|
QtCore.QObject.connect(self.exceptionButtonBox,
|
||||||
QtCore.SIGNAL(u'rejected()'), exceptionDialog.reject)
|
QtCore.SIGNAL(u'rejected()'), exceptionDialog.reject)
|
||||||
QtCore.QObject.connect(self.sendReportButton,
|
QtCore.QObject.connect(self.sendReportButton,
|
||||||
QtCore.SIGNAL(u'pressed()'), self.onSendReportButtonPressed)
|
QtCore.SIGNAL(u'pressed()'), self.onSendReportButtonPressed)
|
||||||
QtCore.QObject.connect(self.saveReportButton,
|
QtCore.QObject.connect(self.saveReportButton,
|
||||||
QtCore.SIGNAL(u'pressed()'), self.onSaveReportButtonPressed)
|
QtCore.SIGNAL(u'pressed()'), self.onSaveReportButtonPressed)
|
||||||
|
QtCore.QObject.connect(self.attachFileButton,
|
||||||
|
QtCore.SIGNAL(u'pressed()'), self.onAttachFileButtonPressed)
|
||||||
QtCore.QMetaObject.connectSlotsByName(exceptionDialog)
|
QtCore.QMetaObject.connectSlotsByName(exceptionDialog)
|
||||||
|
|
||||||
def retranslateUi(self, exceptionDialog):
|
def retranslateUi(self, exceptionDialog):
|
||||||
exceptionDialog.setWindowTitle(
|
exceptionDialog.setWindowTitle(
|
||||||
translate('OpenLP.ExceptionDialog', 'Error Occurred'))
|
translate('OpenLP.ExceptionDialog', 'Error Occurred'))
|
||||||
|
self.descriptionExplanation.setText(translate('OpenLP.ExceptionDialog',
|
||||||
|
'Please enter a description of what you were doing to cause this '
|
||||||
|
'error \n(Minimum 20 characters)'))
|
||||||
self.messageLabel.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
|
self.messageLabel.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
|
||||||
'OpenLP hit a problem, and couldn\'t recover. The text in the box '
|
'OpenLP hit a problem, and couldn\'t recover. The text in the box '
|
||||||
'below contains information that might be helpful to the OpenLP '
|
'below contains information that might be helpful to the OpenLP '
|
||||||
@ -88,3 +109,5 @@ class Ui_ExceptionDialog(object):
|
|||||||
'Send E-Mail'))
|
'Send E-Mail'))
|
||||||
self.saveReportButton.setText(translate('OpenLP.ExceptionDialog',
|
self.saveReportButton.setText(translate('OpenLP.ExceptionDialog',
|
||||||
'Save to File'))
|
'Save to File'))
|
||||||
|
self.attachFileButton.setText(translate('OpenLP.ExceptionDialog',
|
||||||
|
'Attach File'))
|
||||||
|
@ -70,8 +70,15 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
self.settingsSection = u'crashreport'
|
self.settingsSection = u'crashreport'
|
||||||
|
|
||||||
|
def exec_(self):
|
||||||
|
self.descriptionTextEdit.setPlainText(u'')
|
||||||
|
self.onDescriptionUpdated()
|
||||||
|
self.fileAttachment = None
|
||||||
|
return QtGui.QDialog.exec_(self)
|
||||||
|
|
||||||
def _createReport(self):
|
def _createReport(self):
|
||||||
openlp_version = self.parent().applicationVersion[u'full']
|
openlp_version = self.parent().applicationVersion[u'full']
|
||||||
|
description = unicode(self.descriptionTextEdit.toPlainText())
|
||||||
traceback = unicode(self.exceptionTextEdit.toPlainText())
|
traceback = unicode(self.exceptionTextEdit.toPlainText())
|
||||||
system = unicode(translate('OpenLP.ExceptionForm',
|
system = unicode(translate('OpenLP.ExceptionForm',
|
||||||
'Platform: %s\n')) % platform.platform()
|
'Platform: %s\n')) % platform.platform()
|
||||||
@ -90,7 +97,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
system = system + u'Desktop: KDE SC\n'
|
system = system + u'Desktop: KDE SC\n'
|
||||||
elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'):
|
elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'):
|
||||||
system = system + u'Desktop: GNOME\n'
|
system = system + u'Desktop: GNOME\n'
|
||||||
return (openlp_version, traceback, system, libraries)
|
return (openlp_version, description, traceback, system, libraries)
|
||||||
|
|
||||||
def onSaveReportButtonPressed(self):
|
def onSaveReportButtonPressed(self):
|
||||||
"""
|
"""
|
||||||
@ -99,6 +106,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
report = unicode(translate('OpenLP.ExceptionForm',
|
report = unicode(translate('OpenLP.ExceptionForm',
|
||||||
'**OpenLP Bug Report**\n'
|
'**OpenLP Bug Report**\n'
|
||||||
'Version: %s\n\n'
|
'Version: %s\n\n'
|
||||||
|
'--- Details of the Exception. ---\n\n%s\n\n '
|
||||||
'--- Exception Traceback ---\n%s\n'
|
'--- Exception Traceback ---\n%s\n'
|
||||||
'--- System information ---\n%s\n'
|
'--- System information ---\n%s\n'
|
||||||
'--- Library Versions ---\n%s\n'))
|
'--- Library Versions ---\n%s\n'))
|
||||||
@ -132,18 +140,48 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
body = unicode(translate('OpenLP.ExceptionForm',
|
body = unicode(translate('OpenLP.ExceptionForm',
|
||||||
'*OpenLP Bug Report*\n'
|
'*OpenLP Bug Report*\n'
|
||||||
'Version: %s\n\n'
|
'Version: %s\n\n'
|
||||||
'--- Please enter the report below this line. ---\n\n\n'
|
'--- Details of the Exception. ---\n\n%s\n\n '
|
||||||
'--- Exception Traceback ---\n%s\n'
|
'--- Exception Traceback ---\n%s\n'
|
||||||
'--- System information ---\n%s\n'
|
'--- System information ---\n%s\n'
|
||||||
'--- Library Versions ---\n%s\n',
|
'--- Library Versions ---\n%s\n',
|
||||||
'Please add the information that bug reports are favoured written '
|
'Please add the information that bug reports are favoured written '
|
||||||
'in English.'))
|
'in English.'))
|
||||||
content = self._createReport()
|
content = self._createReport()
|
||||||
for line in content[1].split(u'\n'):
|
for line in content[2].split(u'\n'):
|
||||||
if re.search(r'[/\\]openlp[/\\]', line):
|
if re.search(r'[/\\]openlp[/\\]', line):
|
||||||
source = re.sub(r'.*[/\\]openlp[/\\](.*)".*', r'\1', line)
|
source = re.sub(r'.*[/\\]openlp[/\\](.*)".*', r'\1', line)
|
||||||
if u':' in line:
|
if u':' in line:
|
||||||
exception = line.split(u'\n')[-1].split(u':')[0]
|
exception = line.split(u'\n')[-1].split(u':')[0]
|
||||||
subject = u'Bug report: %s in %s' % (exception, source)
|
subject = u'Bug report: %s in %s' % (exception, source)
|
||||||
|
if self.fileAttachment:
|
||||||
|
mailto(address=u'bugs@openlp.org', subject=subject,
|
||||||
|
body=body % content, attach=self.fileAttachment)
|
||||||
|
else:
|
||||||
mailto(address=u'bugs@openlp.org', subject=subject,
|
mailto(address=u'bugs@openlp.org', subject=subject,
|
||||||
body=body % content)
|
body=body % content)
|
||||||
|
|
||||||
|
def onDescriptionUpdated(self):
|
||||||
|
count = int(20 - len(self.descriptionTextEdit.toPlainText()))
|
||||||
|
if count < 0:
|
||||||
|
count = 0
|
||||||
|
self.__buttonState(True)
|
||||||
|
else:
|
||||||
|
self.__buttonState(False)
|
||||||
|
self.descriptionWordCount.setText(
|
||||||
|
unicode(translate('OpenLP.ExceptionDialog',
|
||||||
|
'Description characters to enter : %s')) % count )
|
||||||
|
|
||||||
|
def onAttachFileButtonPressed(self):
|
||||||
|
files = QtGui.QFileDialog.getOpenFileName(
|
||||||
|
self,translate('ImagePlugin.ExceptionDialog',
|
||||||
|
'Select Attachment'),
|
||||||
|
SettingsManager.get_last_dir(u'exceptions'),
|
||||||
|
u'%s (*.*) (*)' %
|
||||||
|
unicode(translate('ImagePlugin.MediaItem', 'All Files')))
|
||||||
|
log.info(u'New files(s) %s', unicode(files))
|
||||||
|
if files:
|
||||||
|
self.fileAttachment = unicode(files)
|
||||||
|
|
||||||
|
def __buttonState(self, state):
|
||||||
|
self.saveReportButton.setEnabled(state)
|
||||||
|
self.sendReportButton.setEnabled(state)
|
||||||
|
@ -507,7 +507,6 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
p_file = filePath
|
p_file = filePath
|
||||||
if 'p_file' in locals():
|
if 'p_file' in locals():
|
||||||
Receiver.send_message(u'cursor_busy')
|
Receiver.send_message(u'cursor_busy')
|
||||||
Receiver.send_message(u'openlp_process_events')
|
|
||||||
fileTo = open(p_file, u'r')
|
fileTo = open(p_file, u'r')
|
||||||
items = cPickle.load(fileTo)
|
items = cPickle.load(fileTo)
|
||||||
fileTo.close()
|
fileTo.close()
|
||||||
|
@ -443,7 +443,6 @@ class HTTPBible(BibleDB):
|
|||||||
book = db_book.name
|
book = db_book.name
|
||||||
if BibleDB.get_verse_count(self, book, reference[1]) == 0:
|
if BibleDB.get_verse_count(self, book, reference[1]) == 0:
|
||||||
Receiver.send_message(u'cursor_busy')
|
Receiver.send_message(u'cursor_busy')
|
||||||
Receiver.send_message(u'openlp_process_events')
|
|
||||||
search_results = self.get_chapter(book, reference[1])
|
search_results = self.get_chapter(book, reference[1])
|
||||||
if search_results and search_results.has_verselist():
|
if search_results and search_results.has_verselist():
|
||||||
## We have found a book of the bible lets check to see
|
## We have found a book of the bible lets check to see
|
||||||
|
@ -372,7 +372,6 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
Utility method to merge two objects to leave one in the database.
|
Utility method to merge two objects to leave one in the database.
|
||||||
"""
|
"""
|
||||||
Receiver.send_message(u'cursor_busy')
|
Receiver.send_message(u'cursor_busy')
|
||||||
Receiver.send_message(u'openlp_process_events')
|
|
||||||
merge(dbObject)
|
merge(dbObject)
|
||||||
reset()
|
reset()
|
||||||
Receiver.send_message(u'songs_load_list')
|
Receiver.send_message(u'songs_load_list')
|
||||||
|
@ -13,14 +13,81 @@
|
|||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Dialog</string>
|
<string>Dialog</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="exceptionLayout">
|
<widget class="QPlainTextEdit" name="exceptionTextEdit">
|
||||||
<property name="spacing">
|
<property name="geometry">
|
||||||
<number>8</number>
|
<rect>
|
||||||
|
<x>8</x>
|
||||||
|
<y>194</y>
|
||||||
|
<width>564</width>
|
||||||
|
<height>171</height>
|
||||||
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<property name="readOnly">
|
||||||
<number>8</number>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<property name="backgroundVisible">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QDialogButtonBox" name="exceptionButtonBox">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>8</x>
|
||||||
|
<y>373</y>
|
||||||
|
<width>83</width>
|
||||||
|
<height>26</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="standardButtons">
|
||||||
|
<set>QDialogButtonBox::Close</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QPlainTextEdit" name="discriptionplainTextEdit">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>8</x>
|
||||||
|
<y>103</y>
|
||||||
|
<width>561</width>
|
||||||
|
<height>71</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QLabel" name="characterCount">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>10</x>
|
||||||
|
<y>170</y>
|
||||||
|
<width>301</width>
|
||||||
|
<height>17</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>TextLabel</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QLabel" name="whatyouweredoinglabel">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>10</x>
|
||||||
|
<y>80</y>
|
||||||
|
<width>59</width>
|
||||||
|
<height>17</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>TextLabel</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QWidget" name="">
|
||||||
<layout class="QHBoxLayout" name="messageLayout">
|
<layout class="QHBoxLayout" name="messageLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
@ -67,28 +134,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPlainTextEdit" name="exceptionTextEdit">
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="backgroundVisible">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</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>
|
</widget>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="../images/openlp-2.qrc"/>
|
<include location="../images/openlp-2.qrc"/>
|
||||||
|
3
setup.py
3
setup.py
@ -69,8 +69,7 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
|
|||||||
url='http://openlp.org/',
|
url='http://openlp.org/',
|
||||||
license='GNU General Public License',
|
license='GNU General Public License',
|
||||||
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
|
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
|
||||||
scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py',
|
scripts=['openlp.pyw', 'scripts/openlp-remoteclient.py'],
|
||||||
'scripts/bible-1to2-converter.py','scripts/openlp-remoteclient.py'],
|
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
install_requires=[
|
install_requires=[
|
||||||
|
Loading…
Reference in New Issue
Block a user