Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the back stack work across show_all_functions.

Browse Source
This commit is contained in:
Charles Haley 2024-11-22 20:11:47 +00:00
parent 37732b2bd6
commit 141d24cef0
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/calibre/gui2/dialogs/template_dialog.py
View File

@ -36,6 +36,7 @@ from qt.core import (
QTableWidgetItem, QTableWidgetItem,
QTextCharFormat, QTextCharFormat,
QTextOption, QTextOption,
QTimer,
QToolButton, QToolButton,
QVBoxLayout, QVBoxLayout,
pyqtSignal, pyqtSignal,
@ -100,7 +101,7 @@ class DocViewer(Dialog):
b.setEnabled(False) b.setEnabled(False)
b = self.bb.addButton(_('Show &all functions'), QDialogButtonBox.ButtonRole.ActionRole) b = self.bb.addButton(_('Show &all functions'), QDialogButtonBox.ButtonRole.ActionRole)
b.clicked.connect(self.show_all_functions) b.clicked.connect(self.show_all_functions_button_clicked)
b.setToolTip((_('Shows a list of all built-in functions in alphabetic order'))) b.setToolTip((_('Shows a list of all built-in functions in alphabetic order')))
def back(self): def back(self):
@ -108,24 +109,26 @@ class DocViewer(Dialog):
info_dialog(self, _('Go back'), _('No function to go back to'), show=True) info_dialog(self, _('Go back'), _('No function to go back to'), show=True)
else: else:
place = self.back_stack.pop() place = self.back_stack.pop()
if not self.back_stack: self.back_button.setEnabled(bool(self.back_stack))
self.back_button.setEnabled(False)
if isinstance(place, int): if isinstance(place, int):
self.show_all_functions() self.show_all_functions()
self.doc_viewer_widget.verticalScrollBar().setSliderPosition(place) # For reasons known only to Qt, I can't set the scroll bar position
# until some time has passed.
QTimer.singleShot(10, lambda: self.doc_viewer_widget.verticalScrollBar().setValue(place))
else: else:
self.show_function(place) self._show_function(place)
def add_to_back_stack(self):
if self.last_function is not None:
self.back_stack.append(self.last_function)
elif self.last_operation is not None:
self.back_stack.append(self.doc_viewer_widget.verticalScrollBar().value())
self.back_button.setEnabled(bool(self.back_stack))
def url_clicked(self, qurl): def url_clicked(self, qurl):
if qurl.scheme().startswith('http'): if qurl.scheme().startswith('http'):
safe_open_url(qurl) safe_open_url(qurl)
else: else:
if self.last_function is not None:
self.back_stack.append(self.last_function)
self.back_button.setEnabled(True)
else:
self.back_stack.append(self.doc_viewer_widget.verticalScrollBar().sliderPosition())
self.back_button.setEnabled(True)
self.show_function(qurl.path()) self.show_function(qurl.path())
def english_cb_state_changed(self): def english_cb_state_changed(self):
@ -146,6 +149,11 @@ class DocViewer(Dialog):
return _('No documentation provided') return _('No documentation provided')
def show_function(self, fname): def show_function(self, fname):
if fname in self.builtins and fname != self.last_function:
self.add_to_back_stack()
self._show_function(fname)
def _show_function(self, fname):
self.last_operation = partial(self.show_function, fname) self.last_operation = partial(self.show_function, fname)
bif = self.builtins[fname] bif = self.builtins[fname]
if fname not in self.builtins or not bif.doc: if fname not in self.builtins or not bif.doc:
@ -155,9 +163,11 @@ class DocViewer(Dialog):
self.set_html(self.header_line(fname) + self.set_html(self.header_line(fname) +
self.ffml.document_to_html(self.get_doc(bif), fname)) self.ffml.document_to_html(self.get_doc(bif), fname))
def show_all_functions_button_clicked(self):
self.add_to_back_stack()
self.show_all_functions()
def show_all_functions(self): def show_all_functions(self):
self.back_button.setEnabled(False)
self.back_stack = []
self.last_function = None self.last_function = None
self.last_operation = self.show_all_functions self.last_operation = self.show_all_functions
result = [] result = []