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

r1972 + conflict

Browse Source
This commit is contained in:
Andreas Preikschat 2012-05-18 17:14:09 +02:00
commit 039ba3f412
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp.pyw
View File

@ -28,11 +28,6 @@
import sip import sip
sip.setapi(u'QString', 2) sip.setapi(u'QString', 2)
# 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 openlp.core import main from openlp.core import main

14
openlp/core/ui/servicemanager.py
View File

@ -558,14 +558,12 @@ class ServiceManager(QtGui.QWidget):
zip.write(audio_from, audio_to.encode(u'utf-8')) zip.write(audio_from, audio_to.encode(u'utf-8'))
except IOError: except IOError:
log.exception(u'Failed to save service to disk: %s', temp_file_name) log.exception(u'Failed to save service to disk: %s', temp_file_name)
# Add this line in after the release to notify the user that saving Receiver.send_message(u'openlp_error_message', {
# their file failed. Commented out due to string freeze. u'title': translate(u'OpenLP.ServiceManager',
#Receiver.send_message(u'openlp_error_message', { u'Error Saving File'),
# u'title': translate(u'OpenLP.ServiceManager', u'message': translate(u'OpenLP.ServiceManager',
# u'Error Saving File'), u'There was an error saving your file.')
# u'message': translate(u'OpenLP.ServiceManager', })
# u'There was an error saving your file.')
#})
success = False success = False
finally: finally:
if zip: if zip: