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

deprecate removeTempNote()

Browse source
This commit is contained in:
Damien Elmes 2020-05-20 15:01:05 +10:00
parent 8da69c5d39
commit 6ae55a7a77
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qt/aqt/addcards.py
View file

@ -108,7 +108,6 @@ class AddCards(QDialog):
oldFieldName = oldNote.model()["flds"][n]["name"] oldFieldName = oldNote.model()["flds"][n]["name"]
if oldFieldName not in newFields: if oldFieldName not in newFields:
note.fields[n] = oldNote.fields[n] note.fields[n] = oldNote.fields[n]
self.removeTempNote(oldNote)
self.editor.note = note self.editor.note = note
# When on model change is called, reset is necessarily called. # When on model change is called, reset is necessarily called.
# Reset load note, so it is not required to load it here. # Reset load note, so it is not required to load it here.
@ -119,18 +118,13 @@ class AddCards(QDialog):
flds = note.model()["flds"] flds = note.model()["flds"]
# copy fields from old note # copy fields from old note
if oldNote: if oldNote:
if not keep:
self.removeTempNote(oldNote)
for n in range(min(len(note.fields), len(oldNote.fields))): for n in range(min(len(note.fields), len(oldNote.fields))):
if not keep or flds[n]["sticky"]: if not keep or flds[n]["sticky"]:
note.fields[n] = oldNote.fields[n] note.fields[n] = oldNote.fields[n]
self.setAndFocusNote(note) self.setAndFocusNote(note)
def removeTempNote(self, note: Note) -> None: def removeTempNote(self, note: Note) -> None:
if not note or not note.id: print("removeTempNote() will go away")
return
# we don't have to worry about cards; just the note
self.mw.col._remNotes([note.id])
def addHistory(self, note): def addHistory(self, note):
self.history.insert(0, note.id) self.history.insert(0, note.id)
@ -211,7 +205,6 @@ class AddCards(QDialog):
gui_hooks.state_did_reset.remove(self.onReset) gui_hooks.state_did_reset.remove(self.onReset)
gui_hooks.current_note_type_did_change.remove(self.onModelChange) gui_hooks.current_note_type_did_change.remove(self.onModelChange)
av_player.stop_and_clear_queue() av_player.stop_and_clear_queue()
self.removeTempNote(self.editor.note)
self.editor.cleanup() self.editor.cleanup()
self.modelChooser.cleanup() self.modelChooser.cleanup()
self.deckChooser.cleanup() self.deckChooser.cleanup()