remove win32 importing hack, require target deck to be on disk

This commit is contained in:
Damien Elmes 2010-10-02 14:41:50 +09:00
parent 39ed7ff44e
commit 1365557930
2 changed files with 7 additions and 4 deletions

View file

@ -194,9 +194,6 @@ you can enter it here. Use \\t to represent tab."""),
self.file = None self.file = None
self.maybePreview() self.maybePreview()
self.parent.deck.s.flush() self.parent.deck.s.flush()
if sys.platform.startswith("win32") and not self.parent.deck.path:
# this fixes a strange bug in sqlite
self.parent.deck.s.all("pragma integrity_check")
self.parent.reset() self.parent.reset()
self.modelChooser.deinit() self.modelChooser.deinit()

View file

@ -1897,7 +1897,13 @@ You are currently cramming. Please close this deck first."""))
return return
if self.deck is None: if self.deck is None:
self.onNew() self.onNew()
ui.importing.ImportDialog(self) if not self.deck.path:
self.showToolTip(_("""\
Please choose a name for this deck. After saving, the importing \
window will open."""))
self.onSaveAs()
if self.deck.path:
ui.importing.ImportDialog(self)
def onExport(self): def onExport(self):
ui.exporting.ExportDialog(self) ui.exporting.ExportDialog(self)