Fix in customization window, now it's able to show restored colors.

5 files changed, 104 insertions, 43 deletions

diff --git a/Saludame.activity/character.py b/Saludame.activity/character.py
index 53771fc..61070af 100755
--- a/Saludame.activity/character.py
+++ b/Saludame.activity/character.py
@@ -1,7 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import pygame
-        
+
+DEFAULT_MAPPINGS = {
+    "hair": (pygame.Color("#000000"), pygame.Color("#191919")),
+    "skin": (pygame.Color("#ffccc7"), pygame.Color("#cba5a0")),
+    "socks": (pygame.Color("#fd8255"), pygame.Color("#db601f")),
+    "shoes": (pygame.Color("#eeea00"), pygame.Color("#938200"))
+}
+
 class Character:
     
     def __init__(self, sex, name, level, score, hair_color, socks_color, skin_color, shoes_color, clothes):
@@ -11,10 +18,8 @@ class Character:
         self.level = level
         
         # visuals
-        self.hair_color = hair_color
-        self.socks_color = socks_color
-        self.skin_color = skin_color
-        self.shoes_color = shoes_color
+        self.mappings = DEFAULT_MAPPINGS.copy()
+        
         self.clothes = 'school'
         self.grade = 5
 
@@ -110,5 +115,3 @@ class Clothes:
         self.clothes_id = clothes_id
         self.texture_path = texture_path
         self.weather_effects_list = weather_effects_list #list of tuples (id_weather, effect_indoor, effect_outdoor)
-
-
diff --git a/Saludame.activity/customization.py b/Saludame.activity/customization.py
index 257e742..ab54214 100755
--- a/Saludame.activity/customization.py
+++ b/Saludame.activity/customization.py
@@ -60,7 +60,7 @@ class CustomizationWindow(window.Window):
         self.add_child(self.kid)
         
         #self.btn_close = utilities.TextButton(self.rect, pygame.Rect((910, 2), (30, 30)), 1, "X", 30, (0, 0, 0), self._cb_button_click_close)
-        self.btn_close = utilities.get_accept_button(self.rect, pygame.Rect((400, 500), (1, 1)), _("Accept"), self._cb_button_click_close)
+        self.btn_close = utilities.get_accept_button(self.rect, pygame.Rect((400, 500), (1, 1)), _("Continue"), self._cb_button_click_close)
         
         button_back = pygame.image.load("customization/customization_button.png").convert_alpha()
         self.btn_hair = utilities.TextButton2(self.rect, pygame.Rect((500, 120), (70, 30)), 1, _("Hair"), 30, (255, 255, 255), button_back, self._cb_button_hair)
@@ -110,6 +110,7 @@ FEMALE_PATH = os.path.normpath("customization/girl.png")
 
 class CustomizatedKid(widget.Widget):
     
