diff --git a/ankiqt/ui/modelproperties.py b/ankiqt/ui/modelproperties.py
index 88c820c36..126c6214b 100644
--- a/ankiqt/ui/modelproperties.py
+++ b/ankiqt/ui/modelproperties.py
@@ -38,9 +38,7 @@ class ModelProperties(QDialog):
def readData(self):
# properties section
self.dialog.name.setText(self.m.name)
- self.dialog.description.setText(self.m.description)
self.dialog.tags.setText(self.m.tags)
- self.dialog.decorators.setText(self.m.features)
self.dialog.spacing.setText(str(self.m.spacing))
self.dialog.initialSpacing.setText(str(self.m.initialSpacing/60))
@@ -109,10 +107,8 @@ class ModelProperties(QDialog):
self.currentField = self.m.fieldModels[self.dialog.fieldList.currentRow()]
field = self.currentField
self.dialog.fieldName.setText(field.name)
- self.dialog.fieldDescription.setText(field.description)
self.dialog.fieldUnique.setChecked(field.unique)
self.dialog.fieldRequired.setChecked(field.required)
- self.dialog.fieldFeatures.setText(field.features)
self.dialog.numeric.setChecked(field.numeric)
def enableFieldMoveButtons(self):
@@ -138,10 +134,6 @@ class ModelProperties(QDialog):
self.deck.renameFieldModel(self.m, field, name)
# the card models will have been updated
self.readCurrentCard()
- self.updateField(field, 'description',
- unicode(self.dialog.fieldDescription.toPlainText()))
- self.updateField(field, 'features',
- unicode(self.dialog.fieldFeatures.text()))
# unique, required, numeric
self.updateField(field, 'unique',
self.dialog.fieldUnique.checkState() == Qt.Checked)
@@ -296,7 +288,6 @@ class ModelProperties(QDialog):
self.currentCard = self.m.cardModels[self.dialog.cardList.currentRow()]
card = self.currentCard
self.dialog.cardName.setText(card.name)
- self.dialog.cardDescription.setText(card.description)
self.dialog.cardQuestion.setPlainText(card.qformat.replace("
", "\n"))
self.dialog.cardAnswer.setPlainText(card.aformat.replace("
", "\n"))
if card.questionInAnswer:
@@ -330,8 +321,6 @@ class ModelProperties(QDialog):
if not newname:
newname = _("Card %d") % (self.m.cardModels.index(card) + 1)
self.updateField(card, 'name', newname)
- self.updateField(card, 'description', unicode(
- self.dialog.cardDescription.toPlainText()))
s = unicode(self.dialog.cardQuestion.toPlainText())
s = s.replace("\n", "
")
changed = self.updateField(card, 'qformat', s)
@@ -460,12 +449,8 @@ class ModelProperties(QDialog):
if not mname:
mname = _("Model")
self.updateField(self.m, 'name', mname)
- self.updateField(self.m, 'description',
- unicode(self.dialog.description.toPlainText()))
self.updateField(self.m, 'tags',
unicode(self.dialog.tags.text()))
- self.updateField(self.m, 'features',
- unicode(self.dialog.decorators.text()))
try:
self.updateField(self.m, 'spacing',
float(self.dialog.spacing.text()))
diff --git a/designer/deckproperties.ui b/designer/deckproperties.ui
index fc78799e2..66bbaff55 100644
--- a/designer/deckproperties.ui
+++ b/designer/deckproperties.ui
@@ -8,8 +8,8 @@
0
0
- 389
- 437
+ 394
+ 430
@@ -29,8 +29,8 @@
0
0
- 373
- 371
+ 378
+ 364
@@ -77,36 +77,6 @@
- -
-
-
- <b>Maximum failed cards</b>
-
-
- true
-
-
-
- -
-
-
- -
-
-
- <b>Show failed cards early</b>
-
-
- true
-
-
-
- -
-
-
-
-
-
-
-
@@ -124,14 +94,14 @@
-
- -
+
-
<h1>Priorities</h1>
- -
+
-
-
@@ -187,7 +157,7 @@
- -
+
-
Qt::Vertical
@@ -200,22 +170,25 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
@@ -223,8 +196,8 @@
0
0
- 373
- 371
+ 378
+ 364
@@ -343,8 +316,8 @@ p, li { white-space: pre-wrap; }
0
0
- 373
- 371
+ 378
+ 364
@@ -408,8 +381,8 @@ p, li { white-space: pre-wrap; }
0
0
- 373
- 371
+ 378
+ 364
@@ -449,8 +422,8 @@ p, li { white-space: pre-wrap; }
0
0
- 373
- 371
+ 378
+ 364
@@ -559,13 +532,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
- <b>1: Again (Young)</b>
-
-
-
-
@@ -616,25 +582,84 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ <b>1: Again (Young)</b>
+
+
+
-
-
-
- <h1>Day Rollover</h1>
+
+
+ Qt::Horizontal
-
-
-
-
-
+
+
-
+
- Hours to shift midnight
+ <b>Maximum failed cards</b>
+
+
+ true
- -
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ <b>Hours to shift midnight</b>
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ <b>Show failed cards early</b>
+
+
+ true
+
+
+
+ -
Qt::Horizontal
@@ -647,8 +672,12 @@ p, li { white-space: pre-wrap; }
- -
-
+
-
+
+
+
+
+
@@ -684,8 +713,6 @@ p, li { white-space: pre-wrap; }
qtabwidget
newCardsPerDay
- failedCardMax
- collapse
newCardOrder
newCardScheduling
revCardOrder
@@ -712,6 +739,8 @@ p, li { white-space: pre-wrap; }
midMax
easyMin
easyMax
+ collapse
+ failedCardMax
timeOffset
buttonBox
diff --git a/designer/modelproperties.ui b/designer/modelproperties.ui
index 3510cd85b..9a6f84adb 100644
--- a/designer/modelproperties.ui
+++ b/designer/modelproperties.ui
@@ -8,8 +8,8 @@
0
0
- 494
- 502
+ 428
+ 519
@@ -21,17 +21,17 @@
0
-
+
0
0
- 478
- 436
+ 412
+ 453
- General
+ Model && Fields
@@ -41,19 +41,19 @@
9
-
-
+
- <h1>General Model Properties</h1>
+ <h1>General</h1>
-
-
-
- 0
+
+
+ 12
- 6
+ 4
-
@@ -61,145 +61,89 @@
<b>Name</b>
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
- -
-
-
- <b>Description</b>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
+
-
- -
-
-
- true
-
-
-
- -
-
-
- <b>Features</b>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
-
-
<b>Tags</b>
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
true
- -
+
-
- -
-
+
-
+
- <b>Card spacing</b>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+ <b>Minimum spacing</b>
true
- -
-
-
-
-
-
- Minimum spacing
-
-
- true
-
-
-
- -
+
-
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Spacing multipler</span></p></body></html>
+
+
+ true
+
+
+
+ -
+
+
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Minimum interval multiplier
-
-
- true
-
-
-
- -
+
+
+ -
+
+
-
- -
-
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
-
-
-
-
-
- 0
- 0
- 478
- 436
-
-
-
- Fields
-
-
-
- 6
-
-
- 9
-
-
- <h1>Field Models</h1>
+ <h1>Fields</h1>
@@ -299,7 +243,7 @@
6
- -
+
-
<b>Unique?
@@ -309,7 +253,7 @@
-
- -
+
-
Prevent me from entering the same thing in this field twice
@@ -326,71 +270,28 @@
- -
-
-
- <b>Description</b>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
+
-
<b>Required?</b>
- -
+
-
Prevent new cards from being added if this field is blank
- -
-
-
- <b>Features</b>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- 0
-
-
- 0
-
-
-
-
-
-
-
- -
+
-
<b>Numeric?</b>
- -
+
-
Sort this field using numeric order instead of string order
@@ -409,8 +310,8 @@
0
0
- 478
- 436
+ 412
+ 450
@@ -426,7 +327,7 @@
-
- <h1>Card Models</h1>
+ <h1>Card Templates</h1>
@@ -521,53 +422,21 @@
6
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 60
-
-
-
- Qt::ScrollBarAlwaysOff
-
-
- true
-
-
-
- -
-
-
- <b>Description</b>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
+
-
<b>Question hiding</b>
- -
+
-
Hide the question when showing answer
- -
+
-
@@ -592,7 +461,7 @@
- -
+
-
<b>Answer format</b>
@@ -608,7 +477,7 @@
-
- -
+
-
@@ -643,7 +512,7 @@
- -
+
-
<b>Question format</b>
@@ -679,23 +548,15 @@
tabWidget
- name
- tags
- description
- initialSpacing
- spacing
- decorators
fieldList
fieldAdd
fieldUp
fieldDelete
fieldDown
fieldName
- fieldDescription
fieldUnique
fieldRequired
numeric
- fieldFeatures
cardList
cardAdd
cardUp
@@ -703,7 +564,6 @@
cardToggle
cardDelete
cardName
- cardDescription
cardQuestion
cardAnswer
questionInAnswer