Merge 1b07f905af into 783fcf3a3c

Accessible.gd

@@ -6,6 +6,10 @@ var position_in_children = 0
 
 var column_in_row = 0
 
+var screen_reader
+
+var TTS
+
 
 func get_siblings():
 	var parent = node.get_parent()
@@ -15,7 +19,8 @@ func get_siblings():
 
 
 func click(item := node, button_index = BUTTON_LEFT):
-	print_debug("Click")
+	if screen_reader.logging:
+		print_debug("Click")
 	var click = InputEventMouseButton.new()
 	click.button_index = button_index
 	click.pressed = true
@@ -77,7 +82,7 @@ func _accept_dialog_focused():
 
 func _accept_dialog_about_to_show():
 	_accept_dialog_speak()
-	ScreenReader.should_stop_on_focus = false
+	screen_reader.should_stop_on_focus = false
 
 
 func _basebutton_button_down():
@@ -181,7 +186,8 @@ func item_list_item_focused(idx):
 func item_list_focused():
 	var count = node.get_item_count()
 	var selected = node.get_selected_items()
-	print_debug(selected)
+	if screen_reader.logging:
+		print_debug(selected)
 	if len(selected) == 0:
 		if node.get_item_count() == 0:
 			return TTS.speak("list, 0 items", false)
@@ -312,7 +318,8 @@ func popup_menu_focused():
 
 
 func popup_menu_item_id_focused(index):
-	print_debug("item id focus %s" % index)
+	if screen_reader.logging:
+		print_debug("item id focus %s" % index)
 	var tokens = PoolStringArray([])
 	var shortcut = node.get_item_shortcut(index)
 	var name
@@ -586,10 +593,11 @@ func tab_container_input(event):
 
 
 func focused():
-	print_debug("Focus: %s" % node)
-	if ScreenReader.should_stop_on_focus:
+	if screen_reader.logging:
+		print_debug("Focus: %s" % node)
+	if screen_reader.should_stop_on_focus:
 		TTS.stop()
-	ScreenReader.should_stop_on_focus = true
+	screen_reader.should_stop_on_focus = true
 	if not node is Label:
 		var label = _guess_label()
 		if label:
@@ -633,7 +641,8 @@ func focused():
 		tree_focused()
 	else:
 		TTS.speak(node.get_class(), true)
-		print_debug("No handler")
+		if screen_reader.logging:
+			print_debug("No handler")
 	if node.hint_tooltip and not spoke_hint_tooltip:
 		TTS.speak(node.hint_tooltip, false)
 	spoke_hint_tooltip = false
@@ -733,7 +742,9 @@ func editor_inspector_section_input(event):
 			TTS.speak("collapsed", true)
 
 
-func _init(node):
+func _init(node, reader, tts):
+	screen_reader = reader
+	TTS = tts
 	name = "Accessible for " + node.name
 	if node.is_in_group("accessible"):
 		return

Plugin.gd

@@ -5,9 +5,36 @@ var ScreenReader = preload("ScreenReader.gd")
 
 var screen_reader
 
+var TTS
+
+var editor_settings
+
+const settings_path = "interface/accessibility/"
+
+
+func _initialise_settings() -> void:
+	editor_settings = get_editor_interface().get_editor_settings()
+	_add_setting("In_Editor", TYPE_BOOL, false)
+	_add_setting("Logging", TYPE_BOOL, false)
+	_add_setting("Speech_Rate", TYPE_INT, 50)
+	
+	
+func _add_setting(title: String, type: int, value, hint_type: int = -1, hint_string = "") -> void:
+	title = title.insert(0, settings_path)
+	if editor_settings.has_setting(title):
+		return
+	editor_settings.set(title, value)
+	var prop: Dictionary = {}
+	prop["name"] = title
+	prop["type"] = type
+	if hint_type > -1:
+		prop["hint"] = hint_type
+		prop["hint_string"] = hint_string
+	editor_settings.add_property_info(prop)
+
 
 func set_initial_screen_focus(screen):
-	if not screen_reader.enabled:
+	if not screen_reader or not screen_reader.enabled:
 		return
 	TTS.speak("%s: screen" % screen, false)
 	var control = screen_reader.find_focusable_control(get_tree().root)
