GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 23:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

show study screen regardless of deck due or not, tweak 'initial'

Browse source
This commit is contained in:
Damien Elmes 2009-04-18 00:59:01 +09:00
parent 513a23c251
commit e1b7da08e5
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ankiqt/ui/main.py
View file

@ -249,6 +249,12 @@ Please do not file a bug report with Anki.<br><br>""")
if self.deck.isEmpty(): if self.deck.isEmpty():
return self.moveToState("deckEmpty") return self.moveToState("deckEmpty")
else: else:
if not self.deck.reviewEarly:
if (self.config['showStudyScreen'] and
not self.deck.sessionStartTime):
return self.moveToState("studyScreen")
if self.deck.sessionLimitReached():
return self.moveToState("studyScreen")
if not self.currentCard: if not self.currentCard:
self.currentCard = self.deck.getCard() self.currentCard = self.deck.getCard()
if self.currentCard: if self.currentCard:
@ -258,12 +264,6 @@ Please do not file a bug report with Anki.<br><br>""")
# if the same card is being shown and it's not # if the same card is being shown and it's not
# due yet, give up # due yet, give up
return self.moveToState("deckFinished") return self.moveToState("deckFinished")
if not self.deck.reviewEarly:
if (self.config['showStudyScreen'] and
not self.deck.sessionStartTime):
return self.moveToState("studyScreen")
if self.deck.sessionLimitReached():
return self.moveToState("studyScreen")
self.enableCardMenuItems() self.enableCardMenuItems()
return self.moveToState("showQuestion") return self.moveToState("showQuestion")
else: else:
@ -283,6 +283,7 @@ Please do not file a bug report with Anki.<br><br>""")
# make sure the buttons aren't focused # make sure the buttons aren't focused
self.mainWin.congratsLabel.setFocus() self.mainWin.congratsLabel.setFocus()
elif state == "showQuestion": elif state == "showQuestion":
self.reviewingStarted = True
if self.deck.mediaDir(): if self.deck.mediaDir():
os.chdir(self.deck.mediaDir()) os.chdir(self.deck.mediaDir())
self.showAnswerButton() self.showAnswerButton()
@ -556,6 +557,7 @@ new:
def loadDeck(self, deckPath, sync=True, interactive=True, uprecent=True): def loadDeck(self, deckPath, sync=True, interactive=True, uprecent=True):
"Load a deck and update the user interface. Maybe sync." "Load a deck and update the user interface. Maybe sync."
self.reviewingStarted = False
# return True on success # return True on success
try: try:
self.pauseViews() self.pauseViews()
@ -1102,17 +1104,16 @@ day = :d""", d=yesterday)
<td>%s</td></tr></table>""" % (stats1, stats2)) <td>%s</td></tr></table>""" % (stats1, stats2))
def showStudyScreen(self): def showStudyScreen(self):
initial = self.deck.sessionStartTime == 0
self.mainWin.optionsButton.setChecked(self.config['showStudyOptions']) self.mainWin.optionsButton.setChecked(self.config['showStudyOptions'])
self.mainWin.optionsBox.setShown(self.config['showStudyOptions']) self.mainWin.optionsBox.setShown(self.config['showStudyOptions'])
self.switchToStudyScreen() self.switchToStudyScreen()
self.updateStudyStats() self.updateStudyStats()
# start reviewing button # start reviewing button
self.mainWin.buttonStack.hide() self.mainWin.buttonStack.hide()
if initial: if self.reviewingStarted:
self.mainWin.startReviewingButton.setText(_("Start &Reviewing"))
else:
self.mainWin.startReviewingButton.setText(_("Continue &Reviewing")) self.mainWin.startReviewingButton.setText(_("Continue &Reviewing"))
else:
self.mainWin.startReviewingButton.setText(_("Start &Reviewing"))
self.mainWin.startReviewingButton.setFocus() self.mainWin.startReviewingButton.setFocus()
self.connect(self.mainWin.startReviewingButton, self.connect(self.mainWin.startReviewingButton,
SIGNAL("clicked()"), SIGNAL("clicked()"),