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

E-book viewer: Allow pressing the 0-9 keys to apply a quick highlight style. Fixes #1944614 [[Enhancement] Add hotkeys for applying specific highlighting colors](https://bugs.launchpad.net/calibre/+bug/1944614)

Browse Source
This commit is contained in:
Kovid Goyal 2021-09-23 08:50:47 +05:30
parent ed10c3e0cb
commit 35180e7251
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pyj/read_book/selection_bar.pyj
View File

@ -238,6 +238,7 @@ class SelectionBar:
self.end_handle_id = unique_id('handle') self.end_handle_id = unique_id('handle')
self.bar_id = unique_id('bar') self.bar_id = unique_id('bar')
self.editor_id = unique_id('editor') self.editor_id = unique_id('editor')
self.quick_highlight_styles = v'[]'
# Sensible defaults until we get information from a selection message. # Sensible defaults until we get information from a selection message.
self.ltr = True self.ltr = True
self.rtl = False self.rtl = False
@ -330,6 +331,7 @@ class SelectionBar:
if ac and (not ac.needs_highlight or v'!!annot_id'): if ac and (not ac.needs_highlight or v'!!annot_id'):
bar.appendChild(cb(ac, self[ac.function_name])) bar.appendChild(cb(ac, self[ac.function_name]))
selection_bar_quick_highlights = sd.get('selection_bar_quick_highlights') selection_bar_quick_highlights = sd.get('selection_bar_quick_highlights')
self.quick_highlight_styles = v'[]'
if selection_bar_quick_highlights?.length: if selection_bar_quick_highlights?.length:
self.show_quick_highlight_buttons(bar, selection_bar_quick_highlights) self.show_quick_highlight_buttons(bar, selection_bar_quick_highlights)
self.show_notes(bar_container, notes) self.show_notes(bar_container, notes)
@ -340,15 +342,23 @@ class SelectionBar:
actions = [a for a in actions if all[a]] actions = [a for a in actions if all[a]]
if not actions.length: if not actions.length:
return return
actions.pysort(key=def (a): return (all[a].friendly_name or '').toLowerCase();)
self.quick_highlight_styles = actions
bar.appendChild(E.div( bar.appendChild(E.div(
style=f'background: currentColor; width: 1px; height: {ICON_SIZE}; margin-left: {BUTTON_MARGIN}; margin-right: {BUTTON_MARGIN}' style=f'background: currentColor; width: 1px; height: {ICON_SIZE}; margin-left: {BUTTON_MARGIN}; margin-right: {BUTTON_MARGIN}'
)) ))
dark = self.view.current_color_scheme.is_dark_theme dark = self.view.current_color_scheme.is_dark_theme
for key in actions: for i, key in enumerate(actions):
hs = all[key] hs = all[key]
if i < 9:
sc = i + 1
elif i == 10:
sc = 0
else:
sc = None
sw = E.div( sw = E.div(
class_='simple-link', style=f'margin-left: {BUTTON_MARGIN}; margin-right: {BUTTON_MARGIN}', class_='simple-link', style=f'margin-left: {BUTTON_MARGIN}; margin-right: {BUTTON_MARGIN}',
title=_('Highlight using: {}').format(hs.friendly_name), title=_('Highlight using: {name}{sc}').format(name=hs.friendly_name, sc=f' [{sc}]' if sc is not None else ''),
onclick=self.quick_highlight_with_style.bind(None, hs), onclick=self.quick_highlight_with_style.bind(None, hs),
) )
hs.make_swatch(sw, dark) hs.make_swatch(sw, dark)
@ -603,6 +613,19 @@ class SelectionBar:
if k is 'delete' or k is 'd': if k is 'delete' or k is 'd':
self.remove_highlight() self.remove_highlight()
return return
if k in '0123456789':
all = {x.key:x for x in all_styles()}
k = int(k)
if k is 0:
k = 9
else:
k -= 1
key = self.quick_highlight_styles[k]
if key:
hs = all[key]
if hs:
self.quick_highlight_with_style(hs)
return
sc_name = shortcut_for_key_event(ev, self.view.keyboard_shortcut_map) sc_name = shortcut_for_key_event(ev, self.view.keyboard_shortcut_map)
if not sc_name: if not sc_name:
return return