Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2023-09-12 07:58:11 +05:30
commit 2fe2e6b8bd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/actions/show_quickview.py
View File

@ -133,7 +133,8 @@ class ShowQuickviewAction(InterfaceAction):
return
self.qv_button.set_state_to_hide()
index = self.gui.library_view.currentIndex()
self.current_instance = Quickview(self.gui, index, self.qaction.shortcut())
self.current_instance = Quickview(self.gui, index, self.qaction.shortcut(),
focus_booklist_shortcut=self.focus_bl_action.shortcut())
self.current_instance.reopen_after_dock_change.connect(self.open_quickview)
self.current_instance.show()

28
src/calibre/gui2/dialogs/quickview.py
View File

@ -152,7 +152,7 @@ class Quickview(QDialog, Ui_Quickview):
tab_pressed_signal = pyqtSignal(object, object)
quickview_closed = pyqtSignal()
def __init__(self, gui, row, toggle_shortcut):
def __init__(self, gui, row, toggle_shortcut, focus_booklist_shortcut=None):
self.is_pane = gprefs.get('quickview_is_pane', False)
if not self.is_pane:
QDialog.__init__(self, None, flags=Qt.WindowType.Window)
@ -296,14 +296,24 @@ class Quickview(QDialog, Ui_Quickview):
# Add the quickview toggle as a shortcut for the close button
# Don't add it if it identical to the current &X shortcut because that
# breaks &X
if (not self.is_pane and toggle_shortcut and
self.close_button.shortcut() != toggle_shortcut):
toggle_sc = QShortcut(toggle_shortcut, self.close_button)
toggle_sc.activated.connect(lambda: self.close_button_clicked())
toggle_sc.setEnabled(True)
self.close_button.setToolTip(_('Alternate shortcut: ') +
toggle_shortcut.toString())
# breaks &X. Also add the focus booklist shortcut
if not self.is_pane:
if toggle_shortcut and self.close_button.shortcut() != toggle_shortcut:
toggle_sc = QShortcut(toggle_shortcut, self.close_button)
toggle_sc.activated.connect(lambda: self.close_button_clicked())
toggle_sc.setEnabled(True)
self.close_button.setToolTip(_('Alternate shortcut: ') +
toggle_shortcut.toString())
if focus_booklist_shortcut is not None:
toggle_sc = QShortcut(focus_booklist_shortcut, self)
toggle_sc.activated.connect(self.focus_booklist)
toggle_sc.setEnabled(True)
def focus_booklist(self):
from calibre.gui2.ui import get_gui
gui = get_gui()
gui.activateWindow()
gui.focus_current_view()
def delayed_slave(self, current, func=None, dex=None):
self.slave_timers[dex].stop()