mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 10:14:46 -04:00
Fix #1153407 ((enhancement) copy bar needs to be labeled with destination and method)
This commit is contained in:
parent
be6c788623
commit
e3deeb3f95
@ -232,11 +232,14 @@ class CopyToLibraryAction(InterfaceAction):
|
|||||||
return error_dialog(self.gui, _('No library'),
|
return error_dialog(self.gui, _('No library'),
|
||||||
_('No library found at %s')%loc, show=True)
|
_('No library found at %s')%loc, show=True)
|
||||||
|
|
||||||
self.pd = ProgressDialog(_('Copying'), min=0, max=len(ids)-1,
|
aname = _('Moving to') if delete_after else _('Copying to')
|
||||||
|
dtitle = '%s %s'%(aname, os.path.basename(loc))
|
||||||
|
|
||||||
|
self.pd = ProgressDialog(dtitle, min=0, max=len(ids)-1,
|
||||||
parent=self.gui, cancelable=False)
|
parent=self.gui, cancelable=False)
|
||||||
|
|
||||||
def progress(idx, title):
|
def progress(idx, title):
|
||||||
self.pd.set_msg(_('Copying') + ' ' + title)
|
self.pd.set_msg(title)
|
||||||
self.pd.set_value(idx)
|
self.pd.set_value(idx)
|
||||||
|
|
||||||
self.worker = Worker(ids, db, loc, Dispatcher(progress),
|
self.worker = Worker(ids, db, loc, Dispatcher(progress),
|
||||||
@ -245,13 +248,16 @@ class CopyToLibraryAction(InterfaceAction):
|
|||||||
|
|
||||||
self.pd.exec_()
|
self.pd.exec_()
|
||||||
|
|
||||||
|
donemsg = _('Copied %(num)d books to %(loc)s')
|
||||||
|
if delete_after:
|
||||||
|
donemsg = _('Moved %(num)d books to %(loc)s')
|
||||||
|
|
||||||
if self.worker.error is not None:
|
if self.worker.error is not None:
|
||||||
e, tb = self.worker.error
|
e, tb = self.worker.error
|
||||||
error_dialog(self.gui, _('Failed'), _('Could not copy books: ') + e,
|
error_dialog(self.gui, _('Failed'), _('Could not copy books: ') + e,
|
||||||
det_msg=tb, show=True)
|
det_msg=tb, show=True)
|
||||||
else:
|
else:
|
||||||
self.gui.status_bar.show_message(
|
self.gui.status_bar.show_message(donemsg %
|
||||||
_('Copied %(num)d books to %(loc)s') %
|
|
||||||
dict(num=len(ids), loc=loc), 2000)
|
dict(num=len(ids), loc=loc), 2000)
|
||||||
if self.worker.auto_merged_ids:
|
if self.worker.auto_merged_ids:
|
||||||
books = '\n'.join(self.worker.auto_merged_ids.itervalues())
|
books = '\n'.join(self.worker.auto_merged_ids.itervalues())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user