@@ -22,20 +49,15 @@ func set_initial_screen_focus(screen):
 
 
 func _enter_tree():
-	var editor_accessibility_enabled = true
-	add_autoload_singleton("TTS", "res://addons/godot-tts/TTS.gd")
-	var rate = TTS.normal_rate
-	var config = ConfigFile.new()
-	var err = config.load("res://.godot-accessibility-editor-settings.ini")
-	if not err:
-		editor_accessibility_enabled = config.get_value(
-			"global", "editor_accessibility_enabled", true
-		)
-		rate = config.get_value("speech", "rate", 50)
-	if editor_accessibility_enabled:
-		TTS.call_deferred("_set_rate", rate)
+	_initialise_settings()
+	var rate = editor_settings.get_setting(settings_path + "Speech_Rate")
+	var logging = editor_settings.get_setting(settings_path + "Logging")
+	if editor_settings.get_setting(settings_path + "In_Editor"):
 		screen_reader = ScreenReader.new()
 		screen_reader.enable_focus_mode = true
+		screen_reader.logging = logging
+		TTS = screen_reader.TTS
+		TTS.call_deferred("_set_rate", rate)
 		get_tree().root.call_deferred("add_child", screen_reader)
 	add_custom_type("ScreenReader", "Node", preload("ScreenReader.gd"), null)
 
@@ -48,7 +70,7 @@ var _focus_loss_interval = 0
 
 
 func _process(delta):
-	if not screen_reader.enabled:
+	if not screen_reader or not screen_reader.enabled:
 		return
 	var focus = screen_reader.find_focusable_control(get_tree().root)
 	focus = focus.get_focus_owner()

ScreenReader.gd

@@ -11,7 +11,11 @@ signal swipe_down
 
 var Accessible = preload("Accessible.gd")
 
-export var enabled = true setget _set_enabled, _get_enabled
+var TtsClass = preload("../godot-tts/TTS.gd")
+
+var TTS
+
+export var enabled = true
 
 export var min_swipe_distance = 5
 
@@ -21,26 +25,16 @@ export var explore_by_touch_interval = 200
 
 export var enable_focus_mode = false
 
+export var logging = true
+
 var should_stop_on_focus = true
 
-func _set_enabled(v):
-	if enabled:
-		augment_tree(get_tree().root)
-	else:
-		for accessible in get_tree().get_nodes_in_group("accessibles"):
-			accessible.queue_free()
-	enabled = v
-
-
-func _get_enabled():
-	return enabled
-
 
 func augment_node(node):
 	if not enabled:
 		return
 	if node is Control:
-		Accessible.new(node)
+		Accessible.new(node, self, TTS)
 
 
 func augment_tree(node):
@@ -67,15 +61,27 @@ func find_focusable_control(node):
 	return null
 
 
+func _init():
+	TTS = TtsClass.new()
+
+
 func _enter_tree():
 	pause_mode = Node.PAUSE_MODE_PROCESS
 	if enabled:
 		augment_tree(get_tree().root)
-	get_tree().connect("node_added", self, "augment_node")
-	connect("swipe_right", self, "swipe_right")
-	connect("swipe_left", self, "swipe_left")
-	connect("swipe_up", self, "swipe_up")
-	connect("swipe_down", self, "swipe_down")
+	else:
+		for accessible in get_tree().get_nodes_in_group("accessibles"):
+			accessible.queue_free()
+	_safe_connect(get_tree(), "node_added", self, "augment_node")
+	_safe_connect(self, "swipe_right", self, "swipe_right")
+	_safe_connect(self, "swipe_left", self, "swipe_left")
+	_safe_connect(self, "swipe_up", self, "swipe_up")
+	_safe_connect(self, "swipe_down", self, "swipe_down")
+
+
+func _safe_connect(to_object, signal_name, object, method, binds = [], flags = 0):
+	if not to_object.is_connected(signal_name, object, method):
+		to_object.connect(signal_name, object, method, binds, flags)
 
 
 func _press_and_release(action, fake_via_keyboard = false):