GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-09 14:17:13 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

don't save the deck in add mode until the note is being added

Browse source
This commit is contained in:
Damien Elmes 2012-04-22 07:12:52 +09:00
parent 55256d0f39
commit 083caafd95
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aqt/addcards.py
View file

@ -143,6 +143,7 @@ question on all cards."""), help="AddItems")
def addCards(self): def addCards(self):
self.editor.saveNow() self.editor.saveNow()
self.editor.saveAddModeVars()
note = self.editor.note note = self.editor.note
note = self.addNote(note) note = self.addNote(note)
if not note: if not note:

20
aqt/editor.py
View file

@ -534,7 +534,7 @@ class Editor(object):
self._keepButtons = True self._keepButtons = True
self.web.eval("saveField('blur');") self.web.eval("saveField('blur');")
self._keepButtons = False self._keepButtons = False
self.saveTagsAndDeck() self.saveTags()
def checkValid(self): def checkValid(self):
cols = [] cols = []
@ -603,7 +603,7 @@ class Editor(object):
tb.addWidget(l, 0, 0) tb.addWidget(l, 0, 0)
self.deck = aqt.tagedit.TagEdit(self.widget, type=1) self.deck = aqt.tagedit.TagEdit(self.widget, type=1)
self.deck.connect(self.deck, SIGNAL("lostFocus"), self.deck.connect(self.deck, SIGNAL("lostFocus"),
self.saveTagsAndDeck) self.saveTags)
tb.addWidget(self.deck, 0, 1) tb.addWidget(self.deck, 0, 1)
else: else:
self.deck = None self.deck = None
@ -612,7 +612,7 @@ class Editor(object):
tb.addWidget(l, 1, 0) tb.addWidget(l, 1, 0)
self.tags = aqt.tagedit.TagEdit(self.widget) self.tags = aqt.tagedit.TagEdit(self.widget)
self.tags.connect(self.tags, SIGNAL("lostFocus"), self.tags.connect(self.tags, SIGNAL("lostFocus"),
self.saveTagsAndDeck) self.saveTags)
tb.addWidget(self.tags, 1, 1) tb.addWidget(self.tags, 1, 1)
g.setLayout(tb) g.setLayout(tb)
self.outerLayout.addWidget(g) self.outerLayout.addWidget(g)
@ -623,14 +623,21 @@ class Editor(object):
self.deck.setCol(self.mw.col) self.deck.setCol(self.mw.col)
self.tags.setCol(self.mw.col) self.tags.setCol(self.mw.col)
if self.addMode: if self.addMode:
self.deck.setText(self.mw.col.decks.name(self.note.model()['did'])) self.deck.setText(self.mw.col.decks.nameOrNone(
self.note.model()['did']) or _("Default"))
self.tags.setText(self.note.stringTags().strip()) self.tags.setText(self.note.stringTags().strip())
def saveTagsAndDeck(self): def saveTags(self):
if not self.note: if not self.note:
return return
self.note.tags = self.mw.col.tags.split(self.tags.text()) self.note.tags = self.mw.col.tags.split(self.tags.text())
if not self.addMode:
self.note.flush()
runHook("tagsUpdated", self.note)
def saveAddModeVars(self):
if self.addMode: if self.addMode:
# save deck name
name = self.deck.text() name = self.deck.text()
if not name.strip(): if not name.strip():
self.note.model()['did'] = 1 self.note.model()['did'] = 1
@ -640,9 +647,6 @@ class Editor(object):
m = self.note.model() m = self.note.model()
m['tags'] = self.note.tags m['tags'] = self.note.tags
self.mw.col.models.save(m) self.mw.col.models.save(m)
if not self.addMode:
self.note.flush()
runHook("tagsUpdated", self.note)
def hideCompleters(self): def hideCompleters(self):
self.tags.hideCompleter() self.tags.hideCompleter()