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

Fix #2075562 [[Enhancement] MDE: Keep focus on current field when navigating books](https://bugs.launchpad.net/calibre/+bug/2075562)

Browse Source
This commit is contained in:
Kovid Goyal 2024-08-02 19:12:31 +05:30
parent 0602497666
commit 679848a577
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/calibre/gui2/metadata/single.py
View File

@ -10,6 +10,7 @@ from datetime import datetime
from functools import partial from functools import partial
from qt.core import ( from qt.core import (
QAction,
QDialog, QDialog,
QDialogButtonBox, QDialogButtonBox,
QFrame, QFrame,
@ -121,11 +122,17 @@ class MetadataSingleDialogBase(QDialog):
self.button_box.rejected.connect(self.reject) self.button_box.rejected.connect(self.reject)
self.next_button = QPushButton(QIcon.ic('forward.png'), _('Next'), self.next_button = QPushButton(QIcon.ic('forward.png'), _('Next'),
self) self)
self.next_button.setShortcut(QKeySequence('Alt+Right')) self.next_action = ac = QAction(self)
ac.triggered.connect(self.next_clicked)
self.addAction(ac)
ac.setShortcut(QKeySequence('Alt+Right'))
self.next_button.clicked.connect(self.next_clicked) self.next_button.clicked.connect(self.next_clicked)
self.prev_button = QPushButton(QIcon.ic('back.png'), _('Previous'), self.prev_button = QPushButton(QIcon.ic('back.png'), _('Previous'), self)
self) self.prev_button.clicked.connect(self.prev_clicked)
self.prev_button.setShortcut(QKeySequence('Alt+Left')) self.prev_action = ac = QAction(self)
ac.triggered.connect(self.prev_clicked)
ac.setShortcut(QKeySequence('Alt+Left'))
self.addAction(ac)
from calibre.gui2.actions.edit_metadata import DATA_FILES_ICON_NAME from calibre.gui2.actions.edit_metadata import DATA_FILES_ICON_NAME
self.data_files_button = QPushButton(QIcon.ic(DATA_FILES_ICON_NAME), _('Data files'), self) self.data_files_button = QPushButton(QIcon.ic(DATA_FILES_ICON_NAME), _('Data files'), self)
self.data_files_button.setShortcut(QKeySequence('Alt+Space')) self.data_files_button.setShortcut(QKeySequence('Alt+Space'))
@ -135,7 +142,6 @@ class MetadataSingleDialogBase(QDialog):
self.button_box.addButton(self.prev_button, QDialogButtonBox.ButtonRole.ActionRole) self.button_box.addButton(self.prev_button, QDialogButtonBox.ButtonRole.ActionRole)
self.button_box.addButton(self.next_button, QDialogButtonBox.ButtonRole.ActionRole) self.button_box.addButton(self.next_button, QDialogButtonBox.ButtonRole.ActionRole)
self.prev_button.clicked.connect(self.prev_clicked)
bb.setStandardButtons(QDialogButtonBox.StandardButton.Ok|QDialogButtonBox.StandardButton.Cancel) bb.setStandardButtons(QDialogButtonBox.StandardButton.Ok|QDialogButtonBox.StandardButton.Cancel)
bb.button(QDialogButtonBox.StandardButton.Ok).setDefault(True) bb.button(QDialogButtonBox.StandardButton.Ok).setDefault(True)
@ -718,14 +724,20 @@ class MetadataSingleDialogBase(QDialog):
return ret return ret
def next_clicked(self): def next_clicked(self):
fw = self.focusWidget()
if not self.apply_changes(): if not self.apply_changes():
return return
self.do_one(delta=1, apply_changes=False) self.do_one(delta=1, apply_changes=False)
if fw is not None:
fw.setFocus(Qt.FocusReason.OtherFocusReason)
def prev_clicked(self): def prev_clicked(self):
fw = self.focusWidget()
if not self.apply_changes(): if not self.apply_changes():
return return
self.do_one(delta=-1, apply_changes=False) self.do_one(delta=-1, apply_changes=False)
if fw is not None:
fw.setFocus(Qt.FocusReason.OtherFocusReason)
def do_one(self, delta=0, apply_changes=True): def do_one(self, delta=0, apply_changes=True):
if apply_changes: if apply_changes:
@ -739,11 +751,13 @@ class MetadataSingleDialogBase(QDialog):
next_ = self.db.title(self.row_list[self.current_row+1]) next_ = self.db.title(self.row_list[self.current_row+1])
if next_ is not None: if next_ is not None:
tip = _('Save changes and edit the metadata of {} [Alt+Right]').format(next_) tip = _('Save changes and edit the metadata of {0} [{1}]').format(
next_, self.next_action.shortcut().toString(QKeySequence.SequenceFormat.NativeText))
self.next_button.setToolTip(tip) self.next_button.setToolTip(tip)
self.next_button.setEnabled(next_ is not None) self.next_button.setEnabled(next_ is not None)
if prev is not None: if prev is not None:
tip = _('Save changes and edit the metadata of {} [Alt+Left]').format(prev) tip = _('Save changes and edit the metadata of {0} [{1}]').format(
prev, self.prev_action.shortcut().toString(QKeySequence.SequenceFormat.NativeText))
self.prev_button.setToolTip(tip) self.prev_button.setToolTip(tip)
self.prev_button.setEnabled(prev is not None) self.prev_button.setEnabled(prev is not None)
self.button_box.button(QDialogButtonBox.StandardButton.Ok).setDefault(True) self.button_box.button(QDialogButtonBox.StandardButton.Ok).setDefault(True)