From 7f7e5c2702c27da135a441c58c026742e7cd7a58 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Fri, 2 Jul 2021 17:30:49 +0200 Subject: [PATCH] Execute Ctrl+C/V/X/A through execCommand in editor (so we can customize it) --- qt/aqt/editor.py | 2 +- qt/aqt/webview.py | 5 +++-- ts/editor/index.ts | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index 7766dd9e8..c2e6f8799 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -1052,7 +1052,7 @@ $editorToolbar.then(({{ toolbar }}) => toolbar.appendGroup({{ class EditorWebView(AnkiWebView): def __init__(self, parent: QWidget, editor: Editor) -> None: - AnkiWebView.__init__(self, title="editor") + AnkiWebView.__init__(self, title="editor", mac_default_shortcuts=False) self.editor = editor self.setAcceptDrops(True) self._markInternal = False diff --git a/qt/aqt/webview.py b/qt/aqt/webview.py index ccfd86c88..9f17ed6b9 100644 --- a/qt/aqt/webview.py +++ b/qt/aqt/webview.py @@ -210,7 +210,7 @@ class WebContent: class AnkiWebView(QWebEngineView): def __init__( - self, parent: Optional[QWidget] = None, title: str = "default" + self, parent: Optional[QWidget] = None, title: str = "default", *, mac_default_shortcuts: bool = True ) -> None: QWebEngineView.__init__(self, parent=parent) self.set_title(title) @@ -238,7 +238,7 @@ class AnkiWebView(QWebEngineView): context=Qt.WidgetWithChildrenShortcut, activated=self.onEsc, ) - if isMac: + if isMac and mac_default_shortcuts: for key, fn in [ (QKeySequence.Copy, self.onCopy), (QKeySequence.Paste, self.onPaste), @@ -248,6 +248,7 @@ class AnkiWebView(QWebEngineView): QShortcut( # type: ignore key, self, context=Qt.WidgetWithChildrenShortcut, activated=fn ) + QShortcut( # type: ignore QKeySequence("ctrl+shift+v"), self, diff --git a/ts/editor/index.ts b/ts/editor/index.ts index 14ec2e16b..af7341f5f 100644 --- a/ts/editor/index.ts +++ b/ts/editor/index.ts @@ -8,6 +8,8 @@ import { filterHTML } from "html-filter"; import { updateActiveButtons, disableButtons } from "./toolbar"; import { setupI18n, ModuleName } from "lib/i18n"; +import { registerShortcut } from "lib/shortcuts"; +import { bridgeCommand } from "./lib"; import "./fields.css"; @@ -40,6 +42,11 @@ customElements.define("anki-editing-area", EditingArea, { extends: "div" }); customElements.define("anki-label-container", LabelContainer, { extends: "div" }); customElements.define("anki-editor-field", EditorField, { extends: "div" }); +registerShortcut(() => document.execCommand("copy"), "Control+C"); +registerShortcut(() => document.execCommand("cut"), "Control+X"); +registerShortcut(() => document.execCommand("selectAll"), "Control+A"); +registerShortcut(() => bridgeCommand("paste"), "Control+Shift+V"); + export function getCurrentField(): EditingArea | null { return document.activeElement instanceof EditingArea ? document.activeElement