GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-23 08:22:24 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix cutting and copying between fields

Browse source 
the shortcut keys are handled by webengine on platforms other than
osx, so rather than messing with an event filter we catch the cut and
copy events in js and send a signal back
This commit is contained in:
Damien Elmes 2017-09-02 13:48:03 +10:00
parent be14703e7f
commit a7ed7fa4e3
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aqt/editor.py
View file

@ -646,6 +646,9 @@ to a cloze type first, via Edit>Change Note Type."""))
def onPaste(self): def onPaste(self):
self.web.onPaste() self.web.onPaste()
def onCutOrCopy(self):
self.web.flagAnkiText()
# Advanced menu # Advanced menu
###################################################################### ######################################################################
@ -693,6 +696,7 @@ to a cloze type first, via Edit>Change Note Type."""))
more=onAdvanced, more=onAdvanced,
dupes=showDupes, dupes=showDupes,
paste=onPaste, paste=onPaste,
cutOrCopy=onCutOrCopy,
) )
# Pasting, drag & drop, and keyboard layouts # Pasting, drag & drop, and keyboard layouts
@ -715,11 +719,9 @@ class EditorWebView(AnkiWebView):
self._flagAnkiText() self._flagAnkiText()
def onCut(self): def onCut(self):
self._markInternal = True
self.triggerPageAction(QWebEnginePage.Cut) self.triggerPageAction(QWebEnginePage.Cut)
def onCopy(self): def onCopy(self):
self._markInternal = True
self.triggerPageAction(QWebEnginePage.Copy) self.triggerPageAction(QWebEnginePage.Copy)
def onPaste(self): def onPaste(self):
@ -819,6 +821,10 @@ class EditorWebView(AnkiWebView):
# add to media and return resulting html link # add to media and return resulting html link
return self.editor._addMedia(newpath) return self.editor._addMedia(newpath)
def flagAnkiText(self):
# be ready to adjust when clipboard event fires
self._markInternal = True
def _flagAnkiText(self): def _flagAnkiText(self):
# add a comment in the clipboard html so we can tell text is copied # add a comment in the clipboard html so we can tell text is copied
# from us and doesn't need to be stripped # from us and doesn't need to be stripped

6
web/editor.js
View file

@ -258,6 +258,11 @@ function wrap(front, back) {
} }
} }
function onCutOrCopy() {
pycmd("cutOrCopy");
return true;
}
function setFields(fields, prewrap) { function setFields(fields, prewrap) {
var txt = ""; var txt = "";
for (var i = 0; i < fields.length; i++) { for (var i = 0; i < fields.length; i++) {
@ -270,6 +275,7 @@ function setFields(fields, prewrap) {
txt += "<div id=f{0} onkeydown='onKey();' oninput='checkForEmptyField()' onmouseup='onKey();'".format(i); txt += "<div id=f{0} onkeydown='onKey();' oninput='checkForEmptyField()' onmouseup='onKey();'".format(i);
txt += " onfocus='onFocus(this);' onblur='onBlur();' class=field "; txt += " onfocus='onFocus(this);' onblur='onBlur();' class=field ";
txt += "ondragover='onDragOver(this);' onpaste='onPaste(this);' "; txt += "ondragover='onDragOver(this);' onpaste='onPaste(this);' ";
txt += "oncopy='onCutOrCopy(this);' oncut='onCutOrCopy(this);' ";
txt += "contentEditable=true class=field>{0}</div>".format(f); txt += "contentEditable=true class=field>{0}</div>".format(f);
txt += "</td></tr>"; txt += "</td></tr>";
} }