X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler%2Fmusic_sampler.kv;h=55df12cfb34eee04f96b46bcae61e8e4067d69b5;hb=7b4791cfb73136db35160989c08660db55c3c34e;hp=afb99e411907a9e0c7de411bdb9f98a3f2d5f68a;hpb=60aa2bed939858f9aec4252071c8efd99baac7e3;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler/music_sampler.kv b/music_sampler/music_sampler.kv
index afb99e4..55df12c 100644
--- a/music_sampler/music_sampler.kv
+++ b/music_sampler/music_sampler.kv
@@ -1,5 +1,4 @@
 #:import math math
-#:import h music_sampler
 
 <Key>:
   pad_col_sep: 0 if not self.pad_cols else self.parent.pad_x
@@ -18,6 +17,8 @@
   key_height: 1
   width: self.key_width * (self.parent.key_size + self.parent.key_sep) - self.parent.key_sep
   height: self.key_height * (self.parent.key_size + self.parent.key_sep) - self.parent.key_sep
+  normal_font_size: self.parent.font_size
+  smaller_font_size: math.ceil(2 * math.sqrt(self.parent.key_size / 2))
   canvas.before:
     Color:
       rgba: self.color
@@ -29,20 +30,20 @@
       rgba: self.line_color
     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
+      width: self.line_width or 2
     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
+      width: self.line_width or 2
     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
+      width: self.line_width or 2
   Label:
     id: key_label
     font_name: "Ubuntu"
     bold: True
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size))
+    font_size: self.parent.normal_font_size or 10
     color: 0, 0, 0, 1
     text: self.parent.key_sym
     text_size: self.parent.width,self.font_size
@@ -54,7 +55,7 @@
   Label:
     id: key_description_title
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size / 2))
+    font_size: self.parent.smaller_font_size or 8
     color: 0, 0, 0, 1
     text: self.parent.description_title
     text_size: self.parent.width - 2*self.parent.line_width, self.font_size
@@ -65,7 +66,7 @@
   Label:
     id: key_description
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size / 2))
+    font_size: self.parent.smaller_font_size or 8
     color: 0, 0, 0, 1
     text: "\n".join(self.parent.description)
     text_size: 2 * self.parent.width,self.parent.height - key_label.font_size
@@ -75,6 +76,22 @@
     size_hint: None, None
     size: 2 * self.parent.width - 2 * self.parent.line_width, self.parent.height - key_label.font_size
 
+<UnfocusedOverlay>:
+  canvas.before:
+    Color:
+      rgba: 1, 0, 0, 0.9
+    Rectangle:
+      pos: 0, 0
+      size: self.width, self.height
+  size_hint: 1, 1
+  color: 1, 1, 1, 1
+  valign: "middle"
+  halign: "center"
+  font_name: "Ubuntu"
+  font_size: self.parent and 2 * self.parent.key_size or 42
+  text_size: self.size
+  text: _("Focus lost!")
+
 <Screen>:
   canvas:
     Color:
@@ -109,35 +126,13 @@
   play_list_y: self.border
   play_list_x: self.action_list_width + self.key_list_width + 3 * self.border
 
-  max_height: max(mock_symbola.height, mock_ubuntu_regular.height, mock_ubuntu_bold.height)
-  min_height: min(mock_symbola.height, mock_ubuntu_regular.height, mock_ubuntu_bold.height)
-  symbola_line_height: self.min_height / max(mock_symbola.height,1)
-  ubuntu_regular_line_height: self.min_height / max(mock_ubuntu_regular.height,1)
-  ubuntu_bold_line_height: self.min_height / max(mock_ubuntu_bold.height,1)
+  font_size: math.ceil(2 * math.sqrt(self.key_size or 10))
+  max_height: 1.3 * self.font_size
 
-  Label:
-    id: mock_symbola
-    font_name: "Symbola"
-    font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
-    color: 0, 0, 0, 0
-    text: "A"
-    text_size: None, None
-    size_hint: None, None
-    size: self.texture_size
   Label:
     id: mock_ubuntu_regular
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
-    color: 0, 0, 0, 0
-    text: "A"
-    text_size: None, None
-    size_hint: None, None
-    size: self.texture_size
-  Label:
-    id: mock_ubuntu_bold
-    font_name: "Ubuntu"
-    bold: True
-    font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 0
     text: "A"
     text_size: None, None
@@ -167,6 +162,7 @@
     size: self.parent.play_list_width, self.parent.play_list_height
 
 <KeyList>:
+  font_size: self.parent.font_size or 10
   size_hint: None, None
   canvas:
     Color:
