Code cleanup

[perso/Immae/Projets/Python/MusicSampler.git] / music_sampler / app.py

diff --git a/music_sampler/app.py b/music_sampler/app.py
index 510cb4492c5d86d286678f7a96cefe899531164a..08a8891d0a9f88601ffcfc1fac6689f6f92053a1 100644 (file)
--- a/music_sampler/app.py
+++ b/music_sampler/app.py
@@ -6,16 +6,18 @@ import kivy
 kivy.require("1.9.1")
 from kivy.app import App
 from kivy.uix.floatlayout import FloatLayout
-from kivy.uix.stacklayout import StackLayout
 from kivy.uix.relativelayout import RelativeLayout
 from kivy.properties import ListProperty, StringProperty
 from kivy.core.window import Window
 from kivy.lang import Builder
-from .key import Key
-from .mapping import Mapping
 
 register_fonts()
 
+
+from .key import Key
+from .mapping import Mapping
+
+from .app_blocks.actionlist import *
 from .app_blocks.playlist import *
 
 class KeyList(RelativeLayout):
@@ -35,23 +37,6 @@ class KeyList(RelativeLayout):
         if len(self.keylist) > 2:
             self.third_key  = self.keylist[2]
 
-class ActionList(RelativeLayout):
-    action_title = StringProperty("")
-    action_list = ListProperty([])
-
-    def update_list(self, key, action_descriptions):
-        self.action_title = "actions linked to key {}:".format(key.key_sym)
-        self.action_list = []
-
-        for [action, status] in action_descriptions:
-            if status == "done":
-                icon = "✓"
-            elif status == "current":
-                icon = "✅"
-            else:
-                icon = " "
-            self.action_list.append([icon, action])
-
 class Screen(FloatLayout):
     pass