rename newCount/newCountToday as per libanki

This commit is contained in:
Damien Elmes 2011-02-19 08:55:21 +09:00
parent 8201ffc544
commit ae3db3c255
2 changed files with 7 additions and 7 deletions

View file

@ -397,7 +397,7 @@ Please do not file a bug report with Anki.<br>""")
self.disableCardMenuItems() self.disableCardMenuItems()
self.switchToCongratsScreen() self.switchToCongratsScreen()
self.mainWin.learnMoreButton.setEnabled( self.mainWin.learnMoreButton.setEnabled(
not not self.deck.newCount) not not self.deck.newAvail)
self.startRefreshTimer() self.startRefreshTimer()
self.bodyView.setState(state) self.bodyView.setState(state)
# focus finish button # focus finish button
@ -547,7 +547,7 @@ counts are %d %d %d
""" % (delay, """ % (delay,
self.deck.failedSoonCount, self.deck.failedSoonCount,
self.deck.revCount, self.deck.revCount,
self.deck.newCountToday)) self.deck.newCount))
return return
t = QTimer(self) t = QTimer(self)
t.setSingleShot(True) t.setSingleShot(True)
@ -860,7 +860,7 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
for d in self.browserDecks: for d in self.browserDecks:
if d['path'] == self.deck.path: if d['path'] == self.deck.path:
d['due'] = self.deck.failedSoonCount + self.deck.revCount d['due'] = self.deck.failedSoonCount + self.deck.revCount
d['new'] = self.deck.newCountToday d['new'] = self.deck.newCount
d['mod'] = self.deck.modified d['mod'] = self.deck.modified
d['time'] = self.deck._dailyStats.reviewTime d['time'] = self.deck._dailyStats.reviewTime
d['reps'] = self.deck._dailyStats.reps d['reps'] = self.deck._dailyStats.reps
@ -1190,7 +1190,7 @@ your deck."""))
'path': d, 'path': d,
'name': deck.name(), 'name': deck.name(),
'due': deck.failedSoonCount + deck.revCount, 'due': deck.failedSoonCount + deck.revCount,
'new': deck.newCountToday, 'new': deck.newCount,
'mod': deck.modified, 'mod': deck.modified,
'time': deck._dailyStats.reviewTime, 'time': deck._dailyStats.reviewTime,
'reps': deck._dailyStats.reps, 'reps': deck._dailyStats.reps,
@ -1663,7 +1663,7 @@ not be touched.""") %
# top label # top label
h = {} h = {}
h['ret'] = cardColour % (self.deck.revCount+self.deck.failedSoonCount) h['ret'] = cardColour % (self.deck.revCount+self.deck.failedSoonCount)
h['new'] = cardColour % self.deck.newCountToday h['new'] = cardColour % self.deck.newCount
h['newof'] = str(self.deck.newCountAll()) h['newof'] = str(self.deck.newCountAll())
# counts & time for today # counts & time for today
todayStart = self.deck.failedCutoff - 86400 todayStart = self.deck.failedCutoff - 86400

View file

@ -145,9 +145,9 @@ class StatusView(object):
p = QPalette() p = QPalette()
stats = { stats = {
'failed': self.main.deck.failedSoonCount, 'failed': self.main.deck.failedSoonCount,
'new': self.main.deck.newCountToday, 'new': self.main.deck.newCount,
'rev': self.main.deck.revCount, 'rev': self.main.deck.revCount,
'new2': self.main.deck.newCount 'new2': self.main.deck.newAvail
} }
remStr = _("Remaining: ") remStr = _("Remaining: ")
if self.state == "deckFinished": if self.state == "deckFinished":