Cleanup and porting dialog, still broken

annejan · annejan · commit fbdc1fd5c843 · 2017-07-05T21:15:29.000+02:00
diff --git a/esp32/modules/dialogs.py b/esp32/modules/dialogs.py
@@ -5,6 +5,8 @@
 
 import ugfx, badge, utime as time
 
+wait_for_interupt = True
+
 def notice(text, title="SHA2017", close_text="Close", width = 296, height = 128, font="Roboto_Regular12"):
 	prompt_boolean(text, title = title, true_text = close_text, false_text = None, width = width, height = height, font=font)
 
@@ -14,10 +16,12 @@ def prompt_boolean(text, title="SHA2017", true_text="Yes", false_text="No", widt
 	if 'false_text' is set to None only one button is displayed.
 	If both 'true_text' and 'false_text' are given a boolean is returned
 	"""
+	global wait_for_interupt
+
 	window = ugfx.Container((ugfx.width() - width) // 2, (ugfx.height() - height) // 2,  width, height)
 	window.show()
 	ugfx.set_default_font(font)
-	window.text(5, 10, title, TILDA_COLOR)
+	window.text(5, 10, title, ugfx.BLACK)
 	window.line(0, 30, width, 30, ugfx.BLACK)
 
 	if false_text:
@@ -31,15 +35,17 @@ def prompt_boolean(text, title="SHA2017", true_text="Yes", false_text="No", widt
 	try:
 		ugfx.input_init()
 
-		# button_yes.attach_input(ugfx.BTN_A,0)
-		# if button_no: button_no.attach_input(ugfx.BTN_B,0)
+		button_yes.attach_input(ugfx.BTN_A,0)
+		if button_no: button_no.attach_input(ugfx.BTN_B,0)
 
 		window.show()
+		ugfx.flush()
 
-		# while True:
-		# 	pyb.wfi() # TODO make this!!
-		# 	if buttons.is_triggered("BTN_A"): return True
-		# 	if buttons.is_triggered("BTN_B"): return False
+		wait_for_interupt = True
+		while wait_for_interupt:
+			if buttons.is_triggered("BTN_A"): return True
+			if buttons.is_triggered("BTN_B"): return False
+			time.sleep(0.2)
 
 	finally:
 		window.hide()
@@ -53,6 +59,7 @@ def prompt_text(description, init_text = "", true_text="OK", false_text="Back",
 
 	Returns None if user aborts with button B
 	"""
+	global wait_for_interupt
 
 	window = ugfx.Container(int((ugfx.width()-width)/2), int((ugfx.height()-height)/2), width, height)
 
@@ -75,18 +82,18 @@ def prompt_text(description, init_text = "", true_text="OK", false_text="Back",
 	try:
 		ugfx.input_init()
 
-		# button_yes.attach_input(ugfx.BTN_MENU,0)
-		# if button_no: button_no.attach_input(ugfx.BTN_B,0)
-		# TODO ^^
+		button_yes.attach_input(ugfx.BTN_MENU,0)
+		if button_no: button_no.attach_input(ugfx.BTN_B,0)
 
 		window.show()
 		edit.set_focus()
-		# while True:
-			# pyb.wfi()
-			# ugfx.poll()
-			# #if buttons.is_triggered("BTN_A"): return edit.text()
-			# if buttons.is_triggered("BTN_B"): return None
-			# if buttons.is_triggered("BTN_MENU"): return edit.text()
+		ugfx.flush()
+
+		wait_for_interupt = True
+		while wait_for_interupt:
+			#if buttons.is_triggered("BTN_A"): return edit.text()
+			if buttons.is_triggered("BTN_B"): return None
+			if buttons.is_triggered("BTN_MENU"): return edit.text()
 
 	finally:
 		window.hide()
@@ -104,6 +111,8 @@ def prompt_option(options, index=0, text = "Please select one of the following:"
 	If none_text is specified the user can use the B or Menu button to skip the selection
 	if title is specified a blue title will be displayed about the text
 	"""
+	global wait_for_interupt
+
 	ugfx.set_default_font("Roboto_Regular12")
 	window = ugfx.Container(5, 5, ugfx.width() - 10, ugfx.height() - 10)
 	window.show()
@@ -136,12 +145,11 @@ def prompt_option(options, index=0, text = "Please select one of the following:"
 	try:
 		ugfx.input_init()
 
-		# while True:
-		# 	pyb.wfi()  # BLABLA TODO
-		# 	ugfx.poll()
-		# 	if buttons.is_triggered("BTN_A"): return options[options_list.selected_index()]
-		# 	if button_none and buttons.is_triggered("BTN_B"): return None
-		# 	if button_none and buttons.is_triggered("BTN_MENU"): return None
+		wait_for_interupt = True
+		while wait_for_interupt:
+			if buttons.is_triggered("BTN_A"): return options[options_list.selected_index()]
+			if button_none and buttons.is_triggered("BTN_B"): return None
+			if button_none and buttons.is_triggered("BTN_MENU"): return None
 
 	finally:
 		window.hide()
@@ -153,10 +161,10 @@ def prompt_option(options, index=0, text = "Please select one of the following:"
 
 class WaitingMessage:
 	"""Shows a dialog with a certain message that can not be dismissed by the user"""
-	def __init__(self, text = "Please Wait...", title="TiLDA"):
+	def __init__(self, text = "Please Wait...", title="SHA2017Badge"):
 		self.window = ugfx.Container(30, 30, ugfx.width() - 60, ugfx.height() - 60)
 		self.window.show()
-		self.window.text(5, 10, title, TILDA_COLOR)
+		self.window.text(5, 10, title, ugfx.BLACK)
 		self.window.line(0, 30, ugfx.width() - 60, 30, ugfx.BLACK)
 		self.label = ugfx.Label(5, 40, self.window.width() - 10, ugfx.height() - 40, text = text, parent=self.window)
 
@@ -183,3 +191,6 @@ def __enter__(self):
 
 	def __exit__(self, exc_type, exc_value, traceback):
 		self.destroy()
+
+ugfx.input_attach(ugfx.BTN_A, lambda pushed: wait_for_interupt = False)
+ugfx.input_attach(ugfx.BTN_B, lambda pushed: wait_for_interupt = False)
