GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

cardHasTag(), userTime(), remove firstAnswered from cardlist

Browse source
This commit is contained in:
Damien Elmes 2011-02-21 09:36:02 +09:00
parent d02a26309f
commit 9b14bd6ab0
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ankiqt/ui/cardlist.py
View file

@ -22,6 +22,8 @@ from anki.db import *
from anki.stats import CardStats from anki.stats import CardStats
from anki.hooks import runHook, addHook, removeHook from anki.hooks import runHook, addHook, removeHook
# - first answered needs updating
CARD_ID = 0 CARD_ID = 0
CARD_QUESTION = 1 CARD_QUESTION = 1
CARD_ANSWER = 2 CARD_ANSWER = 2
@ -190,10 +192,10 @@ where cards.factId = facts.id """
def updateCard(self, index): def updateCard(self, index):
try: try:
self.cards[index.row()] = self.deck.db.first(""" self.cards[index.row()] = self.deck.db.first("""
select id, question, answer, combinedDue, reps, factId, created, modified, select id, question, answer, due, reps, factId, created, modified,
interval, factor, noCount, type, (select tags from facts where interval, factor, lapses, type, (select tags from facts where
facts.id = cards.factId), (select created from facts where facts.id = cards.factId), (select created from facts where
facts.id = cards.factId), firstAnswered from cards where id = :id""", facts.id = cards.factId) from cards where id = :id""",
id=self.cards[index.row()][0]) id=self.cards[index.row()][0])
self.emit(SIGNAL("layoutChanged()")) self.emit(SIGNAL("layoutChanged()"))
except: except:

4
ankiqt/ui/main.py
View file

@ -1889,7 +1889,7 @@ learnt today")
########################################################################## ##########################################################################
def onMark(self, toggled): def onMark(self, toggled):
if self.currentCard.hasTag("Marked"): if self.deck.cardHasTag(self.currentCard, "Marked"):
self.currentCard.fact.tags = canonifyTags(deleteTags( self.currentCard.fact.tags = canonifyTags(deleteTags(
"Marked", self.currentCard.fact.tags)) "Marked", self.currentCard.fact.tags))
else: else:
@ -2558,7 +2558,7 @@ This deck already exists on your computer. Overwrite the local copy?"""),
def updateMarkAction(self): def updateMarkAction(self):
self.mainWin.actionMarkCard.blockSignals(True) self.mainWin.actionMarkCard.blockSignals(True)
if self.currentCard.hasTag("Marked"): if self.deck.cardHasTag(self.currentCard, "Marked"):
self.mainWin.actionMarkCard.setChecked(True) self.mainWin.actionMarkCard.setChecked(True)
else: else:
self.mainWin.actionMarkCard.setChecked(False) self.mainWin.actionMarkCard.setChecked(False)

2
ankiqt/ui/status.py
View file

@ -239,7 +239,7 @@ You should aim to answer each question within<br>
return return
if not self.main.config['showCardTimer']: if not self.main.config['showCardTimer']:
return return
t = self.main.currentCard.thinkingTime() t = self.main.currentCard.userTime()
self.setTimer('%02d:%02d' % (t/60, t%60)) self.setTimer('%02d:%02d' % (t/60, t%60))
return return
self.setTimer("00:00") self.setTimer("00:00")