@@ -178,7 +174,7 @@
     id: key_list_first
     font_name: "Ubuntu"
     bold: True
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 1
     text: self.parent.first_key
     text_size: None, None
@@ -190,7 +186,7 @@
   Label:
     id: key_list_second
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 1
     text: self.parent.second_key
     text_size: None, None
@@ -202,7 +198,7 @@
   Label:
     id: key_list_third
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 0.75
     text: self.parent.third_key
     text_size: None, None
@@ -214,7 +210,7 @@
   Label:
     id: key_list_rest
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 0.5
     text: "\n".join(self.parent.keylist[3:])
     text_size: None, None
@@ -227,6 +223,7 @@
 <ActionList>:
   size_hint: None, None
   labels_height: self.parent.max_height or 1
+  font_size: self.parent.font_size or 10
   canvas:
     Color:
       rgba: 250./255, 250./255, 250./255, 1
@@ -237,7 +234,7 @@
     id: action_list_title
     font_name: "Ubuntu"
     bold: True
-    font_size: math.ceil(2 * math.sqrt(self.parent.parent.key_size or 10))
+    font_size: self.parent.font_size
     color: 0, 0, 0, 1
     text: self.parent.action_title
     text_size: None, self.parent.height
@@ -246,15 +243,21 @@
     size_hint: None, None
     size: self.texture_size[0], self.parent.height
   ActionListIcons:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     size_hint: 0.02, 0.9
     pos_hint: { 'x': 0, 'top': 0.9 }
   ActionListDescriptions:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     size_hint: 0.98, 0.9
     pos_hint: { 'x': 0.02, 'top': 0.9 }
 
 <ActionListIcon>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Symbola"
   color: 0, 0, 0, 1
   text_size: None, None
@@ -263,6 +266,8 @@
   width: self.texture_size[0]
 
 <ActionListDescription>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Ubuntu"
   color: 0, 0, 0, 1
   text_size: self.width, None
@@ -275,6 +280,7 @@
 <PlayList>:
   size_hint: None, None
   labels_height: self.parent.max_height or 1
+  font_size: self.parent.font_size or 10
   canvas:
     Color:
       rgba: 250./255, 250./255, 250./255, 1
@@ -282,19 +288,27 @@
       pos:  0, 0
       size: self.width, self.height
   PlayListIcons:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     size_hint: 0.05, 1
     pos_hints: { 'x': 0, 'top': 0 }
   PlayListNames:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     pos_hint: { 'x': 0.05, 'bottom': 0 }
     size_hint: 0.65, 1
   PlayListTimes:
+    font_size: self.parent.font_size
+    labels_height: self.parent.labels_height
     orientation: 'lr-tb'
     pos_hint: { 'x': 0.7, 'bottom': 0 }
     size_hint: 0.30, 1
  
 <PlayListIcon>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Symbola"
   color: 0, 0, 0, 1
   text_size: None, None
@@ -303,6 +317,8 @@
   width: self.texture_size[0]
 
 <PlayListName>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   font_name: "Ubuntu"
   color: 0, 0, 0, 1
   text_size: self.width, None
@@ -313,6 +329,8 @@
   size_hint: 1, None
 
 <PlayListTime>:
+  font_size: self.parent and self.parent.font_size or 10
+  height: self.parent and self.parent.labels_height or 0
   canvas.before:
     Color:
       rgba: 250./255, 250./255, 250./255, 1
@@ -329,6 +347,7 @@
 <Mapping>:
   size_hint: None, None
   key_size: 48
+  font_size: self.parent.font_size
   key_sep: 2
   key_pad_sep: 7
   pad_x: 755
@@ -345,9 +364,9 @@
       size: self.key_size / 3, self.key_size / 3
   Label:
     font_name: "Ubuntu"
-    font_size: math.ceil(2 * math.sqrt(self.parent.key_size or 10))
+    font_size: self.parent.font_size or 10
     color: 0, 0, 0, 1
-    text: "volume: {}%".format(self.parent.master_volume)
+    text: _("volume: {}%").format(self.parent.master_volume)
     valign: "top"
     size_hint: None, None
     size: self.texture_size[0], self.texture_size[1]
@@ -592,6 +611,8 @@
     key_sym: "^"
     row: 3
     col: 12.5
+    line_width: 1
+    enabled: False
   Key:
     id: Key_36
     key_code: 36
@@ -613,8 +634,6 @@
     row: 4
     col: 1
     key_width: 1.75
-    line_width: 1
-    enabled: False
 
   Key:
     id: Key_113