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

Fix #745

Browse Source
This commit is contained in:
Kovid Goyal 2008-06-04 20:34:45 -07:00
parent a3732fead6
commit d897f81d2b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/dialogs/search.py
View File

@ -13,10 +13,11 @@ class SearchItem(Ui_Form, QWidget):
FIELDS = { FIELDS = {
_('Title') : 'title:', _('Title') : 'title:',
_('Author') : 'author:', _('Author') : 'author:',
_('Publisher') :'publisher:', _('Publisher') : 'publisher:',
_('Tag') :'tag', _('Tag') : 'tag:',
_('Series') :'series:', _('Series') : 'series:',
_('Format') :'format:', _('Format') : 'format:',
_('Comments') : 'comments:',
_('Any') :'' _('Any') :''
} }

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

@ -1056,11 +1056,14 @@ class Main(MainWindow, Ui_MainWindow):
self.device_error_dialog.show() self.device_error_dialog.show()
def conversion_job_exception(self, id, description, exception, formatted_traceback, log): def conversion_job_exception(self, id, description, exception, formatted_traceback, log):
print >>sys.stderr, 'Error in job:', description.encode('utf8') try:
if log: print >>sys.stderr, 'Error in job:', description.encode('utf8')
print >>sys.stderr, log.encode('utf8', 'ignore') if isinstance(log, unicode) else log if log:
print >>sys.stderr, exception print >>sys.stderr, log.encode('utf8', 'ignore') if isinstance(log, unicode) else log
print >>sys.stderr, formatted_traceback.encode('utf8', 'ignore') if isinstance(formatted_traceback, unicode) else formatted_traceback print >>sys.stderr, exception
print >>sys.stderr, formatted_traceback.encode('utf8', 'ignore') if isinstance(formatted_traceback, unicode) else formatted_traceback
except:
pass
msg = u'<p><b>%s</b>: %s</p>'%exception msg = u'<p><b>%s</b>: %s</p>'%exception
msg += u'<p>Failed to perform <b>job</b>: '+description msg += u'<p>Failed to perform <b>job</b>: '+description
msg += u'<p>Detailed <b>traceback</b>:<pre>' msg += u'<p>Detailed <b>traceback</b>:<pre>'