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

Allow pressing n to start adding notes when editing a highlight

Browse Source 
Also add information about shortcuts to the various button tooltips
This commit is contained in:
Kovid Goyal 2020-07-16 09:09:48 +05:30
parent 7853364f1a
commit b3a3eace49
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pyj/read_book/create_annotation.pyj
View File

@ -240,15 +240,15 @@ class CreateAnnotation:
tb = create_bar() tb = create_bar()
container.appendChild(tb) container.appendChild(tb)
button(tb, 'close', _('Cancel creation of highlight'), self.hide) button(tb, 'close', _('Cancel creation of highlight') + ' [Esc]', self.hide)
button(tb, 'chevron-up', _('Scroll up'), self.button_scroll.bind(None, True)) button(tb, 'chevron-up', _('Scroll up') + ' [Up]', self.button_scroll.bind(None, True))
tb.appendChild(E.span(style=f'height: {tb.style.height}')) tb.appendChild(E.span(style=f'height: {tb.style.height}'))
button(tb.lastChild, 'trash', _('Remove this highlight'), self.delete_highlight) button(tb.lastChild, 'trash', _('Remove this highlight'), self.delete_highlight)
tb.lastChild.appendChild(E.span('\xa0\xa0\xa0')) tb.lastChild.appendChild(E.span('\xa0\xa0\xa0'))
if ui_operations.copy_selection: if ui_operations.copy_selection:
button(tb.lastChild, 'copy', _('Copy to clipboard'), self.copy_to_clipboard) button(tb.lastChild, 'copy', _('Copy to clipboard'), self.copy_to_clipboard)
tb.lastChild.appendChild(E.span('\xa0\xa0\xa0')) tb.lastChild.appendChild(E.span('\xa0\xa0\xa0'))
button(tb.lastChild, 'check', _('Finish creation of highlight'), self.accept) button(tb.lastChild, 'check', _('Finish creation of highlight') + ' [Enter]', self.accept)
middle = E.div(id=unique_id('middle'), style='display: none; text-align: center; z-index: 90000') middle = E.div(id=unique_id('middle'), style='display: none; text-align: center; z-index: 90000')
self.middle_id = middle.id self.middle_id = middle.id
@ -257,8 +257,8 @@ class CreateAnnotation:
bb = create_bar() bb = create_bar()
container.appendChild(bb) container.appendChild(bb)
button(bb, 'fg', _('Change highlight color'), self.choose_color) button(bb, 'fg', _('Change highlight color'), self.choose_color)
button(bb, 'chevron-down', _('Scroll down'), self.button_scroll) button(bb, 'chevron-down', _('Scroll down') + ' [Down]', self.button_scroll)
button(bb, 'pencil', _('Add a note'), self.add_notes) button(bb, 'pencil', _('Add a note') + ' [n]', self.add_notes)
sd = get_session_data() sd = get_session_data()
style = sd.get('highlight_style') or default_highlight_style() style = sd.get('highlight_style') or default_highlight_style()
@ -337,7 +337,7 @@ class CreateAnnotation:
svgicon('check', f'{BAR_SIZE}px', f'{BAR_SIZE}px'), svgicon('check', f'{BAR_SIZE}px', f'{BAR_SIZE}px'),
href='javascript:void', href='javascript:void',
class_='simple-link', class_='simple-link',
title=_('Done adding notes'), title=_('Done adding notes') + ' [Esc]',
onclick=def(ev): onclick=def(ev):
ev.preventDefault(), ev.stopPropagation() ev.preventDefault(), ev.stopPropagation()
self.hide_middle() self.hide_middle()
@ -459,6 +459,8 @@ class CreateAnnotation:
ev.stopPropagation(), ev.preventDefault() ev.stopPropagation(), ev.preventDefault()
if ev.key is 'Enter': if ev.key is 'Enter':
return self.accept() return self.accept()
if ev.key is 'n' or ev.key is 'N':
return self.add_notes()
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 sc_name is 'show_chrome': if sc_name is 'show_chrome':
self.hide() self.hide()