mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 22:12:21 -04:00
reenable change note type
This commit is contained in:
parent
b2d31fe780
commit
553cdb4fc2
2 changed files with 10 additions and 12 deletions
|
@ -857,9 +857,6 @@ where id in %s""" % ids2str(sf))
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
def onChangeModel(self):
|
def onChangeModel(self):
|
||||||
return showInfo("not yet implemented")
|
|
||||||
# given implicit card generation now, we need to fix model changing:
|
|
||||||
# need to generate any unmapped cards
|
|
||||||
nids = self.oneModelNotes()
|
nids = self.oneModelNotes()
|
||||||
if nids:
|
if nids:
|
||||||
ChangeModel(self, nids)
|
ChangeModel(self, nids)
|
||||||
|
@ -1276,7 +1273,9 @@ class ChangeModel(QDialog):
|
||||||
self.form.templateMap.setLayout(self.tlayout)
|
self.form.templateMap.setLayout(self.tlayout)
|
||||||
# model chooser
|
# model chooser
|
||||||
import aqt.modelchooser
|
import aqt.modelchooser
|
||||||
self.oldModel = self.browser.col.models.current()
|
self.oldModel = self.browser.col.models.get(
|
||||||
|
self.browser.col.db.scalar(
|
||||||
|
"select mid from notes where id = ?", self.nids[0]))
|
||||||
self.form.oldModelLabel.setText(self.oldModel['name'])
|
self.form.oldModelLabel.setText(self.oldModel['name'])
|
||||||
self.modelChooser = aqt.modelchooser.ModelChooser(
|
self.modelChooser = aqt.modelchooser.ModelChooser(
|
||||||
self.browser.mw, self.form.modelChooserWidget, label=False)
|
self.browser.mw, self.form.modelChooserWidget, label=False)
|
||||||
|
@ -1285,10 +1284,9 @@ class ChangeModel(QDialog):
|
||||||
self.onHelp)
|
self.onHelp)
|
||||||
self.modelChanged(self.oldModel)
|
self.modelChanged(self.oldModel)
|
||||||
self.pauseUpdate = False
|
self.pauseUpdate = False
|
||||||
print "make sure we start with the model's old model"
|
|
||||||
|
|
||||||
def onReset(self):
|
def onReset(self):
|
||||||
self.modelChanged(self.browser.col.currentModel())
|
self.modelChanged(self.browser.col.models.current())
|
||||||
|
|
||||||
def modelChanged(self, model):
|
def modelChanged(self, model):
|
||||||
self.targetModel = model
|
self.targetModel = model
|
||||||
|
@ -1391,11 +1389,11 @@ class ChangeModel(QDialog):
|
||||||
cmap = self.getTemplateMap()
|
cmap = self.getTemplateMap()
|
||||||
if any(True for c in cmap.values() if c is None):
|
if any(True for c in cmap.values() if c is None):
|
||||||
if not askUser(_("""\
|
if not askUser(_("""\
|
||||||
Any cards with templates mapped to nothing will be deleted. \
|
Any cards mapped to nothing will be deleted. \
|
||||||
If a note has no remaining cards, it will be lost. \
|
If a note has no remaining cards, it will be lost. \
|
||||||
Are you sure you want to continue?""")):
|
Are you sure you want to continue?""")):
|
||||||
return
|
return
|
||||||
self.browser.mw.checkpoint(_("Change Model"))
|
self.browser.mw.checkpoint(_("Change Note Type"))
|
||||||
b = self.browser
|
b = self.browser
|
||||||
b.mw.progress.start()
|
b.mw.progress.start()
|
||||||
b.model.beginReset()
|
b.model.beginReset()
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Change Model</string>
|
<string>Change Note Type</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label_6">
|
<widget class="QLabel" name="label_6">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><b>Old Model</b>:</string>
|
<string>Current note type:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><b>New Model</b>:</string>
|
<string>New note type:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -73,7 +73,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Templates</string>
|
<string>Cards</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<property name="margin">
|
<property name="margin">
|
||||||
|
|
Loading…
Reference in a new issue