Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/controller.py
diff options
context:
space:
mode:
Diffstat (limited to 'controller.py')
-rw-r--r--controller.py35
1 files changed, 23 insertions, 12 deletions
diff --git a/controller.py b/controller.py
index 3c9cde5..9992666 100644
--- a/controller.py
+++ b/controller.py
@@ -8,15 +8,20 @@ class Controller():
def newGame(self,widget):
self.session=session.Session(self.get_active_text(self.view.toolbar.categorias),self.get_active_text(self.view.toolbar.dificultades))
- self.view.refreshQuestion()
+ self.answered=True
+ self.continues=True
+ self.continues=self.nextPuzzle(widget)
def evaluateAnswer(self,widget):
- if self.session.currentPuzzle().answered:
- if self.session.currentPuzzle().evaluateAnswer(self.view.respT.get_text()):
- status='Correcto.'
- else:
- status='Incorrecto.'
- self.view.showAnswer(status)
+ print self.continues
+ if self.continues:
+ if not self.answered:
+ self.answered=True
+ if self.session.evaluateAnswer(self.view.respT.get_text()):
+ status='Correcto.'
+ else:
+ status='Incorrecto.'
+ self.view.showAnswer(status,self.session.currentPuzzle().answer)
def hasClue(self,widget):
return self.session.currentPuzzle().hasClue()
@@ -25,10 +30,17 @@ class Controller():
return self.session.currentPuzzle().getClue()
def nextPuzzle(self,widget):
- if self.session.currentPuzzle().answered:
- return self.session.nextPuzzle()
- else:
- return self.evaluateAnswer(widget)
+ if self.continues:
+ if not self.answered:
+ self.evaluateAnswer(widget)
+ else:
+ self.continues=self.session.nextPuzzle()
+ if self.continues:
+ self.answered=False
+ else:
+ self.view.hideAnswer()
+ self.view.refreshQuestion(self.session.currentPuzzle().question)
+ print self.continues
def pause(self,widget):
return self.session.pause()
@@ -42,4 +54,3 @@ class Controller():
if active < 0:
return None
return model[active][0]
-