restore original model after change model

This commit is contained in:
Damien Elmes 2009-06-04 06:02:51 +09:00
parent fb0a7da397
commit 4538901d1f

View file

@ -1128,6 +1128,7 @@ class ChangeModelDialog(QDialog):
def __init__(self, parent, oldModel, oldTemplate): def __init__(self, parent, oldModel, oldTemplate):
QDialog.__init__(self, parent, Qt.Window) QDialog.__init__(self, parent, Qt.Window)
self.parent = parent self.parent = parent
self.origModel = self.parent.deck.currentModel
self.oldModel = oldModel self.oldModel = oldModel
self.oldTemplate = oldTemplate self.oldTemplate = oldTemplate
self.form = ankiqt.forms.changemodel.Ui_Dialog() self.form = ankiqt.forms.changemodel.Ui_Dialog()
@ -1247,8 +1248,13 @@ class ChangeModelDialog(QDialog):
combos=self.fieldCombos, combos=self.fieldCombos,
new=self.targetModel.fieldModels) new=self.targetModel.fieldModels)
def reject(self):
self.parent.deck.currentModel = self.origModel
return QDialog.reject(self)
def accept(self): def accept(self):
saveGeom(self, "changeModel") saveGeom(self, "changeModel")
self.parent.deck.currentModel = self.origModel
# check maps # check maps
fmap = self.getFieldMap() fmap = self.getFieldMap()
cmap = self.getTemplateMap() cmap = self.getTemplateMap()