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

Fix #1969302 [AltGr + { causes action of Ctrl + { in ebook editor](https://bugs.launchpad.net/calibre/+bug/1969302)

Browse Source
This commit is contained in:
Kovid Goyal 2022-04-18 16:41:52 +05:30
parent db75fe003f
commit 577f6ff9b4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/tweak_book/editor/smarts/html.py
View File

@ -675,6 +675,8 @@ class Smarts(NullSmarts):
ev_text = ev.text() ev_text = ev.text()
key = ev.key() key = ev.key()
is_xml = editor.syntax == 'xml' is_xml = editor.syntax == 'xml'
mods = ev.modifiers() & (
Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.AltModifier | Qt.KeyboardModifier.MetaModifier | Qt.KeyboardModifier.KeypadModifier)
if tprefs['replace_entities_as_typed'] and ( if tprefs['replace_entities_as_typed'] and (
';' in ev_text or ';' in ev_text or
@ -722,7 +724,6 @@ class Smarts(NullSmarts):
return True return True
if key == Qt.Key.Key_Tab: if key == Qt.Key.Key_Tab:
mods = ev.modifiers()
if not mods & Qt.KeyboardModifier.ControlModifier and smart_tab(editor, ev): if not mods & Qt.KeyboardModifier.ControlModifier and smart_tab(editor, ev):
return True return True
@ -730,11 +731,10 @@ class Smarts(NullSmarts):
return True return True
if key in (Qt.Key.Key_BraceLeft, Qt.Key.Key_BraceRight): if key in (Qt.Key.Key_BraceLeft, Qt.Key.Key_BraceRight):
mods = ev.modifiers() if mods == Qt.KeyboardModifier.ControlModifier:
if int(mods & Qt.KeyboardModifier.ControlModifier):
if self.jump_to_enclosing_tag(editor, key == Qt.Key.Key_BraceLeft): if self.jump_to_enclosing_tag(editor, key == Qt.Key.Key_BraceLeft):
return True return True
if key == Qt.Key.Key_T and int(ev.modifiers() & (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.AltModifier)): if key == Qt.Key.Key_T and mods == (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.AltModifier):
return self.select_tag_contents(editor) return self.select_tag_contents(editor)
return False return False