revert import deck naming

This commit is contained in:
Damien Elmes 2012-10-28 00:04:09 +09:00
parent 811682613b
commit 2d27cb91ea

View file

@ -292,13 +292,6 @@ backup, please see the 'Backups' section of the user manual."""))
if importer.__class__.__name__ == "AnkiPackageImporter": if importer.__class__.__name__ == "AnkiPackageImporter":
if not setupApkgImport(mw, importer): if not setupApkgImport(mw, importer):
return return
def prepareImportPrefix(name):
mw.progress.finish()
new = getOnlyText(_("""\
Deck to import into (if blank, will import into current deck):"""), default=name)
mw.progress.start()
return new or mw.col.decks.current()['name']
addHook("prepareImportPrefix", prepareImportPrefix)
mw.progress.start(immediate=True) mw.progress.start(immediate=True)
try: try:
importer.run() importer.run()
@ -324,7 +317,6 @@ Unable to import from a read-only file."""))
showText(log) showText(log)
finally: finally:
mw.progress.finish() mw.progress.finish()
remHook("prepareImportPrefix", prepareImportPrefix)
mw.reset() mw.reset()
def setupApkgImport(mw, importer): def setupApkgImport(mw, importer):