X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.kv;h=fa3862724bd73c6e7a642d32be0048cfa545d1a3;hb=635dea02d27ba499861085f8c7ead14d685bddf6;hp=87c6e9338be910d4850668448dfce90880447f6f;hpb=98ff43054fe94f333e2deda2906cd62593ded1d8;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.kv b/music_sampler.kv
index 87c6e93..fa38627 100644
--- a/music_sampler.kv
+++ b/music_sampler.kv
@@ -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,6 +30,14 @@
     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"
@@ -293,6 +300,12 @@
     pos: 15, self.y
     size: self.texture_size[0], self.parent.height
   Label:
+    canvas.before:
+      Color:
+        rgba: 250./255, 250./255, 250./255, 1
+      Rectangle:
+        pos:  self.pos
+        size: self.width, self.height
     id: playlist_times
     font_name: h.path() + "fonts/Ubuntu-Regular.ttf"
     line_height: self.parent.parent.ubuntu_regular_line_height or 1
@@ -318,6 +331,21 @@
     Rectangle:
       pos:  0, 0
       size: self.width, self.height
+    Color:
+      rgba: self.ready_color
+    Ellipse:
+      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_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
+    color: 0, 0, 0, 1
+    text: "volume: {}%".format(self.parent.master_volume)
+    valign: "top"
+    size_hint: None, None
+    size: self.texture_size[0], self.texture_size[1]
+    x: self.parent.width - self.width - 2 * self.parent.key_size / 3
+    center_y: self.parent.height - self.height
   Key:
     id: Key_27
     key_code: 27