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

Content server: Fix icons for individual formats not being shown in the Tag browser

Browse Source
This commit is contained in:
Kovid Goyal 2025-01-16 14:02:52 +05:30
parent d00a2fd645
commit 5692af16a9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pyj/book_list/search.pyj
View File

@ -59,8 +59,18 @@ def component(container, name):
def icon_for_node(node): def icon_for_node(node):
interface_data = get_interface_data() interface_data = get_interface_data()
ans = interface_data.icon_map[node.data.category] or 'column.png' fallback = ''
return absolute_path(interface_data.icon_path + '/' + ans) if node.data.category is 'formats' and not node.data.is_category:
fmt = node.data.name.lower()
if fmt.startswith('original_'):
fmt = fmt.partition('_')[2]
ans = f'mimetypes/{fmt}.png'
fallback = interface_data.icon_map[node.data.category]
else:
ans = interface_data.icon_map[node.data.category] or 'column.png'
if fallback:
fallback = absolute_path(interface_data.icon_path + '/' + fallback)
return absolute_path(interface_data.icon_path + '/' + ans), fallback
def node_for_path(path): def node_for_path(path):
@ -216,15 +226,22 @@ def render_search_expression():
search_control.value = parts.join(' ') search_control.value = parts.join(' ')
def show_fallback(fallback, ev):
if fallback:
if ev.target.src is not fallback:
ev.target.src = fallback
def menu_clicked(i): def menu_clicked(i):
def create_details(container, hide_modal): def create_details(container, hide_modal):
node = node_for_path().children[i] node = node_for_path().children[i]
data = node.data data = node.data
name = data.original_name or data.name or data.sort name = data.original_name or data.name or data.sort
icon, fallback = icon_for_node(node)
title = E.h2( title = E.h2(
style='display:flex; align-items: center; border-bottom: solid 1px currentColor; font-weight:bold; font-size:' + get_font_size('title'), style='display:flex; align-items: center; border-bottom: solid 1px currentColor; font-weight:bold; font-size:' + get_font_size('title'),
E.img(src=icon_for_node(node), style='height:2ex; margin-right: 0.5rem'), E.img(src=icon, onerror=show_fallback.bind(None, fallback), style='height:2ex; margin-right: 0.5rem'),
E.span(name) E.span(name)
) )
def edit_note(field, item_name): def edit_note(field, item_name):
@ -305,12 +322,13 @@ def render_children(container, children):
tooltip += '\n' + _('Number of books in this category: {}').format(data.count) tooltip += '\n' + _('Number of books in this category: {}').format(data.count)
if data.avg_rating is not undefined: if data.avg_rating is not undefined:
tooltip += '\n' + _('Average rating for books in this category: {:.1f}').format(data.avg_rating) tooltip += '\n' + _('Average rating for books in this category: {:.1f}').format(data.avg_rating)
icon, fallback = icon_for_node(node)
div = E.div( div = E.div(
title=tooltip.lstrip(), title=tooltip.lstrip(),
style="display:flex; align-items: stretch", style="display:flex; align-items: stretch",
E.div(class_='tag-name', E.div(class_='tag-name',
style='border-right:solid 1px currentColor; padding: 1ex; display:flex; align-items: center', style='border-right:solid 1px currentColor; padding: 1ex; display:flex; align-items: center',
E.img(src=icon_for_node(node), style='display:inline-block; max-height:2.5ex'), E.img(src=icon, onerror=show_fallback.bind(None, fallback), style='display:inline-block; max-height:2.5ex'),
E.span(data.name), E.span(data.name),
), ),
E.div(class_='tag-menu', E.div(class_='tag-menu',