From 4f317bde4c39822c7db3a4f26b5e17419dcbd61d Mon Sep 17 00:00:00 2001
From: flavio <fdanesse@gmail.com>
Date: Sat, 07 Apr 2012 22:52:59 +0000
Subject: Correcciones

---
(limited to 'FGR_T0103.py')

diff --git a/FGR_T0103.py b/FGR_T0103.py
index 79fcd41..4535d64 100644
--- a/FGR_T0103.py
+++ b/FGR_T0103.py
@@ -98,7 +98,7 @@ class FGR_T0103(gtk.Widget):
 			self.controles.clear(self.ventana, self.fondo)
 			self.seniales.update()
 			self.controles.update()
-			self.handle_event_Game()
+			#self.handle_event_Game()
 			pygame.event.clear()
 			self.seniales.draw(self.ventana)
 			self.controles.draw(self.ventana)
@@ -294,13 +294,14 @@ class FGR_T0103(gtk.Widget):
 		self.estado = "Intro"'''
 	# ----------- EVENTOS en MENU ---------------
 
+	'''
 	# ----------- EVENTOS en JUEGO ---------------
 	def handle_event_Game(self):
 		for event in pygame.event.get(pygame.KEYDOWN):
 			tecla= event.key
 			if tecla== pygame.K_ESCAPE:
 				pygame.event.clear()
-				return self.run_dialog_game(None)
+				return self.run_dialog_game(None)'''
 					
 	def run_dialog_game(self, button):
 		self.controles.stop()
@@ -409,13 +410,25 @@ class Seniales(pygame.sprite.OrderedUpdates):
 class Senial(JAMButton):
 	def __init__(self, senial):
 		JAMButton.__init__(self, '',None)
-		imagen2, self.nombre = senial
+		imagen2, self.nombre, categoria = senial
 		imagen1 = os.path.join(G.IMAGENES, "FGR_T0103", "memory_logo.jpg")
 		self.set_imagen(origen = imagen1, tamanio=(175, 175))
 		self.set_tamanios(tamanio = (175, 175), grosorbor=1, detalle=1, espesor=1)
 		self.imagen1 = pygame.transform.scale(pygame.image.load(imagen1),(175, 175))
-		self.imagen2 = pygame.transform.scale(pygame.image.load(imagen2),(175, 175))
+		simbolo = pygame.transform.scale(pygame.image.load(imagen2),(120, 120))
+		fondo = pygame.image.load(os.path.join(G.IMAGENES, "FGR_T0103", "fondo_blanco.jpg"))
+		fondo = pygame.transform.scale(fondo,(175, 175))
+		texto = JAMLabel(categoria)
+		fuente, tamanio = JAMG.get_Font_fawn()
+		texto.set_font_from_file(fuente, tamanio = 35)
+		w,h = texto.get_tamanio()
+		texto = texto.image
+		fondo.blit(simbolo, (175/2-120/2, 5))
+		fondo.blit(texto, (175/2-w/2, 175-(h+5)))
+		self.imagen2 = fondo
+		#self.imagen2 = JAMG.pegar_imagenes_centradas(texto, fondo)
 		self.reset()
+
 	def reset(self):
 		self.final_unselect = self.imagen1.copy()
 		self.final_select = JAMG.get_my_surface_whit_border(self.imagen1.copy(), (255,255,255,255), 10)
--
cgit v0.9.1