diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index e32db6e70..5f9e5dabe 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -33,7 +33,7 @@ CARD_MODIFIED = 7
CARD_INTERVAL = 8
CARD_EASE = 9
CARD_NO = 10
-CARD_PRIORITY = 11
+CARD_TYPE = 11
CARD_TAGS = 12
CARD_FACTCREATED = 13
CARD_FIRSTANSWERED = 14
@@ -191,7 +191,7 @@ where cards.factId = facts.id """
try:
self.cards[index.row()] = self.deck.s.first("""
select id, question, answer, combinedDue, reps, factId, created, modified,
-interval, factor, noCount, priority, (select tags from facts where
+interval, factor, noCount, type, (select tags from facts where
facts.id = cards.factId), (select created from facts where
facts.id = cards.factId), firstAnswered from cards where id = :id""",
id=self.cards[index.row()][0])
@@ -322,7 +322,7 @@ class StatusDelegate(QItemDelegate):
if len(self.model.cards[index.row()]) == 1:
self.model.updateCard(index)
row = self.model.cards[index.row()]
- if row[CARD_PRIORITY] == -3:
+ if row[CARD_TYPE] < 0:
# custom render
if index.row() % 2 == 0:
brush = QBrush(QColor(COLOUR_SUSPENDED1))
@@ -974,7 +974,6 @@ where id in %s""" % ids2str(sf))
if c % 50 == 0:
self.deck.updateProgress()
self.deck.flushMod()
- self.deck.updatePriorities(ids)
self.deck.finishProgress()
self.parent.setProgressParent(None)
self.deck.setUndoEnd(n)
diff --git a/ankiqt/ui/deckproperties.py b/ankiqt/ui/deckproperties.py
index 2a1ec89dc..31580c740 100644
--- a/ankiqt/ui/deckproperties.py
+++ b/ankiqt/ui/deckproperties.py
@@ -39,10 +39,6 @@ class DeckProperties(QDialog):
else:
self.dialog.doSync.setCheckState(Qt.Unchecked)
self.dialog.mediaURL.setText(self.d.getVar("mediaURL") or "")
- # priorities
- self.dialog.highPriority.setText(self.d.highPriority)
- self.dialog.medPriority.setText(self.d.medPriority)
- self.dialog.lowPriority.setText(self.d.lowPriority)
# latex
self.dialog.latexHeader.setText(self.d.getVar("latexPre"))
self.dialog.latexFooter.setText(self.d.getVar("latexPost"))
@@ -232,20 +228,8 @@ class DeckProperties(QDialog):
self.dialog.collapse.isChecked() and 1 or 0)
if self.dialog.perDay.isChecked() != self.d.getBool("perDay"):
self.d.setVar('perDay', self.dialog.perDay.isChecked())
- self.updateField(self.d,
- "highPriority",
- unicode(self.dialog.highPriority.text()))
- self.updateField(self.d,
- "medPriority",
- unicode(self.dialog.medPriority.text()))
- self.updateField(self.d,
- "lowPriority",
- unicode(self.dialog.lowPriority.text()))
- prioritiesChanged = was != self.d.modified
# mark deck dirty and close
if self.origMod != self.d.modified:
- if prioritiesChanged:
- self.d.updateAllPriorities()
ankiqt.mw.deck.updateCutoff()
ankiqt.mw.reset()
self.d.setUndoEnd(n)
diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index 5557e823c..73256e824 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -585,7 +585,6 @@ class FactEditor(object):
if old != self.fact.tags:
self.deck.s.flush()
self.deck.updateFactTags([self.fact.id])
- self.deck.updatePriorities([c.id for c in self.fact.cards])
self.fact.setModified(textChanged=True, deck=self.deck)
self.deck.flushMod()
if self.resetOnEdit:
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 3f2089aa6..74106c85c 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -307,11 +307,9 @@ Please do not file a bug report with Anki.
""")
self.views = self.viewsBackup
self.viewsBackup = None
- def reset(self, count=True, priorities=False, runHooks=True):
+ def reset(self, runHooks=True):
if self.deck:
self.deck.refreshSession()
- if priorities:
- self.deck.updateAllPriorities()
self.deck.reset()
if runHooks:
runHook("guiReset")
@@ -518,7 +516,7 @@ Please do not file a bug report with Anki.
""")
% stripHTML(stripSounds(self.currentCard.question)).\
replace("\n", " ")[0:30])
if isLeech and self.deck.s.scalar(
- "select 1 from cards where id = :id and priority < 1", id=cardId):
+ "select 1 from cards where id = :id and type < 0", id=cardId):
txt += _(" It has been suspended.")
self.setNotice(txt)
diff --git a/designer/deckproperties.ui b/designer/deckproperties.ui
index 477468cb3..01a4cae15 100644
--- a/designer/deckproperties.ui
+++ b/designer/deckproperties.ui
@@ -30,69 +30,6 @@
Basic
- -
-
-
- <b>Priorities</b>
-
-
-
- -
-
-
-
-
-
- Very high priority
-
-
- true
-
-
-
- -
-
-
- -
-
-
- High priority
-
-
- true
-
-
-
- -
-
-
- -
-
-
- Low priority
-
-
- true
-
-
-
- -
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -794,9 +731,6 @@
modelsAdd
modelsEdit
modelsDelete
- highPriority
- medPriority
- lowPriority
buttonBox
latexHeader
latexFooter
diff --git a/designer/main.ui b/designer/main.ui
index ce969c7a0..aadca3482 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -3366,7 +3366,7 @@
&Deck Properties...
- Customize syncing, scheduling, priorities and models
+ Customize models, syncing and scheduling