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

Preferences: Show the keyboard shortcut for each category in preferences in the tooltip. Fixes #2122257 [[Enhancement] show preferences shortcuts](https://bugs.launchpad.net/calibre/+bug/2122257)

Browse Source
This commit is contained in:
Kovid Goyal 2025-09-25 11:45:50 +05:30
parent f92bfac622
commit 40f5df12cf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ class PreferencesAction(InterfaceAction):
self.preferences_menu = pm self.preferences_menu = pm
for x in (self.gui.preferences_action, self.qaction): for x in (self.gui.preferences_action, self.qaction):
x.triggered.connect(self.do_config) x.triggered.connect(self.do_config)
self.action_map = {}
def initialization_complete(self): def initialization_complete(self):
# Add the individual preferences to the menu. # Add the individual preferences to the menu.
@ -60,7 +61,7 @@ class PreferencesAction(InterfaceAction):
current_cat = p.category_order current_cat = p.category_order
cm = pm.addMenu(p.gui_category.replace('&', '&&')) cm = pm.addMenu(p.gui_category.replace('&', '&&'))
cm.setIcon(config_icon) cm.setIcon(config_icon)
self.create_menu_action(cm, p.name, p.gui_name.replace('&', '&&'), self.action_map[p.name] = self.create_menu_action(cm, p.name, p.gui_name.replace('&', '&&'),
icon=QIcon.ic(p.icon), shortcut=None, shortcut_name=p.gui_name, icon=QIcon.ic(p.icon), shortcut=None, shortcut_name=p.gui_name,
triggered=partial(self.do_config, initial_plugin=(p.category, p.name), triggered=partial(self.do_config, initial_plugin=(p.category, p.name),
close_after_initial=True)) close_after_initial=True))

9
src/calibre/gui2/preferences/main.py
View File

@ -18,6 +18,7 @@ from qt.core import (
QFrame, QFrame,
QHBoxLayout, QHBoxLayout,
QIcon, QIcon,
QKeySequence,
QLabel, QLabel,
QPainter, QPainter,
QPointF, QPointF,
@ -150,10 +151,16 @@ class Category(QWidget): # {{{
self.bar.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon) self.bar.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon)
self._layout.addWidget(self.bar) self._layout.addWidget(self.bar)
self.actions = [] self.actions = []
from calibre.gui2.ui import get_gui
iac = get_gui().iactions['Preferences']
for p in plugins: for p in plugins:
sc = iac.action_map.get(p.name).shortcut().toString(QKeySequence.SequenceFormat.NativeText)
target = partial(self.triggered, p) target = partial(self.triggered, p)
ac = self.bar.addAction(QIcon.ic(p.icon), p.gui_name.replace('&', '&&'), target) ac = self.bar.addAction(QIcon.ic(p.icon), p.gui_name.replace('&', '&&'), target)
ac.setToolTip(textwrap.fill(p.description)) tt = '<p>' + p.description
if sc:
tt += '<br>' + _('Shortcut: <i>{}').format(sc)
ac.setToolTip(tt)
ac.setWhatsThis(textwrap.fill(p.description)) ac.setWhatsThis(textwrap.fill(p.description))
ac.setStatusTip(p.description) ac.setStatusTip(p.description)
self.actions.append(ac) self.actions.append(ac)