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

Indicate current olor on quick highlight icon

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-29 11:32:30 +05:30
parent 8d4744c3e4
commit 3c4fb4f4ef
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,22 +10,45 @@ from book_list.theme import get_color
from dom import clear, svgicon from dom import clear, svgicon
from read_book.globals import runtime, ui_operations from read_book.globals import runtime, ui_operations
ICON_SIZE = '3ex'
def quick_highlight_icon(name, tooltip, hcolor):
svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
svg.setAttribute('style', f'fill: currentColor; height: 2ex; width: 2ex; vertical-align: text-top; margin: 0')
u = document.createElementNS('http://www.w3.org/2000/svg', 'use')
svg.appendChild(u)
svg.firstChild.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', '#icon-' + name)
ans = E.div(
style=f'width: {ICON_SIZE}; height: {ICON_SIZE}; display: flex; flex-direction: column',
title=tooltip or '',
svg,
E.div(style=f'width: {ICON_SIZE}; height: 1ex; background-color: {hcolor}; color: {hcolor}; margin: 0', '.')
)
return ans
def all_actions(): def all_actions():
def a(icon, text, func, needs_highlight): def a(icon, text, func, needs_highlight):
return {'icon': icon, 'text': text, 'function_name': func, 'needs_highlight': v'!!needs_highlight'} return {
'icon': icon, 'text': text, 'function_name': func, 'needs_highlight': v'!!needs_highlight',
'icon_function': def (hcolor):
return svgicon(icon, ICON_SIZE, ICON_SIZE, text)
}
if not all_actions.ans: if not all_actions.ans:
all_actions.ans = { all_actions.ans = {
'copy': a('copy', _('Copy to clipboard'), 'copy_to_clipboard'), 'copy': a('copy', _('Copy to clipboard'), 'copy_to_clipboard'),
'lookup': a('library', _('Lookup/search selected word'), 'lookup'), 'lookup': a('library', _('Lookup/search selected word'), 'lookup'),
'quick_highlight': a('highlight', _('Quick highlight in current style'), 'quick_highlight'), 'quick_highlight': a('highlight', _('Quick highlight in current color'), 'quick_highlight'),
'highlight': a('highlight', _('Highlight selection in notes mode'), 'create_highlight'), 'highlight': a('highlight', _('Highlight selection in notes mode'), 'create_highlight'),
'selection': a('arrows-h', _('Highlight adjusting selection'), 'adjust_selection'), 'selection': a('arrows-h', _('Highlight adjusting selection'), 'adjust_selection'),
'search_net': a('search', _('Search for selection on the net'), 'internet_search'), 'search_net': a('search', _('Search for selection on the net'), 'internet_search'),
'remove_highlight': a('trash', _('Remove this highlight'), 'remove_highlight', True), 'remove_highlight': a('trash', _('Remove this highlight'), 'remove_highlight', True),
'clear': a('close', _('Clear selection'), 'clear_selection'), 'clear': a('close', _('Clear selection'), 'clear_selection'),
} }
qh = all_actions.ans.quick_highlight
qh.icon_function = quick_highlight_icon.bind(None, qh.icon, qh.text)
return all_actions.ans return all_actions.ans
@ -54,9 +77,10 @@ class SelectionBar:
) )
bar = bar_container.firstChild bar = bar_container.firstChild
c.appendChild(bar_container) c.appendChild(bar_container)
bg = self.view.create_annotation.current_highlight_style['background-color']
def cb(icon, tooltip, callback): def cb(ac, callback):
ans = svgicon(icon, '3ex', '3ex', tooltip) ans = ac.icon_function(bg)
ans.addEventListener('click', def(ev): ans.addEventListener('click', def(ev):
callback(ev) callback(ev)
self.view.focus_iframe() self.view.focus_iframe()
@ -70,7 +94,7 @@ class SelectionBar:
for acname in sd.get('selection_bar_actions'): for acname in sd.get('selection_bar_actions'):
ac = actions[acname] ac = actions[acname]
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.icon, ac.text, self[ac.function_name])) bar.appendChild(cb(ac, self[ac.function_name]))
self.show_notes(bar_container, notes) self.show_notes(bar_container, notes)
return bar_container return bar_container