Correcciones

1 files changed, 13 insertions, 44 deletions

diff --git a/Crear_Usuario.py b/Crear_Usuario.py
index 3ae6cba..acad96d 100644
--- a/Crear_Usuario.py
+++ b/Crear_Usuario.py
@@ -7,7 +7,6 @@ import gc
 import sys
 import gtk
 import gobject
-
 from pygame.locals import *
 import Globals as G
 gc.enable()
@@ -60,7 +59,7 @@ class Crear_Usuario(gtk.Widget):
 		for event in pygame.event.get(pygame.KEYDOWN):
 			tecla = event.key
 			if tecla == pygame.K_ESCAPE:
-				return self.run_dialog_intro(None)
+				return self.emit_volver()
 
 	def load(self):
 		pygame.display.set_mode( (0,0), pygame.DOUBLEBUF | pygame.FULLSCREEN, 0)
@@ -72,8 +71,10 @@ class Crear_Usuario(gtk.Widget):
 		self.resolucionreal = (C,D)
 		self.VA = float(C)/float(A)
 		self.VH = float(D)/float(B)
-		pygame.event.set_blocked([JOYAXISMOTION, JOYBALLMOTION, JOYHATMOTION, JOYBUTTONUP, JOYBUTTONDOWN, KEYUP, USEREVENT])
-		pygame.event.set_allowed([MOUSEMOTION, MOUSEBUTTONUP, MOUSEBUTTONDOWN, KEYDOWN, VIDEORESIZE, VIDEOEXPOSE, QUIT, ACTIVEEVENT])
+		pygame.event.set_blocked([JOYAXISMOTION, JOYBALLMOTION, JOYHATMOTION,
+			JOYBUTTONUP, JOYBUTTONDOWN, KEYUP, USEREVENT])
+		pygame.event.set_allowed([MOUSEMOTION, MOUSEBUTTONUP, MOUSEBUTTONDOWN,
+			KEYDOWN, VIDEORESIZE, VIDEOEXPOSE, QUIT, ACTIVEEVENT])
 		pygame.mouse.set_visible(True)
 		imagen = os.path.join(G.IMAGENES, "Login", "fondo.jpg")
 		self.fondo = pygame.transform.scale(pygame.image.load(imagen), G.RESOLUCION)
@@ -81,41 +82,6 @@ class Crear_Usuario(gtk.Widget):
 		self.frame = Frame(self)
 		self.frame.center(self.fondo.get_size())
 
-	def run_dialog_intro(self, button):
-		from BiblioJAM.JAMDialog import JAMDialog
-		dialog = JAMDialog(mensaje = "¿Abandonas el Juego?",
-		funcion_ok = self.ok_intro, funcion_cancel = self.cancel_intro)
-		fuente, tamanio = JAMG.get_Font_fawn()
-		dialog.set_font_from_file(fuente, tamanio = 40)
-		dialog.boton_aceptar.set_font_from_file(fuente, tamanio = 25)
-		dialog.boton_cancelar.set_font_from_file(fuente, tamanio = 25)
-		a,b,c = JAMG.get_estilo_papel_quemado()
-		dialog.set_colors_dialog(base = c, bordes = c)
-		dialog.set_colors_buttons(colorbas = a, colorbor = b, colorcara = c) 
-		self.estado = "Dialog"
-		dialog.draw(self.ventana)
-		pygame.display.update()
-		while self.estado == "Dialog":
-			self.reloj.tick(35)
-			while gtk.events_pending():
-			    	gtk.main_iteration(False)
-			G.Traduce_posiciones(self.VA, self.VH)
-			dialog.clear(self.ventana, self.fondo)
-			dialog.update()
-			pygame.event.clear()
-			dialog.draw(self.ventana)
-			self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0))
-			pygame.display.update()
-
-		dialog.clear(self.ventana, self.fondo)
-		self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0))
-		pygame.display.update()
-
-	def ok_intro(self, button):
-		return self.emit_volver()
-	def cancel_intro(self, button):
-		self.estado = "Intro"
-
 	def crear_usuario(self, usuario):
 		self.estado = None
 		self.emit("run", usuario)
@@ -169,7 +135,7 @@ class Frame(pygame.sprite.OrderedUpdates):
 		salir.set_colores(colorbas = JAMG.get_negro(), colorcara = JAMG.get_negro())
 		salir.set_tamanios(tamanio = (0,0), grosorbor = 1, detalle = 1, espesor = 1)
 		salir.set_posicion(punto = (10,10))
-		salir.connect(callback = main.run_dialog_intro)
+		salir.connect(callback = main.emit_volver, sonido_select = None)
 		self.add(salir)
 
 		# Ingresar nombre
@@ -232,9 +198,11 @@ class Frame(pygame.sprite.OrderedUpdates):
 		self.boton_crear = JAMButton("Crear",None)
 		self.boton_crear.set_font_from_file(fuente, tamanio = 30)
 		self.boton_crear.set_tamanios(tamanio = (200,40), grosorbor = 1, detalle = 1, espesor = 1)
-		#self.boton_crear.set_colores(colorbas = (0,153,255,255), colorbor = (0,153,255,255), colorcara = (255,255,255,255))
-		self.boton_crear.set_colores(colorbas = (92,193,235,255),
-			colorbor = (255,255,255,255), colorcara = (92,193,235,255))
+		self.boton_crear.set_colores(colorbas = (0,157,224,255),
+			colorbor = (0,157,224,255), colorcara = (92,193,235,255))
+		#self.boton_crear.set_colores(colorbas = (92,193,235,255),
+		#	colorbor = (255,255,255,255), colorcara = (92,193,235,255))
+		self.boton_crear.set_text(color=(255,255,255,255))
 		self.boton_crear.connect(callback = self.crear_usuario, sonido_select = None)
 
 		self.add(self.boton_crear)
@@ -316,7 +284,7 @@ class Frame(pygame.sprite.OrderedUpdates):
 			print "Hay un campo sin llenar"
 
 	def select_personaje(self, button):
-		self.usuario['personaje'] = button.etiqueta_unselect.imagen["origen"]
+		self.usuario['personaje'] = button.origen_imagen
 		for personaje in self.personajes:
 			if not personaje == button:
 				personaje.deseleccionar()
@@ -405,6 +373,7 @@ class BotonUsuario(JAMButton):
 		JAMButton.__init__(self, '', None)
 		self.set_tamanios(tamanio = (128,128), grosorbor = 1, detalle = 1, espesor = 1)
 	def set_imagen(self, origen):
+		self.origen_imagen = origen
 		self.original_imagen = pygame.transform.scale(pygame.image.load(origen), (128,128))
 
 		self.final_unselect = self.original_imagen.copy()