X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.kv;h=905753272f738b8088afd9778793da3d367aad42;hb=63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e;hp=3232956a72041bd0e733ad101bbd0cb0152658df;hpb=1b4b78f5b6df7182ac066fcc26a7b4f0e8586a47;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.kv b/music_sampler.kv
index 3232956..9057532 100644
--- a/music_sampler.kv
+++ b/music_sampler.kv
@@ -1,5 +1,5 @@
 #:import math math
-#:import h helpers
+#:import h music_sampler
 
 <Key>:
   pad_col_sep: 0 if not self.pad_cols else self.parent.pad_x
@@ -8,7 +8,6 @@
   y: (self.parent.top-self.parent.y) - (self.row) * self.parent.key_size - (self.row - 1) * self.parent.key_sep
   x: (self.col - 1) * self.parent.key_size + int(self.col - 1) * self.parent.key_sep + self.pad_col_sep
   size_hint: None, None
-  line_color: 120/255, 120/255, 120/255, 1
   enabled: True
   line_width: 2
   row: 1
@@ -31,9 +30,18 @@
     Line:
       rounded_rectangle: self.x + self.line_width, self.y + self.line_width, self.width - 2 * self.line_width, self.height - 2 * self.line_width, 10
       width: self.line_width
+    Color:
+      rgba: self.line_cross_color
+    Line:
+      points: self.x + self.line_width + 3, self.y + self.line_width + 3, self.x + self.width - 2 * self.line_width - 3, self.y + self.height - 2 * self.line_width - 3
+      width: self.line_width
+    Line:
+      points: self.x + self.line_width + 3, self.y + self.height - 2 * self.line_width - 3, self.x + self.width - 2 * self.line_width - 3, self.y + self.line_width + 3
+      width: self.line_width
   Label:
     id: key_label
-    font_name: h.path() + "fonts/Ubuntu-B.ttf"
+    font_name: "Ubuntu"
+    bold: True
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size))
     color: 0, 0, 0, 1
     text: self.parent.key_sym
@@ -45,7 +53,7 @@
     center_y: self.parent.y + self.parent.height - self.texture_size[1] /2 - 5
   Label:
     id: key_description_title
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size / 2))
     color: 0, 0, 0, 1
     text: self.parent.description_title
@@ -56,7 +64,7 @@
     center_y: self.parent.y + self.parent.height - self.texture_size[1] /2 - 5
   Label:
     id: key_description
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size / 2))
     color: 0, 0, 0, 1
     text: "\n".join(self.parent.description)
@@ -107,7 +115,7 @@
   ubuntu_bold_line_height: self.min_height / max(mock_ubuntu_bold.height,1)
   Label:
     id: mock_symbola
-    font_name: h.path() + "fonts/Symbola.ttf"
+    font_name: "Symbola"
     font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
     color: 0, 0, 0, 0
     text: "A"
@@ -116,7 +124,7 @@
     size: self.texture_size
   Label:
     id: mock_ubuntu_regular
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
     color: 0, 0, 0, 0
     text: "A"
@@ -125,7 +133,8 @@
     size: self.texture_size
   Label:
     id: mock_ubuntu_bold
-    font_name: h.path() + "fonts/Ubuntu-B.ttf"
+    font_name: "Ubuntu"
+    bold: True
     font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
     color: 0, 0, 0, 0
     text: "A"
@@ -165,7 +174,8 @@
       size: self.width, self.height
   Label:
     id: key_list_first
-    font_name: h.path() + "fonts/Ubuntu-B.ttf"
+    font_name: "Ubuntu"
+    bold: True
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 1
     text: self.parent.first_key
@@ -177,7 +187,7 @@
     pos: 0, self.parent.height - self.height
   Label:
     id: key_list_second
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 1
     text: self.parent.second_key
@@ -189,7 +199,7 @@
     pos: 0, self.parent.height - key_list_first.height - self.height
   Label:
     id: key_list_third
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 0.75
     text: self.parent.third_key
@@ -201,7 +211,7 @@
     pos: 0, self.parent.height - key_list_first.height - key_list_second.height - self.height
   Label:
     id: key_list_rest
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 0.5
     text: "\n".join(self.parent.keylist[3:])
@@ -223,7 +233,8 @@
 
   Label:
     id: action_list_title
-    font_name: h.path() + "fonts/Ubuntu-B.ttf"
+    font_name: "Ubuntu"
+    bold: True
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 1
     text: self.parent.action_title
@@ -234,7 +245,7 @@
     size: self.texture_size[0], self.parent.height
   Label:
     id: action_list_icons
-    font_name: h.path() + "fonts/Symbola.ttf"
+    font_name: "Symbola"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     line_height: self.parent.parent.symbola_line_height or 1
     color: 0, 0, 0, 1
@@ -246,7 +257,7 @@
     size: self.texture_size[0], self.parent.height - 3 * self.line_height * self.font_size
   Label:
     id: action_list_names
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     line_height: self.parent.parent.ubuntu_regular_line_height or 1
     color: 0, 0, 0, 1
@@ -269,7 +280,7 @@
 
   Label:
     id: playlist_icons
-    font_name: h.path() + "fonts/Symbola.ttf"
+    font_name: "Symbola"
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     line_height: self.parent.parent.symbola_line_height or 1
     color: 0, 0, 0, 1
@@ -281,7 +292,7 @@
     size: self.texture_size[0], self.parent.height
   Label:
     id: playlist_names
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf" # FIXME: Mettre en gras quand c'est en cours
+    font_name: "Ubuntu" # FIXME: Mettre en gras quand c'est en cours
     line_height: self.parent.parent.ubuntu_regular_line_height or 1
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 1
@@ -300,7 +311,7 @@
         pos:  self.pos
         size: self.width, self.height
     id: playlist_times
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     line_height: self.parent.parent.ubuntu_regular_line_height or 1
     font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
     color: 0, 0, 0, 1
@@ -330,7 +341,7 @@
       pos: self.width - self.key_size / 2, self.height - self.key_size /2
       size: self.key_size / 3, self.key_size / 3
   Label:
-    font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
+    font_name: "Ubuntu"
     font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
     color: 0, 0, 0, 1
     text: "volume: {}%".format(self.parent.master_volume)