Correcciones

1 files changed, 16 insertions, 32 deletions

diff --git a/Login.py b/Login.py
index fb80f49..b3d06ed 100644
--- a/Login.py
+++ b/Login.py
@@ -48,7 +48,8 @@ class Login(gtk.Widget):
 			self.handle_event_Intro()
 			pygame.event.clear()
 			self.selector.draw(self.ventana)
-			self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0))
+			self.ventana_real.blit(pygame.transform.scale(self.ventana,
+				self.resolucionreal), (0,0))
 			pygame.display.update()
 
 	def run_game(self, button):
@@ -79,8 +80,10 @@ class Login(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)
@@ -111,10 +114,12 @@ class Login(gtk.Widget):
 			dialog.update()
 			pygame.event.clear()
 			dialog.draw(self.ventana)
-			self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0))
+			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))
+		self.ventana_real.blit(pygame.transform.scale(self.ventana,
+			self.resolucionreal), (0,0))
 		pygame.display.update()
 
 	def ok_intro(self, button):
@@ -152,31 +157,11 @@ class Selector(pygame.sprite.OrderedUpdates):
 		salir.connect(callback = main.run_dialog_intro)
 		self.add(salir)
 
-		'''
-		self.upper = JAMButton("",None)
-		imagen = os.path.join(G.IMAGENES, "Login", "up.png")#"selecciona_arriba.png")
-		self.upper.set_tamanios(tamanio = (376, 30), grosorbor=1, detalle=1, espesor=1)
-		self.upper.set_imagen(origen = imagen, tamanio = (376, 30))
-		self.upper.set_colores(colorbas = (255,255,255,255),
-			colorbor = (255,255,255,255), colorcara = (0,153,255,255))
-		self.upper.connect(callback = self.up_user, sonido_select = None)
-		self.add(self.upper)'''
-
 		self.upper = BotonScroll()
 		self.upper.set_imagen("up")
 		self.upper.connect(callback = self.up_user, sonido_select = None)
 		self.add(self.upper)
 
-		'''
-		self.down = JAMButton("",None)
-		imagen = os.path.join(G.IMAGENES, "Login", "down1.png")
-		self.down.set_tamanios(tamanio = (376, 30), grosorbor=1, detalle=1, espesor=1)
-		self.down.set_imagen(origen = imagen, tamanio = (376, 30))
-		self.down.set_colores(colorbas = (255,255,255,255),
-			colorbor = (255,255,255,255), colorcara = (0,153,255,255))
-		self.down.connect(callback = self.down_user, sonido_select = None)
-		self.add(self.down)'''
-
 		self.down = BotonScroll()
 		self.down.set_imagen("down")
 		self.down.connect(callback = self.down_user, sonido_select = None)
@@ -199,8 +184,9 @@ class Selector(pygame.sprite.OrderedUpdates):
 		self.crear = JAMButton("Crear Nuevo",None)
 		self.crear.set_tamanios(grosorbor = 1, detalle = 1, espesor = 1)
 		self.crear.set_font_from_file(fuente, tamanio = 25)
-		self.crear.set_colores(colorbas = (0,153,255,255),
-			colorbor = (255,255,255,255), colorcara = (0,153,255,255))
+		self.crear.set_colores(colorbas = (0,157,224,255),
+			colorbor = (0,157,224,255), colorcara = (92,193,235,255))
+		self.crear.set_text(color=(255,255,255,255))
 		self.crear.connect(callback = main.crear_usuario, sonido_select = None)
 		self.add(self.crear)
 
@@ -263,7 +249,6 @@ class Selector(pygame.sprite.OrderedUpdates):
 			user.set_posicion( (x, posy) )
 			posy += altura
 
-		#self.crear.set_tamanios(tamanio=(w,h*2), grosorbor=1, detalle=1, espesor=1)
 		self.crear.set_tamanios(tamanio=(w,h), grosorbor=1, detalle=1, espesor=1)
 		x,y,ww,h = self.fondo.rect
 		self.crear.set_posicion( (fondo_size[0]/2-w/2, y+h+sep*2 ) )
@@ -300,8 +285,7 @@ class Usuario(JAMButton):
 		self.set_imagen(origen = imagen)
 		self.set_alineacion_label("izquierda")
 		self.set_font_from_file(fuente, tamanio = 25)
-		self.set_text(texto = self.usuario['nombre'])
-		self.set_colores(colorbas = (0,153,255,255),
-			colorbor = (255,255,255,255), colorcara = (0,153,255,255))
-
+		self.set_text(texto = self.usuario['nombre'], color = (255,255,255,255))
+		self.set_colores(colorbas = (0,157,224,255),
+			colorbor = (0,157,224,255), colorcara = (92,193,235,255))