show engine's midi_chan when we-re on engine page

leinir · Jul 23, 2021 · eab0b04 · eab0b04
1 parent 24811cf
commit eab0b04
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/qml-ui/main.qml b/qml-ui/main.qml
@@ -64,7 +64,9 @@ Kirigami.AbstractApplicationWindow {
                 highlighted: zynthian.current_screen_id === 'main'
             }
             ZComponentsPrivate.BreadcrumbButton {
-                text: zynthian.layer.selector_path_element + "ˬ"
+                text: screensLayer.layers.depth > 1 && zynthian.engine.midi_channel !== null && zynthian.current_screen_id === 'engine'
+                        ? (zynthian.engine.midi_channel + 1) + "#ˬ"
+                        : zynthian.layer.selector_path_element + "ˬ"
                 onClicked: layersMenu.visible = true
                 highlighted: zynthian.current_screen_id === 'layer'
                 ZComponentsPrivate.ActionsMenu {

diff --git a/zynqtgui/zynthian_gui_engine.py b/zynqtgui/zynthian_gui_engine.py
@@ -39,6 +39,8 @@
 from . import zynthian_gui_config
 from . import zynthian_gui_selector
 
+from PySide2.QtCore import Qt, QObject, Slot, Signal, Property
+
 #------------------------------------------------------------------------------
 # Zynthian Engine Selection GUI Class
 #------------------------------------------------------------------------------
@@ -90,22 +92,28 @@ def __init__(self, parent = None):
 		self.only_categories = False
 		self.single_category = None
 
+	def set_midi_channel(self, chan):
+		self.midi_chan = chan
+		self.midi_channel_changed.emit()
+
+	def get_midi_channel(self):
+		return self.midi_chan
 
 	def set_engine_type(self, etype):
 		self.engine_type = etype
-		self.midi_chan = None
+		self.set_midi_channel(None)
 		self.reset_index = True
 
 
 	def set_fxchain_mode(self, midi_chan):
 		self.engine_type = "Audio Effect"
-		self.midi_chan = midi_chan
+		self.set_midi_channel(midi_chan)
 		self.reset_index = True
 
 
 	def set_midichain_mode(self, midi_chan):
 		self.engine_type = "MIDI Tool"
-		self.midi_chan = midi_chan
+		self.set_midi_channel(midi_chan)
 		self.reset_index = True
 		self.init_engine_info()
 
@@ -230,4 +238,9 @@ def set_select_path(self):
 		self.select_path_element = "Engine"
 		super().set_select_path()
 
+
+	midi_channel_changed = Signal()
+
+	midi_channel = Property(int, get_midi_channel, set_midi_channel, notify = midi_channel_changed)
+
 #------------------------------------------------------------------------------
diff --git a/zynqtgui/zynthian_gui_fixed_layers.py b/zynqtgui/zynthian_gui_fixed_layers.py
@@ -71,7 +71,7 @@ def select_action(self, i, t='S'):
 			self.layer_chain_parallel = False
 			self.zyngui.screens['engine'].set_engine_type("MIDI Synth")
 			self.layer_index_replace_engine = self.index
-			self.zyngui.screens['engine'].midi_chan = self.index
+			self.zyngui.screens['engine'].set_midi_channel(self.index)
 			self.zyngui.show_modal('engine')
 
 

diff --git a/zynqtgui/zynthian_gui_layer.py b/zynqtgui/zynthian_gui_layer.py
@@ -197,7 +197,7 @@ def activate_midican_layer(self, midi_chan):
 			self.replace_layer_index = None
 			self.layer_chain_parallel = False
 			self.zyngui.screens['engine'].set_engine_type("MIDI Synth")
-			self.zyngui.screens['engine'].midi_chan = midi_chan
+			self.zyngui.screens['engine'].set_midi_channel(midi_chan)
 			self.layer_index_replace_engine = None
 			self.zyngui.show_modal('engine')
 
@@ -298,7 +298,7 @@ def select_engine(self):
 		self.layer_chain_parallel = False
 		self.zyngui.screens['engine'].set_engine_type("MIDI Synth")
 		self.layer_index_replace_engine = self.index
-		self.zyngui.screens['engine'].midi_chan = self.layers[self.index].midi_chan
+		self.zyngui.screens['engine'].set_midi_channel(self.layers[self.index].midi_chan)
 		self.zyngui.show_modal('engine')