change timebox calls & repsToday for libanki

This commit is contained in:
Damien Elmes 2011-02-19 12:52:48 +09:00
parent ae3db3c255
commit 0080a8ffc1

View file

@ -364,10 +364,10 @@ Please do not file a bug report with Anki.<br>""")
else: else:
# timeboxing only supported using the standard scheduler # timeboxing only supported using the standard scheduler
if not self.deck.finishScheduler: if not self.deck.finishScheduler:
if (self.config['showStudyScreen'] and if self.config['showStudyScreen']:
not self.deck.sessionStartTime): if not self.deck.timeboxStarted():
return self.moveToState("studyScreen") return self.moveToState("studyScreen")
if self.deck.sessionLimitReached(): elif self.deck.timeboxReached():
self.showToolTip(_("Session limit reached.")) self.showToolTip(_("Session limit reached."))
self.moveToState("studyScreen") self.moveToState("studyScreen")
# switch to timeboxing screen # switch to timeboxing screen
@ -502,8 +502,7 @@ Please do not file a bug report with Anki.<br>""")
self.currentCard = None self.currentCard = None
if self.config['saveAfterAnswer']: if self.config['saveAfterAnswer']:
num = self.config['saveAfterAnswerNum'] num = self.config['saveAfterAnswerNum']
stats = self.deck.getStats() if self.deck.repsToday % num == 0:
if stats['gTotal'] % num == 0:
self.save() self.save()
self.moveToState("getQuestion") self.moveToState("getQuestion")
@ -1657,7 +1656,7 @@ not be touched.""") %
self.mainWin.buttonStack.hide() self.mainWin.buttonStack.hide()
self.deck.reset() self.deck.reset()
self.updateActives() self.updateActives()
wasReached = self.deck.sessionLimitReached() wasReached = self.deck.timeboxReached()
sessionColour = '<font color=#0000ff>%s</font>' sessionColour = '<font color=#0000ff>%s</font>'
cardColour = '<font color=#0000ff>%s</font>' cardColour = '<font color=#0000ff>%s</font>'
# top label # top label
@ -1802,7 +1801,7 @@ learnt today")
self.deck.flushMod() self.deck.flushMod()
self.deck.reset() self.deck.reset()
if not self.deck.finishScheduler: if not self.deck.finishScheduler:
self.deck.startSession() self.deck.startTimebox()
self.config['studyOptionsScreen'] = self.mainWin.tabWidget.currentIndex() self.config['studyOptionsScreen'] = self.mainWin.tabWidget.currentIndex()
self.moveToState("getQuestion") self.moveToState("getQuestion")