4 files changed, 51 insertions, 7 deletions

diff --git a/helpers/__init__.py b/helpers/__init__.py
index b1723ee..b7acbf5 100644
--- a/helpers/__init__.py
+++ b/helpers/__init__.py
@@ -47,3 +47,13 @@ def parse_config(mapping):
                     action_args[argument] = action[action_name][argument]
 
             key.add_action(action_name, **action_args)
+
+    for key_property in config['key_properties']:
+        key = mapping.find_by_unicode(key_property)
+        if key is None:
+            continue
+
+        if 'description' in config['key_properties'][key_property]:
+            key.set_description(config['key_properties'][key_property]['description'])
+        if 'color' in config['key_properties'][key_property]:
+            key.set_color(config['key_properties'][key_property]['color'])
diff --git a/helpers/action.py b/helpers/action.py
index 97873a0..5afe437 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -74,10 +74,14 @@ class Action:
         else:
             pass
 
-    def wait(self, duration = 0, **kwargs):
+    def wait(self, duration = 0, music = None, **kwargs):
         # FIXME: Make it stoppable
         # http://stackoverflow.com/questions/29082268/python-time-sleep-vs-event-wait
-        time.sleep(duration)
+        if music is None:
+            time.sleep(duration)
+        else:
+            # TODO
+            music.wait_end()
 
     def command_print(self, command = "", **kwargs):
         return "running command {}".format(command)
diff --git a/helpers/key.py b/helpers/key.py
index 6997e70..9a6cb3b 100644
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -18,7 +18,8 @@ class Key:
     lighter_outer_color = (200, 200, 200)
     default_inner_color = (255, 255, 255)
     mapped_inner_color  = (  0, 255,   0)
-    mapped_unready_inner_color = (255, 165, 0)
+    mapped_unready_inner_color  = (  0, 255,   0, 100)
+    #mapped_unready_inner_color = (255, 165, 0)
 
     def __init__(self, mapping, draw_lock, key_name, key_sym, top, left, width = 48, height = 48, disabled = False):
         self.draw_lock = draw_lock
@@ -50,13 +51,16 @@ class Key:
 
         self.inner_color = self.default_inner_color
         self.actions = []
+        self.description = []
+        self.custom_color = None
+        self.custom_unready_color = None
 
     def square(self, all_actions_ready):
         if self.has_actions():
             if all_actions_ready:
-                self.inner_color = self.mapped_inner_color
+                self.inner_color = self.custom_color or self.mapped_inner_color
             else:
-                self.inner_color = self.mapped_unready_inner_color
+                self.inner_color = self.custom_unready_color or self.mapped_unready_inner_color
 
         return RoundedRect((0, 0, self.width, self.height),
             self.outer_color, self.inner_color, self.linewidth)
@@ -67,6 +71,14 @@ class Key:
                 position[1] - self.position[1]
                 )
 
+    def set_description(self, description):
+        self.description = description
+
+    def set_color(self, color):
+        self.custom_color = tuple(color)
+        color.append(100)
+        self.custom_unready_color = tuple(color)
+
     def draw(self, background_surface):
         self.draw_lock.acquire()
         all_actions_ready = self.all_actions_ready()
@@ -75,11 +87,27 @@ class Key:
 
         if getattr(sys, 'frozen', False):
             police = pygame.font.Font(sys._MEIPASS + "/Ubuntu-Regular.ttf", 14)
+            text_police = pygame.font.Font(sys._MEIPASS + "/Ubuntu-Regular.ttf", 10)
         else:
             police = pygame.font.Font("Ubuntu-Regular.ttf", 14)
+            text_police = pygame.font.Font("Ubuntu-Regular.ttf", 10)
 
+        police.set_bold(True)
         text = police.render(self.key_sym, True, (0,0,0))
         self.surface.blit(text, (5,5))
+
+        is_first_line = True
+        offset = 11 + text_police.get_linesize()
+        first_line_offset = 18
+        for description in self.description:
+            text = text_police.render(description, True, (0,0,0))
+            if is_first_line:
+                self.surface.blit(text, (first_line_offset, 9))
+                is_first_line = False
+            else:
+                self.surface.blit(text, (5, offset))
+                offset += text_police.get_linesize()
+
         background_surface.blit(self.surface, self.position)
         self.draw_lock.release()
 
@@ -114,8 +142,8 @@ class Key:
 
     def list_actions(self, screen):
         action_descriptions = [action.description() for action in self.actions]
-        print("actions linked to key {}:".format(self.key_sym))
-        print("\t" + "\n\t".join(action_descriptions))
+        #print("actions linked to key {}:".format(self.key_sym))
+        #print("\t" + "\n\t".join(action_descriptions))
         self.draw_lock.acquire()
         surface = pygame.Surface((800, 250)).convert()
         surface.fill((250, 250, 250))
diff --git a/helpers/music_file.py b/helpers/music_file.py
index 36a7dd9..b834104 100644
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -56,3 +56,5 @@ class MusicFile:
             value = 100
         self.sound.set_volume(value / 100)
 
+    def wait_end(self):
+        pass