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

Viewer: Add a keyboard shortcut (Ctrl+alt+b) for adding a bookmark

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-25 14:46:02 +05:30
parent cac07c2f22
commit 27f626d325
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
6 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/viewer/bookmarks.py
View File

@ -294,7 +294,11 @@ class BookmarkManager(QWidget):
self.edited.emit(bookmarks) self.edited.emit(bookmarks)
def keyPressEvent(self, ev): def keyPressEvent(self, ev):
if ev.key() == Qt.Key_Escape or get_shortcut_for(self, ev) == 'toggle_bookmarks': sc = get_shortcut_for(self, ev)
if ev.key() == Qt.Key_Escape or sc == 'toggle_bookmarks':
self.toggle_requested.emit() self.toggle_requested.emit()
return return
if sc == 'new_bookmark':
self.create_requested.emit()
return
return QWidget.keyPressEvent(self, ev) return QWidget.keyPressEvent(self, ev)

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

@ -161,6 +161,7 @@ class EbookViewer(MainWindow):
self.search_widget.show_search_result.connect(self.web_view.show_search_result) self.search_widget.show_search_result.connect(self.web_view.show_search_result)
self.web_view.search_result_not_found.connect(self.search_widget.search_result_not_found) self.web_view.search_result_not_found.connect(self.search_widget.search_result_not_found)
self.web_view.toggle_bookmarks.connect(self.toggle_bookmarks) self.web_view.toggle_bookmarks.connect(self.toggle_bookmarks)
self.web_view.new_bookmark.connect(self.bookmarks_widget.create_requested)
self.web_view.toggle_inspector.connect(self.toggle_inspector) self.web_view.toggle_inspector.connect(self.toggle_inspector)
self.web_view.toggle_lookup.connect(self.toggle_lookup) self.web_view.toggle_lookup.connect(self.toggle_lookup)
self.web_view.quit.connect(self.quit) self.web_view.quit.connect(self.quit)

3
src/calibre/gui2/viewer/web_view.py
View File

@ -248,6 +248,7 @@ class ViewerBridge(Bridge):
reload_book = from_js() reload_book = from_js()
toggle_toc = from_js() toggle_toc = from_js()
toggle_bookmarks = from_js() toggle_bookmarks = from_js()
new_bookmark = from_js()
toggle_inspector = from_js() toggle_inspector = from_js()
toggle_lookup = from_js() toggle_lookup = from_js()
show_search = from_js() show_search = from_js()
@ -438,6 +439,7 @@ class WebView(RestartingWebEngineView):
search_result_not_found = pyqtSignal(object) search_result_not_found = pyqtSignal(object)
find_next = pyqtSignal(object) find_next = pyqtSignal(object)
toggle_bookmarks = pyqtSignal() toggle_bookmarks = pyqtSignal()
new_bookmark = pyqtSignal()
toggle_inspector = pyqtSignal() toggle_inspector = pyqtSignal()
toggle_lookup = pyqtSignal() toggle_lookup = pyqtSignal()
quit = pyqtSignal() quit = pyqtSignal()
@ -489,6 +491,7 @@ class WebView(RestartingWebEngineView):
self.bridge.search_result_not_found.connect(self.search_result_not_found) self.bridge.search_result_not_found.connect(self.search_result_not_found)
self.bridge.find_next.connect(self.find_next) self.bridge.find_next.connect(self.find_next)
self.bridge.toggle_bookmarks.connect(self.toggle_bookmarks) self.bridge.toggle_bookmarks.connect(self.toggle_bookmarks)
self.bridge.new_bookmark.connect(self.new_bookmark)
self.bridge.toggle_inspector.connect(self.toggle_inspector) self.bridge.toggle_inspector.connect(self.toggle_inspector)
self.bridge.toggle_lookup.connect(self.toggle_lookup) self.bridge.toggle_lookup.connect(self.toggle_lookup)
self.bridge.quit.connect(self.quit) self.bridge.quit.connect(self.quit)

6
src/pyj/read_book/shortcuts.pyj
View File

@ -362,6 +362,12 @@ def add_standalone_viewer_shortcuts():
_('Show/hide bookmarks'), _('Show/hide bookmarks'),
) )
sc['new_bookmark'] = desc(
v"['Ctrl+Alt+b']",
'ui',
_('Create a new bookmark'),
)
sc['toggle_inspector'] = desc( sc['toggle_inspector'] = desc(
v"['Ctrl+i']", v"['Ctrl+i']",
'ui', 'ui',

2
src/pyj/read_book/view.pyj
View File

@ -427,6 +427,8 @@ class View:
ui_operations.toggle_toc() ui_operations.toggle_toc()
elif data.name is 'toggle_bookmarks': elif data.name is 'toggle_bookmarks':
ui_operations.toggle_bookmarks() ui_operations.toggle_bookmarks()
elif data.name is 'new_bookmark':
ui_operations.new_bookmark()
elif data.name is 'toggle_inspector': elif data.name is 'toggle_inspector':
ui_operations.toggle_inspector() ui_operations.toggle_inspector()
elif data.name is 'toggle_lookup': elif data.name is 'toggle_lookup':

2
src/pyj/viewer-main.pyj
View File

@ -355,6 +355,8 @@ if window is window.top:
to_python.toggle_toc() to_python.toggle_toc()
ui_operations.toggle_bookmarks = def(): ui_operations.toggle_bookmarks = def():
to_python.toggle_bookmarks() to_python.toggle_bookmarks()
ui_operations.new_bookmark = def():
to_python.new_bookmark()
ui_operations.toggle_inspector = def(): ui_operations.toggle_inspector = def():
to_python.toggle_inspector() to_python.toggle_inspector()
ui_operations.content_file_changed = def(name): ui_operations.content_file_changed = def(name):