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

Do not display conversion error messages when minimized to tray

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-18 15:55:27 -07:00
parent b1785e31d2
commit 573bd09555
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/calibre/gui2/ui.py
View File

@ -437,31 +437,34 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{
def job_exception(self, job): def job_exception(self, job):
if not hasattr(self, '_modeless_dialogs'): if not hasattr(self, '_modeless_dialogs'):
self._modeless_dialogs = [] self._modeless_dialogs = []
minz = self.is_minimized_to_tray
if self.isVisible(): if self.isVisible():
for x in list(self._modeless_dialogs): for x in list(self._modeless_dialogs):
if not x.isVisible(): if not x.isVisible():
self._modeless_dialogs.remove(x) self._modeless_dialogs.remove(x)
try: try:
if 'calibre.ebooks.DRMError' in job.details: if 'calibre.ebooks.DRMError' in job.details:
d = error_dialog(self, _('Conversion Error'), if not minz:
_('<p>Could not convert: %s<p>It is a ' d = error_dialog(self, _('Conversion Error'),
'<a href="%s">DRM</a>ed book. You must first remove the ' _('<p>Could not convert: %s<p>It is a '
'DRM using third party tools.')%\ '<a href="%s">DRM</a>ed book. You must first remove the '
(job.description.split(':')[-1], 'DRM using third party tools.')%\
'http://bugs.calibre-ebook.com/wiki/DRM')) (job.description.split(':')[-1],
d.setModal(False) 'http://bugs.calibre-ebook.com/wiki/DRM'))
d.show() d.setModal(False)
self._modeless_dialogs.append(d) d.show()
self._modeless_dialogs.append(d)
return return
if 'calibre.web.feeds.input.RecipeDisabled' in job.details: if 'calibre.web.feeds.input.RecipeDisabled' in job.details:
msg = job.details if not minz:
msg = msg[msg.find('calibre.web.feeds.input.RecipeDisabled:'):] msg = job.details
msg = msg.partition(':')[-1] msg = msg[msg.find('calibre.web.feeds.input.RecipeDisabled:'):]
d = error_dialog(self, _('Recipe Disabled'), msg = msg.partition(':')[-1]
'<p>%s</p>'%msg) d = error_dialog(self, _('Recipe Disabled'),
d.setModal(False) '<p>%s</p>'%msg)
d.show() d.setModal(False)
self._modeless_dialogs.append(d) d.show()
self._modeless_dialogs.append(d)
return return
except: except:
pass pass
@ -471,12 +474,13 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{
prints(job.details, file=sys.stderr) prints(job.details, file=sys.stderr)
except: except:
pass pass
d = error_dialog(self, _('Conversion Error'), if not minz:
_('<b>Failed</b>')+': '+unicode(job.description), d = error_dialog(self, _('Conversion Error'),
det_msg=job.details) _('<b>Failed</b>')+': '+unicode(job.description),
d.setModal(False) det_msg=job.details)
d.show() d.setModal(False)
self._modeless_dialogs.append(d) d.show()
self._modeless_dialogs.append(d)
def read_settings(self): def read_settings(self):
geometry = config['main_window_geometry'] geometry = config['main_window_geometry']