Agregando lineas a Dictado.py

1 files changed, 29 insertions, 5 deletions

diff --git a/Dictado.py b/Dictado.py
index d14df1d..f2ee80c 100644
--- a/Dictado.py
+++ b/Dictado.py
@@ -25,6 +25,7 @@ class Dictado:
 		#levels
 		self.words = []
 		self.nivel = []
+		self.word = ""
 
 		#left container
 		self.contenedor_izq = gtk.VBox()
@@ -79,6 +80,8 @@ class Dictado:
 		self.contenedor_izq.pack_start(self.hbox_repeat, False, False, 0)
 		self.hbox_repeat.show()
 
+		self.imagen = gtk.Image()
+
 		#Aqui va entry y aceptar
 		self.hbox = gtk.HBox()
 
@@ -87,6 +90,9 @@ class Dictado:
 		self.hbox.pack_start(self.texto, False, False, 0)
 		self.texto.show()
 
+		self.hbox.pack_start(self.imagen, False, False, 0)
+		self.imagen.show()
+
 		self.aceptar = gtk.Button("  Aceptar  ")
 		self.aceptar.set_sensitive(0)
 		self.aceptar.connect("clicked", self._aceptar_cb)
@@ -111,6 +117,11 @@ class Dictado:
 		self.num_clic = 0
 		self.aciertos = 0
 
+	def _cambiar_imagen(self, level):
+		ruta = "resources/%s.png" % level
+		_logger.debug('level:%s' % level)
+		self.imagen.set_from_file(ruta)
+
 	def _again_cb(self, widget):
 		self._activa_desactiva_cb(1)
 		self._act_desact_operacion_cb(0)
@@ -127,8 +138,11 @@ class Dictado:
 	#machine's action
 	def _pc(self, widget):
 		#if self.palabra.get_text() in self.words:
-		if self.num_clic < (len(self.words)):
-			self.palabra.set_text(self.words[self.num_clic])
+
+		self.word = self.words[self.num_clic]
+
+		if self.num_clic < (len(self.word)):
+			self.palabra.set_text(self.word)
 			subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.words[self.num_clic], shell=True)
 			#if (self.num_clic != (len(self.words))):
 			#	pass
@@ -163,15 +177,20 @@ class Dictado:
 				self.comenzar_dictado.set_sensitive(1)
 				
 	def _aceptar_cb(self, widget, data=None):
+		r, w = "correcto", "error"
 		if self.texto.get_text() != "":
 			self.num_clic += 1
 			if self.texto.get_text() == self.words[(self.num_clic)-1]:
+				subprocess.call("espeak -s 100 -v es-sc --stdout %s |aplay" % r, shell=True)
 				self._autocall_cb(100, self.palabra)#3 es tiempo
+				self.texto.set_text("")
 				self.aciertos += 1
 			else:
-				self._autocall_cb(100, self.palabra)#3 es tiempo
-			self.texto.set_text("")
-
+				self.num_clic -= 1
+				subprocess.call("espeak -s 100 -v es-sc --stdout %s|aplay" % w, shell=True)
+				subprocess.call("espeak -s 100 -v es-sc --stdout %s|aplay" % self.word, shell=True)
+				self.texto.set_text("")
+				#self._autocall_cb(100, self.palabra)#3 es tiempo
 
 	def _dictar_cb(self, widget, data=None):
 		self.cancelar.set_sensitive(1)
@@ -183,16 +202,21 @@ class Dictado:
 			self.label_info.set_label("Nivel 1")
 			self.words = self._open_file("1a.txt")
 			self.palabra.set_text(self.words[0])
+ 			self.word = self.words[0]
 			subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.words[0], shell=True)
 		elif self.nivel == 2:
 			self.label_info.set_label("Nivel 2")
 			self.words = self._open_file("1b.txt")
 			self.palabra.set_text(self.words[0])
+
+			self.word = self.words[0]
+
 			subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.words[0], shell=True)
 		else:
 			self.label_info.set_label("Nivel 3")
 			self.words = self._open_file("1c.txt")
 			self.palabra.set_text(self.words[0])
+			self.word = self.words[0]
 			subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.words[0], shell=True)
 
 	def _activa_desactiva_cb(self, i):