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

init undo on new deck, add importing

Browse source
This commit is contained in:
Damien Elmes 2008-11-30 05:56:24 +09:00
parent 44e788dd9c
commit 1dca4f73be
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ankiqt/ui/importing.py
View file

@ -114,16 +114,21 @@ class ImportDialog(QDialog):
self.importer.tagsToAdd = unicode(self.dialog.tags.text()) self.importer.tagsToAdd = unicode(self.dialog.tags.text())
self.importer.tagDuplicates = self.dialog.tagDuplicates.isChecked() self.importer.tagDuplicates = self.dialog.tagDuplicates.isChecked()
try: try:
self.importer.doImport() n = _("Import")
except ImportFormatError, e: self.parent.deck.setUndoStart(n)
msg = _("Importing failed.\n") try:
msg += e.data['info'] self.importer.doImport()
self.dialog.status.setText(msg) except ImportFormatError, e:
return msg = _("Importing failed.\n")
except DeckWrongFormatError, e: msg += e.data['info']
msg = _("Import failed: %s") % `e.data` self.dialog.status.setText(msg)
self.dialog.status.setText(msg) return
return except DeckWrongFormatError, e:
msg = _("Import failed: %s") % `e.data`
self.dialog.status.setText(msg)
return
finally:
self.parent.deck.setUndoEnd(n)
txt = ( txt = (
_("Importing complete. %(num)d cards imported from %(file)s.\n") % _("Importing complete. %(num)d cards imported from %(file)s.\n") %
{"num": self.importer.total, "file": os.path.basename(self.file)}) {"num": self.importer.total, "file": os.path.basename(self.file)})

1
ankiqt/ui/main.py
View file

@ -618,6 +618,7 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
def onNew(self): def onNew(self):
if not self.saveAndClose(hideWelcome=True): return if not self.saveAndClose(hideWelcome=True): return
self.deck = DeckStorage.Deck() self.deck = DeckStorage.Deck()
self.deck.initUndo()
self.deck.addModel(BasicModel()) self.deck.addModel(BasicModel())
self.saveDeck() self.saveDeck()
self.updateRecentFiles(self.deck.path) self.updateRecentFiles(self.deck.path)