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: Have the Table of Contents view automatically scroll to keep the chapter being read currently visible. Fixes #1916411 [Enhancement Request: ToC Behavior - Default to Current Chapter](https://bugs.launchpad.net/calibre/+bug/1916411)

Browse Source
This commit is contained in:
Kovid Goyal 2021-02-22 09:53:46 +05:30
parent 4d6d25a788
commit f6235a1845
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/calibre/gui2/viewer/toc.py
View File

@ -52,7 +52,13 @@ class TOCView(QTreeView):
def setModel(self, model): def setModel(self, model):
QTreeView.setModel(self, model) QTreeView.setModel(self, model)
model.auto_expand_nodes.connect(self.auto_expand_indices, type=Qt.ConnectionType.QueuedConnection) model.current_toc_nodes_changed.connect(self.current_toc_nodes_changed, type=Qt.ConnectionType.QueuedConnection)
def current_toc_nodes_changed(self, ancestors, nodes):
if ancestors:
self.auto_expand_indices(ancestors)
if nodes:
self.scrollTo(nodes[-1].index())
def auto_expand_indices(self, indices): def auto_expand_indices(self, indices):
for idx in indices: for idx in indices:
@ -116,6 +122,11 @@ class TOCView(QTreeView):
def update_current_toc_nodes(self, families): def update_current_toc_nodes(self, families):
self.model().update_current_toc_nodes(families) self.model().update_current_toc_nodes(families)
def scroll_to_current_toc_node(self):
nodes = self.model().viewed_nodes()
if nodes:
self.scrollTo(nodes[-1].index())
class TOCSearch(QWidget): class TOCSearch(QWidget):
@ -202,7 +213,7 @@ class TOCItem(QStandardItem):
class TOC(QStandardItemModel): class TOC(QStandardItemModel):
auto_expand_nodes = pyqtSignal(object) current_toc_nodes_changed = pyqtSignal(object, object)
def __init__(self, toc=None): def __init__(self, toc=None):
QStandardItemModel.__init__(self) QStandardItemModel.__init__(self)
@ -259,12 +270,17 @@ class TOC(QStandardItemModel):
viewed_nodes |= {x.node_id for x in ansc} viewed_nodes |= {x.node_id for x in ansc}
for x in ansc: for x in ansc:
ancestors[x.node_id] = x.index() ancestors[x.node_id] = x.index()
if ancestors: nodes = []
self.auto_expand_nodes.emit(tuple(ancestors.values()))
for node in self.all_items: for node in self.all_items:
is_being_viewed = node.node_id in viewed_nodes is_being_viewed = node.node_id in viewed_nodes
if is_being_viewed:
nodes.append(node)
if is_being_viewed != node.is_being_viewed: if is_being_viewed != node.is_being_viewed:
node.set_being_viewed(is_being_viewed) node.set_being_viewed(is_being_viewed)
self.current_toc_nodes_changed.emit(tuple(ancestors.values()), nodes)
def viewed_nodes(self):
return tuple(node for node in self.all_items if node.is_being_viewed)
@property @property
def as_plain_text(self): def as_plain_text(self):

5
src/calibre/gui2/viewer/ui.py
View File

@ -297,7 +297,10 @@ class EbookViewer(MainWindow):
self.inspector_dock.setVisible(not visible) self.inspector_dock.setVisible(not visible)
def toggle_toc(self): def toggle_toc(self):
self.toc_dock.setVisible(not self.toc_dock.isVisible()) is_visible = self.toc_dock.isVisible()
self.toc_dock.setVisible(not is_visible)
if not is_visible:
self.toc.scroll_to_current_toc_node()
def show_search(self, text, trigger=False): def show_search(self, text, trigger=False):
self.search_dock.setVisible(True) self.search_dock.setVisible(True)