mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
marking & suspending
This commit is contained in:
parent
fe17266b8d
commit
2245be962a
1 changed files with 16 additions and 30 deletions
|
@ -25,6 +25,8 @@ COLOUR_INACTIVE2 = "#ffaaaa"
|
||||||
COLOUR_MARKED1 = "#ccccff"
|
COLOUR_MARKED1 = "#ccccff"
|
||||||
COLOUR_MARKED2 = "#aaaaff"
|
COLOUR_MARKED2 = "#aaaaff"
|
||||||
|
|
||||||
|
# fixme: need to refresh after undo
|
||||||
|
|
||||||
# Data model
|
# Data model
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|
||||||
|
@ -108,6 +110,10 @@ class DeckModel(QAbstractTableModel):
|
||||||
if reset:
|
if reset:
|
||||||
self.endReset()
|
self.endReset()
|
||||||
|
|
||||||
|
def reset(self):
|
||||||
|
self.beginReset()
|
||||||
|
self.endReset()
|
||||||
|
|
||||||
def beginReset(self):
|
def beginReset(self):
|
||||||
self.browser.editor.saveNow()
|
self.browser.editor.saveNow()
|
||||||
self.browser.mw.progress.start()
|
self.browser.mw.progress.start()
|
||||||
|
@ -745,12 +751,13 @@ where id in %s""" % ids2str(
|
||||||
r = True
|
r = True
|
||||||
if not r:
|
if not r:
|
||||||
return
|
return
|
||||||
if label is None:
|
|
||||||
label = _("Add Tags")
|
|
||||||
if func is None:
|
if func is None:
|
||||||
func = self.deck.addTags
|
func = self.deck.addTags
|
||||||
self.model.beginReset()
|
self.model.beginReset()
|
||||||
self.mw.checkpoint(label)
|
if label is None:
|
||||||
|
label = _("Add Tags")
|
||||||
|
if label:
|
||||||
|
self.mw.checkpoint(label)
|
||||||
func(self.selectedFacts(), tags)
|
func(self.selectedFacts(), tags)
|
||||||
self.onSearch(reset=False)
|
self.onSearch(reset=False)
|
||||||
self.resetDeck()
|
self.resetDeck()
|
||||||
|
@ -770,31 +777,16 @@ where id in %s""" % ids2str(
|
||||||
self.form.actionToggleMark.setChecked(self.isMarked())
|
self.form.actionToggleMark.setChecked(self.isMarked())
|
||||||
|
|
||||||
def isSuspended(self):
|
def isSuspended(self):
|
||||||
return self.card and self.card.type < 0
|
return self.card and self.card.queue == -1
|
||||||
|
|
||||||
def onSuspend(self, sus):
|
def onSuspend(self, sus):
|
||||||
# focus lost hook may not have chance to fire
|
# focus lost hook may not have chance to fire
|
||||||
self.editor.saveNow()
|
self.editor.saveNow()
|
||||||
|
c = self.selectedCards()
|
||||||
if sus:
|
if sus:
|
||||||
self._onSuspend()
|
self.deck.sched.suspendCards(c)
|
||||||
else:
|
else:
|
||||||
self._onUnsuspend()
|
self.deck.sched.unsuspendCards(c)
|
||||||
|
|
||||||
def _onSuspend(self):
|
|
||||||
n = _("Suspend")
|
|
||||||
self.deck.setUndoStart(n)
|
|
||||||
self.deck.suspendCards(self.selectedCards())
|
|
||||||
self.mw.reset()
|
|
||||||
self.deck.setUndoEnd(n)
|
|
||||||
self.model.reset()
|
|
||||||
self.resetDeck()
|
|
||||||
|
|
||||||
def _onUnsuspend(self):
|
|
||||||
n = _("Unsuspend")
|
|
||||||
self.deck.setUndoStart(n)
|
|
||||||
self.deck.unsuspendCards(self.selectedCards())
|
|
||||||
self.mw.reset()
|
|
||||||
self.deck.setUndoEnd(n)
|
|
||||||
self.model.reset()
|
self.model.reset()
|
||||||
self.resetDeck()
|
self.resetDeck()
|
||||||
|
|
||||||
|
@ -803,15 +795,9 @@ where id in %s""" % ids2str(
|
||||||
|
|
||||||
def onMark(self, mark):
|
def onMark(self, mark):
|
||||||
if mark:
|
if mark:
|
||||||
self._onMark()
|
self.addTags(tags="Marked", label=False)
|
||||||
else:
|
else:
|
||||||
self._onUnmark()
|
self.deleteTags(tags="Marked", label=False)
|
||||||
|
|
||||||
def _onMark(self):
|
|
||||||
self.addTags(tags="Marked", label=_("Toggle Mark"))
|
|
||||||
|
|
||||||
def _onUnmark(self):
|
|
||||||
self.deleteTags(tags="Marked", label=_("Toggle Mark"))
|
|
||||||
|
|
||||||
# Rescheduling
|
# Rescheduling
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
Loading…
Reference in a new issue