From 428e72eb661d23d05c5cb6b0ca20c948c2c43973 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 9 Jul 2017 17:47:14 +0200 Subject: [PATCH] Make the focus-back-to-booklist action work when undocked --- src/calibre/gui2/actions/show_quickview.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/actions/show_quickview.py b/src/calibre/gui2/actions/show_quickview.py index deae14e082..dcf49b884c 100644 --- a/src/calibre/gui2/actions/show_quickview.py +++ b/src/calibre/gui2/actions/show_quickview.py @@ -77,9 +77,9 @@ class ShowQuickviewAction(InterfaceAction): self.focus_bl_action = QAction(self.gui) self.gui.addAction(self.focus_bl_action) self.gui.keyboard.register_shortcut('Focus from Quickview', - _('Focus from docked Quickview to the book list'), - description=_('Move the focus from docked Quickview to the book list'), - default_keys=('Alt+Q',), action=self.focus_bl_action, + _('Focus from Quickview to the book list'), + description=_('Move the focus from Quickview to the book list'), + default_keys=('Shift+Alt+Q',), action=self.focus_bl_action, group=self.action_spec[0]) self.focus_bl_action.triggered.connect(self.focus_booklist) @@ -129,6 +129,7 @@ class ShowQuickviewAction(InterfaceAction): def set_search_shortcut(self): if self.current_instance and not self.current_instance.is_closed: + self.current_instance.addAction(self.focus_bl_action) self.current_instance.set_shortcuts(self.search_action.shortcut().toString(), self.menuless_qaction.shortcut().toString()) @@ -174,6 +175,7 @@ class ShowQuickviewAction(InterfaceAction): self.current_instance.set_focus() def focus_booklist(self): + self.gui.activateWindow() self.gui.library_view.setFocus() def search_quickview(self):