diff --git a/aqt/editor.py b/aqt/editor.py
index 5eb2b2114..dd2731b63 100644
--- a/aqt/editor.py
+++ b/aqt/editor.py
@@ -536,14 +536,9 @@ class Editor(object):
def onCloze(self):
# check that the model is set up for cloze deletion
- ok = False
- for t in self.note.model().templates:
- if "cloze" in t['qfmt'] or "cloze" in t['afmt']:
- ok = True
- break
- if not ok:
- showInfo(_("Please use a cloze deletion model."),
- help="ClozeDeletion")
+ if 'cloze' not in self.note.model()['tmpls'][0]['qfmt']:
+ showInfo(_("Please select the cloze deletion note type first."),
+ help="ClozeDeletion")
return
f = self.note.fields[self.currentField]
# find the highest existing cloze
diff --git a/aqt/modelchooser.py b/aqt/modelchooser.py
index 54bd9f1ab..e16ce60ba 100644
--- a/aqt/modelchooser.py
+++ b/aqt/modelchooser.py
@@ -74,7 +74,7 @@ class ModelChooser(QHBoxLayout):
def onModelChange(self, idx):
model = self._models[idx]
- self.deck.conf['curModel'] = model.id
+ self.deck.conf['curModel'] = model['id']
self._ignoreReset = True
runHook("currentModelChanged")
self._ignoreReset = False
diff --git a/aqt/models.py b/aqt/models.py
index 901731dcb..88b0872ec 100644
--- a/aqt/models.py
+++ b/aqt/models.py
@@ -93,7 +93,6 @@ class Models(QDialog):
d = QDialog(self)
frm = aqt.forms.modelopts.Ui_Dialog()
frm.setupUi(d)
- frm.clozeCtx.setChecked(self.model['clozectx'])
frm.latexHeader.setText(self.model['latexPre'])
frm.latexFooter.setText(self.model['latexPost'])
d.setWindowTitle(_("Options for %s") % self.model['name'])
@@ -101,7 +100,6 @@ class Models(QDialog):
frm.buttonBox, SIGNAL("helpRequested()"),
lambda: openHelp("NoteOptions"))
d.exec_()
- self.model['clozectx'] = frm.clozeCtx.isChecked()
self.model['latexPre'] = unicode(frm.latexHeader.toPlainText())
self.model['latexPost'] = unicode(frm.latexFooter.toPlainText())
diff --git a/designer/clayout.ui b/designer/clayout.ui
deleted file mode 100644
index 2969298ca..000000000
--- a/designer/clayout.ui
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
- Dialog
-
-
-
- 0
- 0
- 1311
- 658
-
-
-
-
-
-
-
-
- 20
- 120
- 360
- 366
-
-
-
-
- 6
-
- -
-
-
-
- 2
- 0
-
-
-
-
- 50
- 0
-
-
-
- Qt::ScrollBarAlwaysOff
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 0
-
-
-
- Qt::ScrollBarAlwaysOff
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
-
-
- Question
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
- true
-
-
-
- -
-
-
- Answer
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
- true
-
-
-
-
-
-
-
-
-
-
- 20
- 500
- 366
- 26
-
-
-
-
-
-
- 20
- 540
- 371
- 20
-
-
-
- Include context in cloze answers
-
-
-
-
-
- 450
- 90
- 308
- 499
-
-
-
-
- 1
- 0
-
-
-
- Qt::NoFocus
-
-
-
- about:blank
-
-
-
-
-
-
- QWebView
- QWidget
-
-
-
-
- cardQuestion
- cardAnswer
-
-
-
-
-
-
diff --git a/designer/modelopts.ui b/designer/modelopts.ui
index 6f5c30095..f1d3ede49 100644
--- a/designer/modelopts.ui
+++ b/designer/modelopts.ui
@@ -22,33 +22,6 @@
0
-
-
- Basic
-
-
- -
-
-
- Show context in cloze answers
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 184
-
-
-
-
-
-
LaTeX