From 61749bd64673cc272a8cd5a2072ea480d4fd647c Mon Sep 17 00:00:00 2001
From: Charles Haley <github@charles.haleys.org>
Date: Sun, 1 Feb 2015 12:08:04 +0100
Subject: [PATCH] Take out the focus to library action. Shift+ESC already does
 that.

---
 src/calibre/customize/builtins.py          |  8 +-------
 src/calibre/gui2/actions/show_quickview.py | 14 --------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index c2cacee2ee..d6e8bebd45 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -839,11 +839,6 @@ class ActionQuickviewFocusTo(InterfaceActionBase):
     actual_plugin = 'calibre.gui2.actions.show_quickview:FocusToQuickviewAction'
     description = _('Move the focus to the Quickview pane/window')
 
-class ActionQuickviewFocusFrom(InterfaceActionBase):
-    name = 'Focus From Quickview'
-    actual_plugin = 'calibre.gui2.actions.show_quickview:FocusFromQuickviewAction'
-    description = _('Move the focus to the library pane')
-
 class ActionTemplateTester(InterfaceActionBase):
     name = 'Template Tester'
     actual_plugin = 'calibre.gui2.actions.show_template_tester:ShowTemplateTesterAction'
@@ -984,8 +979,7 @@ plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionAddToLibrary, ActionEditCollections, ActionMatchBooks, ActionChooseLibrary,
         ActionCopyToLibrary, ActionTweakEpub, ActionUnpackBook, ActionNextMatch, ActionStore,
         ActionPluginUpdater, ActionPickRandom, ActionEditToC, ActionSortBy,
-        ActionMarkBooks, ActionEmbed, ActionTemplateTester, ActionQuickviewFocusTo,
-        ActionQuickviewFocusFrom]
+        ActionMarkBooks, ActionEmbed, ActionTemplateTester, ActionQuickviewFocusTo]
 
 # }}}
 
diff --git a/src/calibre/gui2/actions/show_quickview.py b/src/calibre/gui2/actions/show_quickview.py
index d02485a570..99cacd47f4 100644
--- a/src/calibre/gui2/actions/show_quickview.py
+++ b/src/calibre/gui2/actions/show_quickview.py
@@ -27,20 +27,6 @@ class FocusToQuickviewAction(InterfaceAction):
         if qv:
             qv.actual_plugin_.focus_quickview()
 
-
-class FocusFromQuickviewAction(InterfaceAction):
-
-    name = 'Focus From Quickview'
-    action_spec = (_('Focus From Quickview'), 'search.png', None, ('Ctrl+Q'))
-    dont_add_to = frozenset(['context-menu-device'])
-    action_type = 'current'
-
-    def genesis(self):
-        self.qaction.triggered.connect(self.focus_quickview)
-
-    def focus_quickview(self, *args):
-        self.gui.library_view.setFocus()
-
 class ShowQuickviewAction(InterfaceAction):
 
     name = 'Show Quickview'