From 0f85a5c6e415b2f405748dcc66bddc0e6cd25a26 Mon Sep 17 00:00:00 2001
From: jofemodo <fernando@zynthian.org>
Date: Fri, 21 May 2021 17:51:41 +0200
Subject: [PATCH] Replace "snapshot" action by "layer options" (#383)

---
 zyngui/zynthian_gui_main.py | 13 ++++--------
 zynthian_gui.py             | 40 +++++++++++--------------------------
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/zyngui/zynthian_gui_main.py b/zyngui/zynthian_gui_main.py
index f3f756e10..f34d46674 100644
--- a/zyngui/zynthian_gui_main.py
+++ b/zyngui/zynthian_gui_main.py
@@ -54,7 +54,7 @@ def fill_list(self):
 
 		# Snapshot Management
 		self.list_data.append((None,0,"-----------------------------"))
-		self.list_data.append((self.load_snapshot,0,"Snapshots"))
+		self.list_data.append((self.snapshots,0,"Snapshots"))
 		if len(self.zyngui.screens['layer'].layers)>0:
 			self.list_data.append((self.clean_all,0,"CLEAN ALL"))
 
@@ -75,14 +75,9 @@ def layers(self):
 		self.zyngui.show_screen("layer")
 
 
-	def load_snapshot(self):
-		logging.info("Load Snapshot")
-		self.zyngui.load_snapshot()
-
-
-	def save_snapshot(self):
-		logging.info("Save Snapshot")
-		self.zyngui.save_snapshot()
+	def snapshots(self):
+		logging.info("Snapshots")
+		self.zyngui.show_modal("snapshot")
 
 
 	def clean_all(self):
diff --git a/zynthian_gui.py b/zynthian_gui.py
index 2e6517c6d..da4c17840 100755
--- a/zynthian_gui.py
+++ b/zynthian_gui.py
@@ -148,8 +148,7 @@ class zynthian_gui:
 		"83": "SCREEN_PRESET",
 		"84": "SCREEN_CONTROL",
 
-		"90": "MODAL_SNAPSHOT_LOAD",
-		"91": "MODAL_SNAPSHOT_SAVE",
+		"90": "MODAL_SNAPSHOT",
 		"92": "MODAL_AUDIO_RECORDER",
 		"93": "MODAL_MIDI_RECORDER",
 		"94": "MODAL_ALSA_MIXER",
@@ -439,7 +438,7 @@ def show_active_screen(self):
 		self.show_screen()
 
 
-	def show_modal(self, screen, mode=None):
+	def show_modal(self, screen):
 		if screen=="alsa_mixer":
 			if self.modal_screen!=screen and self.screens['layer'].amixer_layer:
 				self._curlayer = self.curlayer
@@ -475,9 +474,9 @@ def cancel_modal_timer(self):
 			self.modal_timer_id = None
 
 
-	def toggle_modal(self, screen, mode=None):
+	def toggle_modal(self, screen):
 		if self.modal_screen!=screen:
-			self.show_modal(screen, mode)
+			self.show_modal(screen)
 		else:
 			self.close_modal()
 
@@ -551,14 +550,6 @@ def calibrate_touchscreen(self):
 		self.show_modal('touchscreen_calibration')
 
 
-	def load_snapshot(self):
-		self.show_modal("snapshot","LOAD")
-
-
-	def save_snapshot(self):
-		self.show_modal("snapshot","SAVE")
-
-
 	def layer_control(self, layer=None):
 		modal = False
 		if layer is not None:
@@ -849,11 +840,8 @@ def callable_ui_action(self, cuia, params=None):
 		elif cuia == "SCREEN_CONTROL":
 			self.show_screen("control")
 
-		elif cuia == "MODAL_SNAPSHOT_LOAD":
-			self.toggle_modal("snapshot", "LOAD")
-
-		elif cuia == "MODAL_SNAPSHOT_SAVE":
-			self.toggle_modal("snapshot", "SAVE")
+		elif cuia == "MODAL_SNAPSHOT":
+			self.toggle_modal("snapshot")
 
 		elif cuia == "MODAL_AUDIO_RECORDER":
 			self.toggle_modal("audio_recorder")
@@ -1036,7 +1024,10 @@ def zynswitch_bold(self,i):
 				self.show_screen('main')
 
 		elif i==2:
-			self.load_snapshot()
+			if self.active_screen=='control':
+				self.show_modal('layer_options')
+			else:
+				self.show_modal('snapshot')
 
 		elif i==3:
 			if self.modal_screen:
@@ -1134,10 +1125,7 @@ def zynswitch_short(self,i):
 					self.modal_screen_back = None
 
 		elif i==2:
-			if self.modal_screen=='snapshot':
-				self.screens['snapshot'].next()
-
-			elif self.modal_screen=='audio_recorder':
+			if self.modal_screen=='audio_recorder':
 				self.show_modal('midi_recorder')
 
 			elif self.modal_screen=='midi_recorder':
@@ -1152,12 +1140,8 @@ def zynswitch_short(self,i):
 				else:
 					self.enter_midi_learn_mode()
 
-			elif len(self.screens['layer'].layers)>0:
-				self.enter_midi_learn_mode()
-				self.show_modal("zs3_learn")
-
 			else:
-				self.load_snapshot()
+				self.show_modal("layer_options")
 
 		elif i==3:
 			if self.modal_screen: