From 553cdb4fc2e768e96bf1dbed6dbc90ef9dc32255 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Tue, 20 Mar 2012 02:57:44 +0900
Subject: [PATCH] reenable change note type

---
 aqt/browser.py          | 14 ++++++--------
 designer/changemodel.ui |  8 ++++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index 4ee6279f2..7b734a4bc 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -857,9 +857,6 @@ where id in %s""" % ids2str(sf))
     ######################################################################
 
     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()
         if nids:
             ChangeModel(self, nids)
@@ -1276,7 +1273,9 @@ class ChangeModel(QDialog):
         self.form.templateMap.setLayout(self.tlayout)
         # model chooser
         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.modelChooser = aqt.modelchooser.ModelChooser(
             self.browser.mw, self.form.modelChooserWidget, label=False)
@@ -1285,10 +1284,9 @@ class ChangeModel(QDialog):
                      self.onHelp)
         self.modelChanged(self.oldModel)
         self.pauseUpdate = False
-        print "make sure we start with the model's old model"
 
     def onReset(self):
-        self.modelChanged(self.browser.col.currentModel())
+        self.modelChanged(self.browser.col.models.current())
 
     def modelChanged(self, model):
         self.targetModel = model
@@ -1391,11 +1389,11 @@ class ChangeModel(QDialog):
         cmap = self.getTemplateMap()
         if any(True for c in cmap.values() if c is None):
             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. \
 Are you sure you want to continue?""")):
                 return
-        self.browser.mw.checkpoint(_("Change Model"))
+        self.browser.mw.checkpoint(_("Change Note Type"))
         b = self.browser
         b.mw.progress.start()
         b.model.beginReset()
diff --git a/designer/changemodel.ui b/designer/changemodel.ui
index 3b497d691..80f54ca5e 100644
--- a/designer/changemodel.ui
+++ b/designer/changemodel.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Change Model</string>
+   <string>Change Note Type</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -25,7 +25,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
-        <string>&lt;b&gt;Old Model&lt;/b&gt;:</string>
+        <string>Current note type:</string>
        </property>
       </widget>
      </item>
@@ -48,7 +48,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>&lt;b&gt;New Model&lt;/b&gt;:</string>
+        <string>New note type:</string>
        </property>
       </widget>
      </item>
@@ -73,7 +73,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Templates</string>
+      <string>Cards</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="margin">