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

Better fix for ctrl+letter

Browse Source
This commit is contained in:
Kovid Goyal 2019-09-30 09:38:43 +05:30
parent c034aeca4a
commit 0ce7e45327
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,11 +45,22 @@ def shortcut_differs(a, b):
return not (a.key is b.key and a.altKey is b.altKey and a.ctrlKey is b.ctrlKey and a.metaKey is b.metaKey and a.shiftKey is b.shiftKey)
def get_key_text(evt):
key = evt.key
if key:
cc = key.charCodeAt(0)
# on windows in webengine pressing ctrl+ascii char gives us an ascii
# control code
if 0 < cc < 32 and evt.ctrlKey and not evt.metaKey and not evt.shiftKey and not evt.altKey:
key = chr(96 + cc)
return key
def keyevent_to_index(evt):
parts = v'[]'
for mod in v"['altKey', 'ctrlKey', 'metaKey', 'shiftKey']":
parts.push('y' if evt[mod] else 'n')
return parts.join('') + evt.key
return parts.join('') + get_key_text(evt)
def key_as_text(evt):
@ -60,7 +71,7 @@ def key_as_text(evt):
mods = '+'.join(mods)
if mods:
mods += '+'
key = evt.key
key = get_key_text(evt)
if key is ' ':
key = 'Space'
return mods + key
@ -164,15 +175,13 @@ SHORTCUTS = {
),
'toggle_toc': desc(
# on windows ctrl+t results in ctrl+\u0014
v"['Ctrl+t', 'Ctrl+\u0014']",
'Ctrl+t',
'ui',
_('Show/hide Table of Contents'),
),
'start_search': desc(
# on windows ctrl+f results in ctrl+\u0006
v"['/', 'Ctrl+f', 'Ctrl+\u0006']",
v"['/', 'Ctrl+f']",
'ui',
_('Start search'),
),