Fix #8971 (books can be inadvertently deleted)

This commit is contained in:
Kovid Goyal 2011-02-14 08:43:53 -07:00
parent 75c4b89893
commit 1677268ed1

View File

@ -271,11 +271,6 @@ class DeleteAction(InterfaceAction):
partial(self.library_ids_deleted, current_row=row))
# Device view is visible.
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:
view = self.gui.memory_view
elif self.gui.stack.currentIndex() == 2:
@ -283,6 +278,11 @@ class DeleteAction(InterfaceAction):
else:
view = self.gui.card_b_view
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)
self.delete_memory[job] = (paths, view.model())
view.model().mark_for_deletion(job, rows)