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

45 files changed, 91 insertions, 45 deletions

diff --git a/Saludame.activity/activity.py b/Saludame.activity/activity.py
index b7a7e44..b7a7e44 100644..100755
--- a/Saludame.activity/activity.py
+++ b/Saludame.activity/activity.py
diff --git a/Saludame.activity/activity/activity.info b/Saludame.activity/activity/activity.info
index bea85a1..bea85a1 100644..100755
--- a/Saludame.activity/activity/activity.info
+++ b/Saludame.activity/activity/activity.info
diff --git a/Saludame.activity/activity/saludame.svg b/Saludame.activity/activity/saludame.svg
index 0554ff9..0554ff9 100644..100755
--- a/Saludame.activity/activity/saludame.svg
+++ b/Saludame.activity/activity/saludame.svg
diff --git a/Saludame.activity/animation.py b/Saludame.activity/animation.py
index 98ec8f6..98ec8f6 100644..100755
--- a/Saludame.activity/animation.py
+++ b/Saludame.activity/animation.py
diff --git a/Saludame.activity/assets/background/background.png b/Saludame.activity/assets/background/background.png
index 742ce79..742ce79 100644..100755
--- a/Saludame.activity/assets/background/background.png
+++ b/Saludame.activity/assets/background/background.png
diff --git a/Saludame.activity/assets/background/background.svg b/Saludame.activity/assets/background/background.svg
index c0f2209..c0f2209 100644..100755
--- a/Saludame.activity/assets/background/background.svg
+++ b/Saludame.activity/assets/background/background.svg
diff --git a/Saludame.activity/assets/challenges/francia.jpg b/Saludame.activity/assets/challenges/francia.jpg
index 412fbbc..412fbbc 100644..100755
--- a/Saludame.activity/assets/challenges/francia.jpg
+++ b/Saludame.activity/assets/challenges/francia.jpg
diff --git a/Saludame.activity/assets/food/apple/12316860561101736632rg1024_apple.svg b/Saludame.activity/assets/food/apple/12316860561101736632rg1024_apple.svg
index 53e69ff..53e69ff 100644..100755
--- a/Saludame.activity/assets/food/apple/12316860561101736632rg1024_apple.svg
+++ b/Saludame.activity/assets/food/apple/12316860561101736632rg1024_apple.svg
diff --git a/Saludame.activity/assets/food/apple/apple0000.png b/Saludame.activity/assets/food/apple/apple0000.png
index 23ad3db..23ad3db 100644..100755
--- a/Saludame.activity/assets/food/apple/apple0000.png
+++ b/Saludame.activity/assets/food/apple/apple0000.png
diff --git a/Saludame.activity/assets/food/apple/apple0001.png b/Saludame.activity/assets/food/apple/apple0001.png
index 7d02ecd..7d02ecd 100644..100755
--- a/Saludame.activity/assets/food/apple/apple0001.png
+++ b/Saludame.activity/assets/food/apple/apple0001.png
diff --git a/Saludame.activity/assets/food/apple/apple0002.png b/Saludame.activity/assets/food/apple/apple0002.png
index e8d2249..e8d2249 100644..100755
--- a/Saludame.activity/assets/food/apple/apple0002.png
+++ b/Saludame.activity/assets/food/apple/apple0002.png
diff --git a/Saludame.activity/assets/food/apple/apple0003.png b/Saludame.activity/assets/food/apple/apple0003.png
index 717d694..717d694 100644..100755
--- a/Saludame.activity/assets/food/apple/apple0003.png
+++ b/Saludame.activity/assets/food/apple/apple0003.png
diff --git a/Saludame.activity/assets/food/apple/apple0004.png b/Saludame.activity/assets/food/apple/apple0004.png
index fd4c941..fd4c941 100644..100755
--- a/Saludame.activity/assets/food/apple/apple0004.png
+++ b/Saludame.activity/assets/food/apple/apple0004.png
diff --git a/Saludame.activity/assets/icons/icon.png b/Saludame.activity/assets/icons/icon.png
index 5f6e5a3..5f6e5a3 100644..100755
--- a/Saludame.activity/assets/icons/icon.png
+++ b/Saludame.activity/assets/icons/icon.png
diff --git a/Saludame.activity/assets/icons/icon2.png b/Saludame.activity/assets/icons/icon2.png
index da0995c..da0995c 100644..100755
--- a/Saludame.activity/assets/icons/icon2.png
+++ b/Saludame.activity/assets/icons/icon2.png
diff --git a/Saludame.activity/assets/icons/icon3.png b/Saludame.activity/assets/icons/icon3.png
index d19cd8c..d19cd8c 100644..100755
--- a/Saludame.activity/assets/icons/icon3.png
+++ b/Saludame.activity/assets/icons/icon3.png
diff --git a/Saludame.activity/assets/icons/salir.png b/Saludame.activity/assets/icons/salir.png
index 91abf0c..91abf0c 100644..100755
--- a/Saludame.activity/assets/icons/salir.png
+++ b/Saludame.activity/assets/icons/salir.png
diff --git a/Saludame.activity/assets/kid/kid.svg b/Saludame.activity/assets/kid/kid.svg
index 5e19788..5e19788 100644..100755
--- a/Saludame.activity/assets/kid/kid.svg
+++ b/Saludame.activity/assets/kid/kid.svg
diff --git a/Saludame.activity/assets/kid/kid01.png b/Saludame.activity/assets/kid/kid01.png
index ec73570..ec73570 100644..100755
--- a/Saludame.activity/assets/kid/kid01.png
+++ b/Saludame.activity/assets/kid/kid01.png
diff --git a/Saludame.activity/assets/kid/kid02.png b/Saludame.activity/assets/kid/kid02.png
index eea5e04..eea5e04 100644..100755
--- a/Saludame.activity/assets/kid/kid02.png
+++ b/Saludame.activity/assets/kid/kid02.png
diff --git a/Saludame.activity/assets/kid/kid03.png b/Saludame.activity/assets/kid/kid03.png
index faa5325..faa5325 100644..100755
--- a/Saludame.activity/assets/kid/kid03.png
+++ b/Saludame.activity/assets/kid/kid03.png
diff --git a/Saludame.activity/assets/kid/kid04.png b/Saludame.activity/assets/kid/kid04.png
index 2812baf..2812baf 100644..100755
--- a/Saludame.activity/assets/kid/kid04.png
+++ b/Saludame.activity/assets/kid/kid04.png
diff --git a/Saludame.activity/assets/kid/kid05.png b/Saludame.activity/assets/kid/kid05.png
index 3aca31c..3aca31c 100644..100755
--- a/Saludame.activity/assets/kid/kid05.png
+++ b/Saludame.activity/assets/kid/kid05.png
diff --git a/Saludame.activity/assets/kid/kid06.png b/Saludame.activity/assets/kid/kid06.png
index 293d6fe..293d6fe 100644..100755
--- a/Saludame.activity/assets/kid/kid06.png
+++ b/Saludame.activity/assets/kid/kid06.png
diff --git a/Saludame.activity/assets/kid/kid07.png b/Saludame.activity/assets/kid/kid07.png
index 839d5e6..839d5e6 100644..100755
--- a/Saludame.activity/assets/kid/kid07.png
+++ b/Saludame.activity/assets/kid/kid07.png
diff --git a/Saludame.activity/assets/kid/kid08.png b/Saludame.activity/assets/kid/kid08.png
index 7d8c9c0..7d8c9c0 100644..100755
--- a/Saludame.activity/assets/kid/kid08.png
+++ b/Saludame.activity/assets/kid/kid08.png
diff --git a/Saludame.activity/assets/kid/kid09.png b/Saludame.activity/assets/kid/kid09.png
index 666c28b..666c28b 100644..100755
--- a/Saludame.activity/assets/kid/kid09.png
+++ b/Saludame.activity/assets/kid/kid09.png
diff --git a/Saludame.activity/assets/kid/kid10.png b/Saludame.activity/assets/kid/kid10.png
index f07424c..f07424c 100644..100755
--- a/Saludame.activity/assets/kid/kid10.png
+++ b/Saludame.activity/assets/kid/kid10.png
diff --git a/Saludame.activity/assets/kid/kid11.png b/Saludame.activity/assets/kid/kid11.png
index 4c41aaa..4c41aaa 100644..100755
--- a/Saludame.activity/assets/kid/kid11.png
+++ b/Saludame.activity/assets/kid/kid11.png
diff --git a/Saludame.activity/assets/sound/blip.ogg b/Saludame.activity/assets/sound/blip.ogg
index 3219bbe..3219bbe 100644..100755
--- a/Saludame.activity/assets/sound/blip.ogg
+++ b/Saludame.activity/assets/sound/blip.ogg
diff --git a/Saludame.activity/assets/sound/blip.wav b/Saludame.activity/assets/sound/blip.wav
index 587c32b..587c32b 100644..100755
--- a/Saludame.activity/assets/sound/blip.wav
+++ b/Saludame.activity/assets/sound/blip.wav
diff --git a/Saludame.activity/assets/sound/correct.ogg b/Saludame.activity/assets/sound/correct.ogg
index 86539d8..86539d8 100644..100755
--- a/Saludame.activity/assets/sound/correct.ogg
+++ b/Saludame.activity/assets/sound/correct.ogg
diff --git a/Saludame.activity/assets/sound/incorrect.ogg b/Saludame.activity/assets/sound/incorrect.ogg
index 182227e..182227e 100644..100755
--- a/Saludame.activity/assets/sound/incorrect.ogg
+++ b/Saludame.activity/assets/sound/incorrect.ogg
diff --git a/Saludame.activity/assets/sound/over.ogg b/Saludame.activity/assets/sound/over.ogg
index 9a1da65..9a1da65 100644..100755
--- a/Saludame.activity/assets/sound/over.ogg
+++ b/Saludame.activity/assets/sound/over.ogg
diff --git a/Saludame.activity/challenges.py b/Saludame.activity/challenges.py
index 81becca..81becca 100644..100755
--- a/Saludame.activity/challenges.py
+++ b/Saludame.activity/challenges.py
diff --git a/Saludame.activity/game.py b/Saludame.activity/game.py
index 90ad70b..90ad70b 100644..100755
--- a/Saludame.activity/game.py
+++ b/Saludame.activity/game.py
diff --git a/Saludame.activity/kid.py b/Saludame.activity/kid.py
new file mode 100755
index 0000000..e7c7515
--- /dev/null
+++ b/Saludame.activity/kid.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+class kid:
+    """
+    kid entity (por poner un ejemplo)
+    """
+    
+    def __init__(self, name, age, sex, energy=100, hunger=100, hygiene=100, social=100, vitamins=100):
+        self.name = name
+        self.age = age
+        self.sex = sex
+        #states   por poner un ejemplo.
+        self.energy = energy
+        self.hunger = hunger
+        self.hygiene = hygiene
+        self.social = social
+        self.vitamins = vitamins
+        
+    def increse_energy(self, value):
+        self.energy += value
+    
+    def increse_hunger(self, value):
+        self.hunger += value
+    
+    def increse_hygiene(self, value):
+        self.hygiene += value
+
+    def increse_social(self, value):
+        self.social += value
+        
+    def increse_vitamins(self, value):
+        self.vitamins += value
diff --git a/Saludame.activity/menu.py b/Saludame.activity/menu.py
index f9fa776..5b518f0 100644..100755
--- a/Saludame.activity/menu.py
+++ b/Saludame.activity/menu.py
@@ -9,19 +9,21 @@
 import pygame
 import os
 import math
