X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.kv;h=a18eb4e5395c77aa0f0093f009aa0c0cbeb09aa1;hb=35bde798b6cda13579337b0ec5a803fdd5eab19a;hp=882112d1c12a366326d67137d106f20442d3fd67;hpb=1094ab1ac48313b0c1caec15bc4fb6c584efa047;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.kv b/music_sampler.kv
index 882112d..a18eb4e 100644
--- a/music_sampler.kv
+++ b/music_sampler.kv
@@ -30,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
@@ -44,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
@@ -55,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)
@@ -106,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"
@@ -115,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"
@@ -124,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"
@@ -164,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
@@ -176,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
@@ -188,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
@@ -200,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:])
@@ -222,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
@@ -233,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
@@ -245,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
@@ -268,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
@@ -280,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
@@ -299,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
@@ -329,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)