Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make error messages about failed conversion jobs non-modal. Fixes #3273 (Calibre Shuts Down).

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-25 15:43:19 -06:00
parent 3e2ca84f09
commit 37a8e07015
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/main.py
View File

@ -1578,12 +1578,14 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
def job_exception(self, job): def job_exception(self, job):
try: try:
if 'calibre.ebooks.DRMError' in job.details: if 'calibre.ebooks.DRMError' in job.details:
error_dialog(self, _('Conversion Error'), d = error_dialog(self, _('Conversion Error'),
_('<p>Could not convert: %s<p>It is a ' _('<p>Could not convert: %s<p>It is a '
'<a href="%s">DRM</a>ed book. You must first remove the ' '<a href="%s">DRM</a>ed book. You must first remove the '
'DRM using 3rd party tools.')%\ 'DRM using 3rd party tools.')%\
(job.description.split(':')[-1], (job.description.split(':')[-1],
'http://wiki.mobileread.com/wiki/DRM')).exec_() 'http://wiki.mobileread.com/wiki/DRM'))
d.setModal(False)
d.show()
return return
except: except:
pass pass
@ -1593,9 +1595,11 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
prints(job.details, file=sys.stderr) prints(job.details, file=sys.stderr)
except: except:
pass pass
error_dialog(self, _('Conversion Error'), d = error_dialog(self, _('Conversion Error'),
_('<b>Failed</b>')+': '+unicode(job.description), _('<b>Failed</b>')+': '+unicode(job.description),
det_msg=job.details).exec_() det_msg=job.details)
d.setModal(False)
d.show()
def initialize_database(self): def initialize_database(self):