Fix global fadout

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / key.py

diff --git a/helpers/key.py b/helpers/key.py
index 57fdef1d5616eb9df83ddf0bf0c18d9fb592d2dc..d923b1dcde7a7d0bbd51ce0b344a24b6d2da1882 100644 (file)
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -1,25 +1,16 @@
 from .rounded_rect import *
 from .action import *
+from .font import font
 import time
 import sys
 import pygame
 
 class Key:
-    row_positions = {
-        'first':    0,
-        'second':  50,
-        'third':  100,
-        'fourth': 150,
-        'fifth':  200,
-        'sixth':  250,
-    }
-
     default_outer_color = (120, 120, 120)
     lighter_outer_color = (200, 200, 200)
     default_inner_color = (255, 255, 255)
     mapped_inner_color  = (  0, 255,   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
@@ -27,11 +18,7 @@ class Key:
         self.key_name = key_name
         self.key_sym  = key_sym
 
-        if isinstance(top, str):
-            self.top = self.row_positions[top]
-        else:
-            self.top = top
-
+        self.top = top
         self.left   = left
         self.width  = width
         self.height = height
@@ -41,6 +28,7 @@ class Key:
 
         self.rect     = (self.left, self.top, self.right, self.bottom)
         self.position = (self.left, self.top)
+        self.disabled = disabled
 
         if disabled:
             self.outer_color = self.lighter_outer_color
@@ -52,15 +40,15 @@ class Key:
         self.inner_color = self.default_inner_color
         self.actions = []
         self.description = []
-        self.custom_color = None
-        self.custom_unready_color = None
+        self.custom_color = self.mapped_inner_color
+        self.custom_unready_color = self.mapped_unready_inner_color
 
     def square(self, all_actions_ready):
         if self.has_actions():
             if all_actions_ready:
-                self.inner_color = self.custom_color or self.mapped_inner_color
+                self.inner_color = self.custom_color
             else:
-                self.inner_color = self.custom_unready_color or self.mapped_unready_inner_color
+                self.inner_color = self.custom_unready_color
 
         return RoundedRect((0, 0, self.width, self.height),
             self.outer_color, self.inner_color, self.linewidth)
@@ -89,12 +77,8 @@ class Key:
 
         self.surface = self.square(all_actions_ready).surface()
 
-        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 = font(14)
+        text_police = font(10)
 
         police.set_bold(True)
         text = police.render(self.key_sym, True, (0,0,0))
@@ -134,27 +118,28 @@ class Key:
     def add_action(self, action_name, **arguments):
         self.actions.append(Action(action_name, self, **arguments))
 
-    def do_actions(self):
+    def do_actions(self, screen):
         print("running actions for {}".format(self.key_sym))
         start_time = time.time()
         self.mapping.start_running(self, start_time)
+        action_number = 0
         for action in self.actions:
             if self.mapping.keep_running(self, start_time):
+                self.list_actions(screen, action_number = action_number + 0.5)
                 action.run()
+                action_number += 1
+                self.list_actions(screen, action_number = action_number)
 
         self.mapping.finished_running(self, start_time)
 
-    def list_actions(self, screen):
+    def list_actions(self, screen, action_number = 0):
         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))
         self.draw_lock.acquire()
         surface = pygame.Surface((690, 250)).convert()
         surface.fill((250, 250, 250))
-        if getattr(sys, 'frozen', False):
-            police = pygame.font.Font(sys._MEIPASS + "/Ubuntu-Regular.ttf", 14)
-        else:
-            police = pygame.font.Font("Ubuntu-Regular.ttf", 14)
+        police = font(14)
 
         offset = 0
         police.set_bold(True)
@@ -163,9 +148,18 @@ class Key:
         offset += police.get_linesize()
 
         police.set_bold(False)
-        for description in action_descriptions:
+        icon_police = font(14, font = "Symbola")
+        for index, description in enumerate(action_descriptions):
+            if index < int(action_number):
+                icon = icon_police.render("✓", True, (0,0,0))
+            elif index + 0.5 == action_number:
+                icon = icon_police.render("✅", True, (0,0,0))
+            else:
+                icon = icon_police.render(" ", True, (0,0,0))
+
             text = police.render(description, True, (0,0,0))
-            surface.blit(text, (0, offset))
+            surface.blit(icon, (0, offset))
+            surface.blit(text, (10, offset))
             offset += police.get_linesize()
 
         screen.blit(surface, (5, 308))