mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
accept space no matter what is focused, don't focus show answer as faster
This commit is contained in:
parent
c9044f6d64
commit
0ddc1d7d72
1 changed files with 17 additions and 6 deletions
|
@ -344,16 +344,21 @@ Please do not file a bug report with Anki.<br><br>""")
|
||||||
return
|
return
|
||||||
if self.state == "showQuestion":
|
if self.state == "showQuestion":
|
||||||
if evt.key() in (Qt.Key_Enter,
|
if evt.key() in (Qt.Key_Enter,
|
||||||
Qt.Key_Return):
|
Qt.Key_Return,
|
||||||
|
Qt.Key_Space):
|
||||||
evt.accept()
|
evt.accept()
|
||||||
return self.moveToState("showAnswer")
|
return self.mainWin.showAnswerButton.click()
|
||||||
elif self.state == "showAnswer":
|
elif self.state == "showAnswer":
|
||||||
|
if evt.key() == Qt.Key_Space:
|
||||||
|
key = str(self.defaultEaseButton())
|
||||||
|
else:
|
||||||
key = unicode(evt.text())
|
key = unicode(evt.text())
|
||||||
if key and key >= "1" and key <= "4":
|
if key and key >= "1" and key <= "4":
|
||||||
# user entered a quality setting
|
# user entered a quality setting
|
||||||
num=int(key)
|
num=int(key)
|
||||||
evt.accept()
|
evt.accept()
|
||||||
return self.cardAnswered(num)
|
return getattr(self.mainWin, "easeButton%d" %
|
||||||
|
num).animateClick()
|
||||||
elif self.state == "studyScreen":
|
elif self.state == "studyScreen":
|
||||||
if evt.key() in (Qt.Key_Enter,
|
if evt.key() in (Qt.Key_Enter,
|
||||||
Qt.Key_Return):
|
Qt.Key_Return):
|
||||||
|
@ -534,18 +539,24 @@ new:
|
||||||
self.typeAnswerField.setText("")
|
self.typeAnswerField.setText("")
|
||||||
else:
|
else:
|
||||||
self.mainWin.buttonStack.setCurrentIndex(0)
|
self.mainWin.buttonStack.setCurrentIndex(0)
|
||||||
self.mainWin.showAnswerButton.setFocus()
|
self.mainWin.mainText.setFocus()
|
||||||
self.mainWin.buttonStack.show()
|
self.mainWin.buttonStack.show()
|
||||||
|
|
||||||
def showEaseButtons(self):
|
def showEaseButtons(self):
|
||||||
self.updateEaseButtons()
|
self.updateEaseButtons()
|
||||||
self.mainWin.buttonStack.setCurrentIndex(1)
|
self.mainWin.buttonStack.setCurrentIndex(1)
|
||||||
self.mainWin.buttonStack.show()
|
self.mainWin.buttonStack.show()
|
||||||
if self.currentCard.reps and not self.currentCard.successive:
|
if self.defaultEaseButton() == 2:
|
||||||
self.mainWin.easeButton2.setFocus()
|
self.mainWin.easeButton2.setFocus()
|
||||||
else:
|
else:
|
||||||
self.mainWin.easeButton3.setFocus()
|
self.mainWin.easeButton3.setFocus()
|
||||||
|
|
||||||
|
def defaultEaseButton(self):
|
||||||
|
if self.currentCard.reps and not self.currentCard.successive:
|
||||||
|
return 2
|
||||||
|
else:
|
||||||
|
return 3
|
||||||
|
|
||||||
def updateEaseButtons(self):
|
def updateEaseButtons(self):
|
||||||
nextInts = {}
|
nextInts = {}
|
||||||
for i in range(1, 5):
|
for i in range(1, 5):
|
||||||
|
|
Loading…
Reference in a new issue