From f7b9dfe7f2f460e56cd9978b14d5a55e4611bbf4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Jan 2020 09:44:18 +0530 Subject: [PATCH] Fix a regression that caused the edit metadata individually and convert individually actions to use the bulk actions when multipe books are selected. --- src/calibre/gui2/actions/convert.py | 4 +++- src/calibre/gui2/actions/edit_metadata.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py index ba6c59b4e6..f801b5c0fd 100644 --- a/src/calibre/gui2/actions/convert.py +++ b/src/calibre/gui2/actions/convert.py @@ -25,7 +25,6 @@ class ConvertAction(InterfaceAction): dont_add_to = frozenset(('context-menu-device',)) action_type = 'current' action_add_menu = True - action_menu_clone_qaction = _('Convert individually') accepts_drops = True @@ -55,6 +54,9 @@ class ConvertAction(InterfaceAction): def genesis(self): m = self.convert_menu = self.qaction.menu() cm = partial(self.create_menu_action, self.convert_menu) + cm('convert-individual', _('Convert individually'), + icon=self.qaction.icon(), triggered=partial(self.convert_ebook, + False, bulk=False)) cm('convert-bulk', _('Bulk convert'), triggered=partial(self.convert_ebook, False, bulk=True)) m.addSeparator() diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index ee5d310337..657d7cc1fc 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -36,7 +36,6 @@ class EditMetadataAction(InterfaceAction): action_spec = (_('Edit metadata'), 'edit_input.png', _('Change the title/author/cover etc. of books'), _('E')) action_type = 'current' action_add_menu = True - action_menu_clone_qaction = _('Edit metadata individually') accepts_drops = True @@ -69,6 +68,8 @@ class EditMetadataAction(InterfaceAction): def genesis(self): md = self.qaction.menu() cm = partial(self.create_menu_action, md) + cm('individual', _('Edit metadata individually'), icon=self.qaction.icon(), + triggered=partial(self.edit_metadata, False, bulk=False)) cm('bulk', _('Edit metadata in bulk'), triggered=partial(self.edit_metadata, False, bulk=True)) md.addSeparator()