-from ibus.lang import __load_lang
 
 class Menu:
     
-    def __init__(self,frame_rate,item_list):
-        #self.rect = rect
+    def __init__(self, frame_rate, item_list, center, radius):
+        
+        self.center = center # center of the menu's circle
+        
         self.frame_rate = frame_rate
         self.item_list = item_list # item's list that going to be displayed
-        self.path = None           # Path of items selected
-        self.actual_selection= self.item_list #list of actual subitems selection
-        self.salir = Item(" ","assets/icons/salir.png"," ",[])
-        self.salir.rect.center = (190,140)
-        self.radious =100
+        self.actual_selection = self.item_list #list of actual subitems selection
+        
+        self.salir = Item(" ", "assets/icons/salir.png", " ", [])
+        self.salir.rect.center = center
+        
+        self.radius = radius
         self.on_compression = True #para mostrar la animación al iniciar
         self.on_expansion = False
         
@@ -32,42 +34,48 @@ class Menu:
         """
     
     def draw(self, screen):
+        """
+        draw menu items
+        """
         font = pygame.font.Font(None, 35)
         if(self.on_compression):
-            if(self.radious > 0):
-                self.radious -= 8
-                self.__calculate_items_position((190,140), self.radious, self.item_list)
+            if(self.radius > 0):
+                self.radius -= 5
+                self.__calculate_items_position(self.center, self.radius, self.item_list)
             else:
-                self.on_compression=False
-                self.on_expansion=True
+                self.on_compression = False
+                self.on_expansion = True
         if(self.on_expansion):
-            if(self.radious <100):
+            if(self.radius < 90):
                 item = self.item_list[2]
                 self.actual_selection = item.subitems_list
-                self.radious+=5
-                self.__calculate_items_position((190,140), self.radious, self.actual_selection)
+                self.radius += 5
+                self.__calculate_items_position(self.center, self.radius, self.actual_selection)
             else:
                 self.on_expansion = False
-                
+        
+        changes = []
         for item in self.actual_selection:
-            item.draw_item(screen,font)
-        self.salir.draw_item(screen,font)
-        pygame.display.update()
-        return []
+            item.draw_item(screen, font)
+            changes.append(item.rect)
+            
+        self.salir.draw_item(screen, font)
+        changes.append(self.salir.rect)
+        return changes
     
-    def on_mouse_over(self,coord):
+    def on_mouse_over(self, coord):
         for item in self.actual_selection:
             if(item.rect.collidepoint(coord)):
                 item.on_mouse_over()
                 break
     
-    def on_mouse_out(self,coord):
+    def on_mouse_out(self, coord):
         for item in self.actual_selection:
             if(item.rect.collidepoint(coord)):
                 item.on_mouse_out()
                 break
     
-    def on_mouse_click(self,coord):
+    def on_mouse_click(self, coord):
         for item in self.actual_selection:
             if(item.rect.collidepoint(coord)):
                 item.on_mouse_clik()
@@ -79,25 +87,25 @@ class Menu:
         """
             Calculate the position for each menu's item
         """
-        self.__calculate_items_position((170,140), self.radious, self.item_list)
+        self.__calculate_items_position(self.center, self.radius, self.item_list)
         
-    def __calculate_items_position(self,center,radius,item_list):
-        if(len(item_list)>0):
-            angle = (2*math.pi) / len(item_list)
+    def __calculate_items_position(self, center, radius, item_list):
+        if(len(item_list) > 0):
+            angle = (2 * math.pi) / len(item_list)
         else:
             angle = 0
         current_angle = math.pi / 4
         for item in item_list:
-            self.__calculate_item_position(item,center, current_angle, radius) #calculate the position for each item
-            self.__calculate_items_position(center,radius,item.subitems_list) #calculate the position for each item's subitem
+            self.__calculate_item_position(item, center, current_angle, radius) #calculate the position for each item
+            self.__calculate_items_position(center, radius, item.subitems_list) #calculate the position for each item's subitem
             current_angle += angle
       
-    def __calculate_item_position(self,item,center,angle,radius):
+    def __calculate_item_position(self, item, center, angle, radius):
         """
         Calculates the position in the display for each menu item.
         """
         
-        coord = int(center[0] + math.cos(angle)*radius),int(center[1] + math.sin(angle)*radius)    
+        coord = int(center[0] + math.cos(angle) * radius), int(center[1] + math.sin(angle) * radius)    
         if(coord[0] < center[0]): 
             if(coord[1] > center[1]): #third quadrant
                 item.rect.topright = coord
@@ -116,27 +124,31 @@ class Menu:
             if(coord[1] > center[1]):
                 item.rect.midbottom = coord
             else:
-                item.rect.midtop =coord
+                item.rect.midtop = coord
 
 class Item:
     
-    def __init__(self,name,icon_path,tooltip,subitems_list):
+    def __init__(self, name, icon_path, tooltip, subitems_list):
+        path = os.path.normpath(icon_path)
         self.name = name
-        self.image = pygame.image.load(icon_path)
+        self.image = pygame.image.load(path)
         self.rect = self.image.get_rect()
         self.tooltip = tooltip
         self.subitems_list = subitems_list
         
-    def add_subitem(self,item):
+    def add_subitem(self, item):
         """
         Append a subitem to the item list
         """
         self.subitems_list.append(item)
 
-    def draw_item(self,screen,font):
-        img_font=font.render(self.name,True,(0,0,0))
-        screen.blit(self.image,self.rect)
-        screen.blit(img_font,self.rect.topright)
+    def draw_item(self, screen, font):
+        """
+        draw the item in the screen
+        """
+        img_font = font.render(self.name, True, (0, 0, 0))
+        screen.blit(self.image, self.rect)
+        screen.blit(img_font, self.rect.topright)
     
     def on_mouse_over(self):
         return
diff --git a/Saludame.activity/menucreator.py b/Saludame.activity/menucreator.py
index d036dca..428a9db 100644..100755
--- a/Saludame.activity/menucreator.py
+++ b/Saludame.activity/menucreator.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import menu
 
 example = [
@@ -18,18 +20,18 @@ example = [
 ]
 
 def load_menu():
-    item_list=[]
+    item_list = []
     for item in example:
         an_item = create_item(item)
         item_list.append(an_item)
-    m = menu.Menu(1,item_list)
+    m = menu.Menu(1, item_list,(190,130),90)
     return m
     
 
 def create_item(item_tuple):
     if(item_tuple[3] != None):
-        an_item = menu.Item(item_tuple[0],item_tuple[1],item_tuple[2],[create_item(sub_item) for sub_item in item_tuple[3]])
+        an_item = menu.Item(item_tuple[0], item_tuple[1], item_tuple[2], [create_item(sub_item) for sub_item in item_tuple[3]])
     else:
-        an_item = menu.Item(item_tuple[0],item_tuple[1],item_tuple[2],[])
+        an_item = menu.Item(item_tuple[0], item_tuple[1], item_tuple[2], [])
     return an_item
-    
\ No newline at end of file
+    
diff --git a/Saludame.activity/setup.py b/Saludame.activity/setup.py
index 530f97c..530f97c 100644..100755
--- a/Saludame.activity/setup.py
+++ b/Saludame.activity/setup.py
diff --git a/Saludame.activity/sugargame/__init__.py b/Saludame.activity/sugargame/__init__.py
index 439eb0c..439eb0c 100644..100755
--- a/Saludame.activity/sugargame/__init__.py
+++ b/Saludame.activity/sugargame/__init__.py
diff --git a/Saludame.activity/sugargame/canvas.py b/Saludame.activity/sugargame/canvas.py
index 05f9a9e..05f9a9e 100644..100755
--- a/Saludame.activity/sugargame/canvas.py
+++ b/Saludame.activity/sugargame/canvas.py
diff --git a/Saludame.activity/sugargame/event.py b/Saludame.activity/sugargame/event.py
index 60eeb47..60eeb47 100644..100755
--- a/Saludame.activity/sugargame/event.py
+++ b/Saludame.activity/sugargame/event.py
diff --git a/Saludame.activity/utilities.py b/Saludame.activity/utilities.py
index ec1f24c..ec1f24c 100644..100755
--- a/Saludame.activity/utilities.py
+++ b/Saludame.activity/utilities.py
diff --git a/Saludame.activity/window.py b/Saludame.activity/window.py
index e0d67f1..e0d67f1 100644..100755
--- a/Saludame.activity/window.py
+++ b/Saludame.activity/window.py