new failed card handling selection

This commit is contained in:
Damien Elmes 2009-02-07 21:35:40 +09:00
parent 17eb9015b1
commit 3591560e61
2 changed files with 14 additions and 21 deletions

View file

@ -20,7 +20,7 @@ from anki.db import OperationalError
from anki.stdmodels import BasicModel from anki.stdmodels import BasicModel
from anki.hooks import runHook, addHook, removeHook, _hooks from anki.hooks import runHook, addHook, removeHook, _hooks
from anki.deck import newCardOrderLabels, newCardSchedulingLabels from anki.deck import newCardOrderLabels, newCardSchedulingLabels
from anki.deck import revCardOrderLabels from anki.deck import revCardOrderLabels, failedCardOptionLabels
import anki.latex import anki.latex
import anki.lang import anki.lang
import anki.deck import anki.deck
@ -986,6 +986,8 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
0, QStringList(newCardSchedulingLabels().values())) 0, QStringList(newCardSchedulingLabels().values()))
self.mainWin.revCardOrder.insertItems( self.mainWin.revCardOrder.insertItems(
0, QStringList(revCardOrderLabels().values())) 0, QStringList(revCardOrderLabels().values()))
self.mainWin.failedCardsOption.insertItems(
0, QStringList(failedCardOptionLabels().values()))
self.connect(self.mainWin.optionsHelpButton, self.connect(self.mainWin.optionsHelpButton,
SIGNAL("clicked()"), SIGNAL("clicked()"),
lambda: QDesktopServices.openUrl(QUrl( lambda: QDesktopServices.openUrl(QUrl(
@ -1110,7 +1112,7 @@ day = :d""", d=yesterday)
self.mainWin.newCardOrder.setCurrentIndex(self.deck.newCardOrder) self.mainWin.newCardOrder.setCurrentIndex(self.deck.newCardOrder)
self.mainWin.newCardScheduling.setCurrentIndex(self.deck.newCardSpacing) self.mainWin.newCardScheduling.setCurrentIndex(self.deck.newCardSpacing)
self.mainWin.revCardOrder.setCurrentIndex(self.deck.revCardOrder) self.mainWin.revCardOrder.setCurrentIndex(self.deck.revCardOrder)
self.mainWin.delayLapsedCards.setChecked(not self.deck.delay0) self.mainWin.failedCardsOption.setCurrentIndex(self.deck.getFailedCardPolicy())
def onStartReview(self): def onStartReview(self):
self.mainWin.studyOptionsFrame.hide() self.mainWin.studyOptionsFrame.hide()
@ -1125,12 +1127,7 @@ day = :d""", d=yesterday)
self.deck.newCardOrder = self.mainWin.newCardOrder.currentIndex() self.deck.newCardOrder = self.mainWin.newCardOrder.currentIndex()
self.deck.newCardSpacing = self.mainWin.newCardScheduling.currentIndex() self.deck.newCardSpacing = self.mainWin.newCardScheduling.currentIndex()
self.deck.revCardOrder = self.mainWin.revCardOrder.currentIndex() self.deck.revCardOrder = self.mainWin.revCardOrder.currentIndex()
# avoid clobbering the user's settings if they haven't changed self.deck.setFailedCardPolicy(self.mainWin.failedCardsOption.currentIndex())
if self.deck.delay0 and self.mainWin.delayLapsedCards.isChecked():
self.deck.delay0 = 0
elif (not self.deck.delay0 and
not self.mainWin.delayLapsedCards.isChecked()):
self.deck.delay0 = 600
self.deck.updateDynamicIndices() self.deck.updateDynamicIndices()
self.deck.startSession() self.deck.startSession()
self.deck.flushMod() self.deck.flushMod()

View file

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>639</width> <width>639</width>
<height>501</height> <height>504</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -28,7 +28,7 @@
<x>0</x> <x>0</x>
<y>69</y> <y>69</y>
<width>639</width> <width>639</width>
<height>412</height> <height>415</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -405,7 +405,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>368</width> <width>368</width>
<height>355</height> <height>358</height>
</rect> </rect>
</property> </property>
</widget> </widget>
@ -477,8 +477,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>474</width> <width>368</width>
<height>356</height> <height>358</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4" > <layout class="QVBoxLayout" name="verticalLayout_4" >
@ -741,11 +741,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="delayLapsedCards" > <widget class="QComboBox" name="failedCardsOption" />
<property name="text" >
<string>Show failed cards last</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -842,8 +838,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>474</width> <width>368</width>
<height>356</height> <height>358</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8" > <layout class="QVBoxLayout" name="verticalLayout_8" >
@ -1341,7 +1337,7 @@
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>481</y> <y>484</y>
<width>639</width> <width>639</width>
<height>20</height> <height>20</height>
</rect> </rect>