+    # Base colors for each part of the picture
     COLOR_MAP = {
         "hair": (pygame.Color("#00ffff"), pygame.Color("#009f9f")),
         "skin": (pygame.Color("#ffccc7"), pygame.Color("#cba5a0")),
@@ -121,16 +122,9 @@ class CustomizatedKid(widget.Widget):
         widget.Widget.__init__(self, container, rect, frame_rate)
         
         self.character = character
+        self.set_gender("male") # Sets the correct picture and applies color mappings
         
-        self.mappings = CustomizatedKid.COLOR_MAP.copy()
-        self.character.mappings = self.mappings # Shares the same dict with the logic
-        
-        self.set_gender("male")
-        
-        self.background = self.kid
-        
-        # hair needs to be mapped apart, because its default color is different to its base color
-        self.set_mapping("hair", (pygame.Color("#000000"), pygame.Color("#191919")))
+        self.dirty = True
     
     def set_mapping(self, key, colors):
         self.character.mappings[key] = tuple(colors)
@@ -158,4 +152,9 @@ class CustomizatedKid(widget.Widget):
             self.set_rect_size(self.kid.get_size())
             self.apply_mappings()
     
-
+    # Override
+    def draw(self, screen):
+        if self.dirty:
+            self.dirty = False
+            self.apply_mappings()
+        return widget.Widget.draw(self, screen)
diff --git a/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo b/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
index 72bad58..3d46651 100644
--- a/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
+++ b/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
diff --git a/Saludame.activity/po/Saludame.pot b/Saludame.activity/po/Saludame.pot
index 813468e..876267c 100644
--- a/Saludame.activity/po/Saludame.pot
+++ b/Saludame.activity/po/Saludame.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 16:47-0200\n"
+"POT-Creation-Date: 2010-12-07 18:49-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,26 +20,38 @@ msgstr ""
 msgid "Saludame"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:79
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:80
 msgid "Constipation"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:84
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:85
 msgid "Diarrhea"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:89
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:90
 msgid "Headache"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:94
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:95
 msgid "Caries"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:99
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:100
 msgid "Stomach ache"
 msgstr ""
 
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:108
+msgid "Prevenir caries"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:112
+msgid "Estudiar"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:116
+msgid "Control médico"
+msgstr ""
+
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:11
 msgid "Eat..."
 msgstr ""
@@ -234,22 +246,38 @@ msgid "Kitchen"
 msgstr ""
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
-msgid "Higiene..."
+msgid "Cambiar de ropa"
 msgstr ""
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
-msgid "Bañarse"
+msgid "School"
 msgstr ""
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
-msgid "Lavarse los dientes"
+msgid "Sunny"
 msgstr ""
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+msgid "Rainy"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
+msgid "Higiene..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
+msgid "Bañarse"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
+msgid "Lavarse los dientes"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:96
 msgid "Lavarse las manos"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:91
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:97
 msgid "Ir al baño"
 msgstr ""
 
@@ -341,12 +369,12 @@ msgstr ""
 msgid "Next >"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/panel_window.py:65
+#: /home/pmoleri/saludame/Saludame.activity/panel_window.py:76
 msgid "Customization module"
 msgstr ""
 
 #: /home/pmoleri/saludame/Saludame.activity/customization.py:63
-msgid "Accept"
+msgid "Continue"
 msgstr ""
 
 #: /home/pmoleri/saludame/Saludame.activity/customization.py:66
diff --git a/Saludame.activity/po/es.po b/Saludame.activity/po/es.po
index a4c50f1..74e078a 100755
--- a/Saludame.activity/po/es.po
+++ b/Saludame.activity/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 16:47-0200\n"
+"POT-Creation-Date: 2010-12-07 18:49-0200\n"
 "PO-Revision-Date: 2010-11-07 20:45-0200\n"
 "Last-Translator: Pablo Moleri <pmoleri@gmail.com>\n"
 "Language-Team: Spanish\n"
@@ -21,26 +21,38 @@ msgstr ""
 msgid "Saludame"
 msgstr "Salúdame"
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:79
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:80
 msgid "Constipation"
 msgstr "Constipación"
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:84
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:85
 msgid "Diarrhea"
 msgstr "Diarrea"
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:89
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:90
 msgid "Headache"
 msgstr "Dolor de cabeza"
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:94
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:95
 msgid "Caries"
 msgstr "Caries"
 
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:99
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:100
 msgid "Stomach ache"
 msgstr "Dolor de panza"
 
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:108
+msgid "Prevenir caries"
+msgstr "Prevenir caries"
+
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:112
+msgid "Estudiar"
+msgstr "Estudiar"
+
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:116
+msgid "Control médico"
+msgstr "Control médico"
+
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:11
 msgid "Eat..."
 msgstr "Comer..."
@@ -235,22 +247,38 @@ msgid "Kitchen"
 msgstr "Cocina"
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
+msgid "Cambiar de ropa"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
+msgid "School"
+msgstr "Escuela"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
+msgid "Sunny"
+msgstr "Caluroso"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+msgid "Rainy"
+msgstr "Luvioso"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
 msgid "Higiene..."
 msgstr "Higiene..."
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
 msgid "Bañarse"
 msgstr "Bañarse"
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
 msgid "Lavarse los dientes"
 msgstr "Lavarse los dientes"
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:96
 msgid "Lavarse las manos"
 msgstr "Lavarse las manos"
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:91
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:97
 msgid "Ir al baño"
 msgstr "Ir al baño"
 
@@ -342,13 +370,13 @@ msgstr "< Atrás"
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: /home/pmoleri/saludame/Saludame.activity/panel_window.py:65
+#: /home/pmoleri/saludame/Saludame.activity/panel_window.py:76
 msgid "Customization module"
 msgstr "Personalización"
 
 #: /home/pmoleri/saludame/Saludame.activity/customization.py:63
-msgid "Accept"
-msgstr "Aceptar"
+msgid "Continue"
+msgstr "Continuar"
 
 #: /home/pmoleri/saludame/Saludame.activity/customization.py:66
 msgid "Hair"
@@ -490,6 +518,9 @@ msgstr "Responsabilidad"
 msgid "Tiempo Libre"
 msgstr "Tiempo libre"
 
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
 #~ msgid "Do sports..."
 #~ msgstr "Hacer deportes..."