alex/anki-connect
1
Fork 0
Code Releases 7 Activity

Fix return value of guiAddCards

Browse Source 
* For the case where the current AddCards dialogue has to be closed first
This commit is contained in:
Henrik Giesel 2019-05-04 23:24:13 +02:00
parent db602ebe9a
commit 1824cd8c1c
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugin/__init__.py
View File

@ -980,40 +980,43 @@ class AnkiConnect:
return ankiNote.id
elif note is not None:
currentWindow = aqt.dialogs._dialogs['AddCards'][1]
collection = self.collection()
ankiNote = anki.notes.Note(collection, model)
# fill out card beforehand, so we can be sure of the note id
if 'fields' in note:
for name, value in note['fields'].items():
if name in ankiNote:
ankiNote[name] = value
if 'tags' in note:
ankiNote.tags = note['tags']
def openNewWindow():
nonlocal ankiNote
addCards = aqt.dialogs.open('AddCards', self.window())
if savedMid:
deck['mid'] = savedMid
editor = addCards.editor
ankiNote = editor.note
# we have to fill out the card in the callback
# otherwise we can't assure, the new window is open
if 'fields' in note:
for name, value in note['fields'].items():
if name in ankiNote:
ankiNote[name] = value
editor.loadNote()
if 'tags' in note:
ankiNote.tags = note['tags']
editor.updateTags()
addCards.editor.note = ankiNote
addCards.editor.loadNote()
addCards.editor.updateTags()
addCards.activateWindow()
aqt.dialogs.open('AddCards', self.window())
addCards.setAndFocusNote(editor.note)
addCards.setAndFocusNote(addCards.editor.note)
currentWindow = aqt.dialogs._dialogs['AddCards'][1]
if currentWindow is not None:
currentWindow.closeWithCallback(openNewWindow)
else:
openNewWindow()
return aqt.dialogs._dialogs['AddCards'][1].editor.note.id
return ankiNote.id
else:
addCards = aqt.dialogs.open('AddCards', self.window())