Merge branch 'master' of git://git.sugarlabs.org/dictado/mainline

Conflicts:
	Dictado_1.py

2 files changed, 23 insertions, 6 deletions

diff --git a/Dictado.py b/Dictado.py
index d14df1d..ea2c720 100644
--- a/Dictado.py
+++ b/Dictado.py
@@ -1,6 +1,8 @@
 """Desarrollo de un Dictado Robotizida o_0"""
 """en proceso"""
-#written by Walter. D. Vargas <pynash@gmail.com>
+#written by:
+# Walter. D. Vargas <pynash@gmail.com>
+# Yuri Gonzalez <yurigonzalezni@gmail.com>
 
 # -*- coding: utf-8 -*-
 
@@ -25,6 +27,7 @@ class Dictado:
 		#levels
 		self.words = []
 		self.nivel = []
+		self.word = ""
 
 		#left container
 		self.contenedor_izq = gtk.VBox()
@@ -127,9 +130,13 @@ class Dictado:
 	#machine's action
 	def _pc(self, widget):
 		#if self.palabra.get_text() in self.words:
+
+		#self.word = self.words[self.num_clic]
+
 		if self.num_clic < (len(self.words)):
-			self.palabra.set_text(self.words[self.num_clic])
-			subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.words[self.num_clic], shell=True)
+			self.word = self.words[self.num_clic]
+			self.palabra.set_text(self.word)
+			subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.word, shell=True)
 			#if (self.num_clic != (len(self.words))):
 			#	pass
 		else:
@@ -163,15 +170,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 +195,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):
diff --git a/resources/.level_1/1.gif b/resources/.level_1/1.gif
deleted file mode 100644
index 7ee76ca..0000000
--- a/resources/.level_1/1.gif
+++ /dev/null