From 6b5b742cda875370effabe0427a8d009b1a34904 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 11 Jan 2020 08:29:03 +0530
Subject: [PATCH] Fix #1859209 [[Enhancement] Remove separator and add shortcut
 to menu](https://bugs.launchpad.net/calibre/+bug/1859209)

---
 src/calibre/gui2/actions/convert.py       | 4 +---
 src/calibre/gui2/actions/edit_metadata.py | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index f801b5c0fd..ba6c59b4e6 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -25,6 +25,7 @@ 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
 
@@ -54,9 +55,6 @@ 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 d4df4d3242..ee5d310337 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -36,6 +36,7 @@ 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
 
@@ -68,9 +69,6 @@ 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))
-        md.addSeparator()
         cm('bulk', _('Edit metadata in bulk'),
                 triggered=partial(self.edit_metadata, False, bulk=True))
         md.addSeparator()