Funcionalidad de Dictado 15:46

2 files changed, 7 insertions, 9 deletions

diff --git a/Dictado_1.py b/Dictado_1.py
index 7c3b48c..a810009 100644
--- a/Dictado_1.py
+++ b/Dictado_1.py
@@ -118,10 +118,9 @@ 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 _cambiar_imagen(self, level, img):
+		ruta = "resources/%s/%s.png" % level %img
+		self.imagen.set_from_file(ruta)
 
 	def _again_cb(self, widget):
 		self._activa_desactiva_cb(1)
@@ -141,9 +140,8 @@ class Dictado:
 	def _pc(self, widget):
 		#if self.palabra.get_text() in self.words:
 
-		self.word = self.words[self.num_clic] #Asigno el valor a una variable, e introduzco esta a los metodos
-
 		if self.num_clic < (len(self.words)):
+			self.word = self.words[self.num_clic] #Asigno el valor a una variable, e introduzco esta a los metodos
 			#self.palabra.set_text(self.words[self.num_clic])
 			self.palabra.set_text(self.word)
 			#subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.words[self.num_clic], shell=True)
@@ -192,7 +190,7 @@ class Dictado:
 			else:
 				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)
+				#subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.word, shell=True)
 				self.texto.set_text("")
 
 	def _dictar_cb(self, widget, data=None):
@@ -247,7 +245,7 @@ class Dictado:
 		line = []
 		with open(file, "r") as file:
 			line.append((file.readline()).strip())
-		return 	line
+		return line
 
 	def _open_file(self, file):
 		list = []
diff --git a/nivel.txt b/nivel.txt
index 56a6051..d8263ee 100644
--- a/nivel.txt
+++ b/nivel.txt
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file