mirror of
https://github.com/ankitects/anki.git
synced 2025-09-21 23:42:23 -04:00
init undo on new deck, add importing
This commit is contained in:
parent
44e788dd9c
commit
1dca4f73be
2 changed files with 16 additions and 10 deletions
|
@ -113,6 +113,9 @@ class ImportDialog(QDialog):
|
|||
self.importer.mapping = self.mapping
|
||||
self.importer.tagsToAdd = unicode(self.dialog.tags.text())
|
||||
self.importer.tagDuplicates = self.dialog.tagDuplicates.isChecked()
|
||||
try:
|
||||
n = _("Import")
|
||||
self.parent.deck.setUndoStart(n)
|
||||
try:
|
||||
self.importer.doImport()
|
||||
except ImportFormatError, e:
|
||||
|
@ -124,6 +127,8 @@ class ImportDialog(QDialog):
|
|||
msg = _("Import failed: %s") % `e.data`
|
||||
self.dialog.status.setText(msg)
|
||||
return
|
||||
finally:
|
||||
self.parent.deck.setUndoEnd(n)
|
||||
txt = (
|
||||
_("Importing complete. %(num)d cards imported from %(file)s.\n") %
|
||||
{"num": self.importer.total, "file": os.path.basename(self.file)})
|
||||
|
|
|
@ -618,6 +618,7 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
|
|||
def onNew(self):
|
||||
if not self.saveAndClose(hideWelcome=True): return
|
||||
self.deck = DeckStorage.Deck()
|
||||
self.deck.initUndo()
|
||||
self.deck.addModel(BasicModel())
|
||||
self.saveDeck()
|
||||
self.updateRecentFiles(self.deck.path)
|
||||
|
|
Loading…
Reference in a new issue