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

Switch to using aqt.dialogs for AddCardsAndClose

Browse Source
This commit is contained in:
Henrik Giesel 2019-01-18 00:40:16 +01:00
parent 4987ea34d5
commit 49d6862538
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
AnkiConnect.py
View File

@ -1030,6 +1030,12 @@ class AnkiConnect:
if note is not None: if note is not None:
collection = self.collection() collection = self.collection()
deck = collection.decks.byName(note['deckName'])
if deck is None:
raise Exception('deck was not found: {}'.format(note['deckName']))
self.collection().decks.select(deck['id'])
model = collection.models.byName(note['modelName']) model = collection.models.byName(note['modelName'])
if model is None: if model is None:
raise Exception('model was not found: {}'.format(note['modelName'])) raise Exception('model was not found: {}'.format(note['modelName']))
@ -1037,11 +1043,6 @@ class AnkiConnect:
self.collection().models.setCurrent(model) self.collection().models.setCurrent(model)
self.collection().models.update(model) self.collection().models.update(model)
deck = collection.decks.byName(note['deckName'])
if deck is None:
raise Exception('deck was not found: {}'.format(note['deckName']))
self.collection().decks.select(deck['id'])
addAndClose = False addAndClose = False
if note is not None and 'options' in note: if note is not None and 'options' in note:
@ -1057,10 +1058,6 @@ class AnkiConnect:
def __init__(self, mw): def __init__(self, mw):
super().__init__(mw) super().__init__(mw)
self.addButton.setText("Add and Close") self.addButton.setText("Add and Close")
self.addButton.setShortcut(aqt.qt.QKeySequence("Ctrl+Return"))
# kind of a hack:
# if Anki closes while thise window is open, close it silently
self.silentlyClose = True
def _addCards(self): def _addCards(self):
self.editor.saveAddModeVars() self.editor.saveAddModeVars()
@ -1075,7 +1072,21 @@ class AnkiConnect:
self.mw.col.autosave() self.mw.col.autosave()
self.reject() self.reject()
addCards = AddCardsAndClose(self.window()) def _reject(self):
anki.hooks.remHook('reset', self.onReset)
anki.hooks.remHook('currentModelChanged', self.onModelChange)
anki.sound.clearAudioQueue()
self.removeTempNote(self.editor.note)
self.editor.cleanup()
self.modelChooser.cleanup()
self.deckChooser.cleanup()
self.mw.maybeReset()
aqt.utils.saveGeom(self, "add")
aqt.dialogs.markClosed("AddCardsAndClose")
aqt.qt.QDialog.reject(self)
aqt.dialogs._dialogs['AddCardsAndClose'] = [AddCardsAndClose, None]
addCards = aqt.dialogs.open('AddCardsAndClose', self.window())
else: else:
addCards = aqt.dialogs.open('AddCards', self.window()) addCards = aqt.dialogs.open('AddCards', self.window())
@ -1084,13 +1095,14 @@ class AnkiConnect:
editor = addCards.editor editor = addCards.editor
ankiNote = editor.note ankiNote = editor.note
if note is not None and 'fields' in note: if note is not None:
if 'fields' in note:
for name, value in note['fields'].items(): for name, value in note['fields'].items():
if name in ankiNote: if name in ankiNote:
ankiNote[name] = value ankiNote[name] = value
editor.loadNote() editor.loadNote()
if note is not None and 'tags' in note: if 'tags' in note:
ankiNote.tags = note['tags'] ankiNote.tags = note['tags']
editor.updateTags() editor.updateTags()