mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix #8971 (books can be inadvertently deleted)
This commit is contained in:
parent
75c4b89893
commit
1677268ed1
@ -271,11 +271,6 @@ class DeleteAction(InterfaceAction):
|
|||||||
partial(self.library_ids_deleted, current_row=row))
|
partial(self.library_ids_deleted, current_row=row))
|
||||||
# Device view is visible.
|
# Device view is visible.
|
||||||
else:
|
else:
|
||||||
if not confirm('<p>'+_('The selected books will be '
|
|
||||||
'<b>permanently deleted</b> '
|
|
||||||
'from your device. Are you sure?')
|
|
||||||
+'</p>', 'device_delete_books', self.gui):
|
|
||||||
return
|
|
||||||
if self.gui.stack.currentIndex() == 1:
|
if self.gui.stack.currentIndex() == 1:
|
||||||
view = self.gui.memory_view
|
view = self.gui.memory_view
|
||||||
elif self.gui.stack.currentIndex() == 2:
|
elif self.gui.stack.currentIndex() == 2:
|
||||||
@ -283,6 +278,11 @@ class DeleteAction(InterfaceAction):
|
|||||||
else:
|
else:
|
||||||
view = self.gui.card_b_view
|
view = self.gui.card_b_view
|
||||||
paths = view.model().paths(rows)
|
paths = view.model().paths(rows)
|
||||||
|
if not confirm('<p>'+_('The selected books will be '
|
||||||
|
'<b>permanently deleted</b> '
|
||||||
|
'from your device. Are you sure?')
|
||||||
|
+'</p>', 'device_delete_books', self.gui):
|
||||||
|
return
|
||||||
job = self.gui.remove_paths(paths)
|
job = self.gui.remove_paths(paths)
|
||||||
self.delete_memory[job] = (paths, view.model())
|
self.delete_memory[job] = (paths, view.model())
|
||||||
view.model().mark_for_deletion(job, rows)
|
view.model().mark_for_deletion(job, rows)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user