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

E-book viewer: Fix section titles in highlights panel being incorrectly expanded to full titles when the section has multiple highlights. Fixes #2034968 [Ebook-viewer: highlight header changes after adding a second highlight](https://bugs.launchpad.net/calibre/+bug/2034968)

Browse Source 
They should only be expanded if there are multiple such section titles
not multiple highlights per section
This commit is contained in:
Kovid Goyal 2023-09-14 16:18:28 +05:30
parent 48e4322131
commit 9dd074c70e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/viewer/highlights.py
View File

@ -249,7 +249,7 @@ class Highlights(QTreeWidget):
self.uuid_map = {}
highlights = (h for h in highlights if not h.get('removed') and h.get('highlighted_text'))
smap = {}
title_counts = defaultdict(lambda : 0)
repeated_short_titles = defaultdict(set)
@lru_cache
def tooltip_for(tfam):
@ -273,18 +273,20 @@ class Highlights(QTreeWidget):
lsec = h.get('lowest_level_section_title')
key = (tsec or '', lsec or '')
short_title = lsec or tsec or _('Unknown')
title_counts[short_title] += 1
section = {
'title': short_title, 'tfam': tfam, 'tsec': tsec, 'lsec': lsec, 'items': [], 'tooltip': tooltip_for(tfam), 'key': key,
}
smap.setdefault(key, section)['items'].append(h)
repeated_short_titles[short_title].add(key)
for section in smap.values():
if title_counts[section['title']] > 1:
if section['tfam']:
section['title'] = ' ➤ '.join(section['tfam'])
elif section['tsec'] and section['lsec']:
section['title'] = ' ➤ '.join((section['tsec'], section['lsec']))
for keys in repeated_short_titles.values():
if len(keys) > 1:
for key in keys:
section = smap[key]
if section['tfam']:
section['title'] = ' ➤ '.join(tfam)
elif section['tsec'] and section['lsec']:
section['title'] = ' ➤ '.join((section['tsec'], section['lsec']))
for secnum, (sec_key, sec) in enumerate(smap.items()):
section = QTreeWidgetItem([sec['title']], 1)