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

E-book viewer: Highlights panel: Dont expand all sections when adding/deleting/modifying highlights. Fixes #1924598 [Adding new highlight in ebook viewer expands all sections.](https://bugs.launchpad.net/calibre/+bug/1924598)

Browse Source
This commit is contained in:
Kovid Goyal 2021-04-16 07:47:51 +05:30
parent 391e9d3f39
commit a0460762ed
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,8 +199,15 @@ class Highlights(QTreeWidget):
def current_item_changed(self, current, previous): def current_item_changed(self, current, previous):
self.current_highlight_changed.emit(current.data(0, Qt.ItemDataRole.UserRole) if current is not None else None) self.current_highlight_changed.emit(current.data(0, Qt.ItemDataRole.UserRole) if current is not None else None)
def load(self, highlights): def load(self, highlights, preserve_state=False):
s = self.style() s = self.style()
expanded_chapters = set()
if preserve_state:
root = self.invisibleRootItem()
for i in range(root.childCount()):
chapter = root.child(i)
if chapter.isExpanded():
expanded_chapters.add(chapter.data(0, Qt.ItemDataRole.DisplayRole))
icon_size = s.pixelMetric(QStyle.PixelMetric.PM_SmallIconSize, None, self) icon_size = s.pixelMetric(QStyle.PixelMetric.PM_SmallIconSize, None, self)
dpr = self.devicePixelRatioF() dpr = self.devicePixelRatioF()
is_dark = is_dark_theme() is_dark = is_dark_theme()
@ -234,7 +241,7 @@ class Highlights(QTreeWidget):
if tt: if tt:
section.setToolTip(0, tt) section.setToolTip(0, tt)
self.addTopLevelItem(section) self.addTopLevelItem(section)
section.setExpanded(True) section.setExpanded(not preserve_state or sec in expanded_chapters)
for itemnum, h in enumerate(items): for itemnum, h in enumerate(items):
txt = h.get('highlighted_text') txt = h.get('highlighted_text')
txt = txt.replace('\n', ' ') txt = txt.replace('\n', ' ')
@ -268,7 +275,7 @@ class Highlights(QTreeWidget):
def refresh(self, highlights): def refresh(self, highlights):
h = self.current_highlight h = self.current_highlight
self.load(highlights) self.load(highlights, preserve_state=True)
if h is not None: if h is not None:
idx = self.uuid_map.get(h['uuid']) idx = self.uuid_map.get(h['uuid'])
if idx is not None: if idx is not None: