Re-write settings system

3 files changed, 71 insertions, 18 deletions

diff --git a/client/menu/settings_menu.gd b/client/menu/settings_menu.gd
index 6b2a7f60..4c14a459 100644
--- a/client/menu/settings_menu.gd
+++ b/client/menu/settings_menu.gd
@@ -15,7 +15,7 @@
 #
 extends Control
 
-@onready var options: VBoxContainer = $outer_gap/panel/inner_gap/options
+@onready var options: VBoxContainer = $OuterGap/Panel/InnerGap/VBoxContainer/ScrollContainer/Options
 @onready var menu_manager: MenuManager = get_parent()
 
 var settings: Dictionary
@@ -26,11 +26,29 @@ func _on_back_pressed():
 	Global.save_settings()
 	menu_manager.go_back()
 
-
 func _ready():
+	update_rows()
+
+func show_graphis():
+	menu_manager.goto("settings_graphics")
+
+func update_rows():
+	for c in options.get_children():
+		c.queue_free()
+	
 	for k in Global.settings.keys():
 		var v = Global.settings[k]
 		var row: SettingsRow = preload("res://menu/settings_row.tscn").instantiate()
-		row.setup(v["description"], v["value"])
+		row.setup(k, Global.settings, Global.default_settings)
+		row.connect("apply_preset", apply_preset)
 		options.add_child(row)
 		settings[k] = row
+
+func apply_preset(preset: Dictionary):
+	for k in settings.keys():
+		Global.settings[k]["value"] = settings[k].get_value()
+	
+	for k in preset.keys():
+		Global.settings[k]["value"] = preset[k]
+	
+	update_rows()
diff --git a/client/menu/settings_menu.tscn b/client/menu/settings_menu.tscn
index 84da46f3..9be24d86 100644
--- a/client/menu/settings_menu.tscn
+++ b/client/menu/settings_menu.tscn
@@ -14,7 +14,7 @@ grow_vertical = 2
 theme = ExtResource("1_foq3a")
 script = ExtResource("2_3hgm8")
 
-[node name="outer_gap" type="MarginContainer" parent="."]
+[node name="OuterGap" type="MarginContainer" parent="."]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -22,11 +22,11 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="panel" type="Panel" parent="outer_gap"]
+[node name="Panel" type="Panel" parent="OuterGap"]
 material = ExtResource("3_8nykw")
 layout_mode = 2
 
-[node name="inner_gap" type="MarginContainer" parent="outer_gap/panel"]
+[node name="InnerGap" type="MarginContainer" parent="OuterGap/Panel"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -38,18 +38,27 @@ theme_override_constants/margin_top = 40
 theme_override_constants/margin_right = 40
 theme_override_constants/margin_bottom = 40
 
-[node name="options" type="VBoxContainer" parent="outer_gap/panel/inner_gap"]
+[node name="VBoxContainer" type="VBoxContainer" parent="OuterGap/Panel/InnerGap"]
 layout_mode = 2
 
-[node name="title" type="Label" parent="outer_gap/panel/inner_gap/options"]
+[node name="Title" type="Label" parent="OuterGap/Panel/InnerGap/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 0
 theme_override_font_sizes/font_size = 36
 text = "Settings"
 
-[node name="back" type="Button" parent="outer_gap/panel/inner_gap"]
+[node name="ScrollContainer" type="ScrollContainer" parent="OuterGap/Panel/InnerGap/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="Options" type="VBoxContainer" parent="OuterGap/Panel/InnerGap/VBoxContainer/ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
+[node name="Back" type="Button" parent="OuterGap/Panel/InnerGap/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 8
 text = "Back to Main Menu"
 
-[connection signal="pressed" from="outer_gap/panel/inner_gap/back" to="." method="_on_back_pressed"]
+[connection signal="pressed" from="OuterGap/Panel/InnerGap/VBoxContainer/Back" to="." method="_on_back_pressed"]
diff --git a/client/menu/settings_row.gd b/client/menu/settings_row.gd
index ee4b8cb9..4f1d326f 100644
--- a/client/menu/settings_row.gd
+++ b/client/menu/settings_row.gd
@@ -1,20 +1,40 @@
 class_name SettingsRow
 extends PanelContainer
 
+signal apply_preset
+
 @onready var value_parent = $HBoxContainer/BoxContainer
 @onready var label = $HBoxContainer/Label
 
 var value_node
 var description = tr("no value was given to the row")
 
-func setup(description_: String, value):
-	description = description_
-	if value is bool:
-		value_node = CheckButton.new()
-		value_node.button_pressed = value
-	elif value is String:
-		value_node = LineEdit.new()
-		value_node.text = value
+func setup(key: String, dict: Dictionary, defaults: Dictionary):
+	var setting = dict[key]
+	description = setting["description"]
+	var value = setting["value"]
+	var default = defaults[key]["value"]
+	match setting["type"]:
+		"toggle":
+			value_node = CheckButton.new()
+			value_node.button_pressed = value
+		"line":
+			value_node = LineEdit.new()
+			value_node.text = value
+			value_node.placeholder_text = default
+		"dropdown":
+			value_node = OptionButton.new()
+			for i in setting["options"]:
+				value_node.add_item(i)
+			value_node.select(value)
+		"dropdown_preset":
+			value_node = OptionButton.new()
+			for i in setting["options"]:
+				value_node.add_item(i)
+			value_node.select(value)
+			value_node.connect("item_selected", apply.bind(setting["apply"]))
+		_:
+			push_error("Could not set up SettingsRow: Unknown setting type \"%s\"" % setting["type"])
 
 func _ready():
 	if value_node != null:
@@ -24,13 +44,19 @@ func _ready():
 		label.text = description
 		value_parent.add_child(c)
 
+func apply(idx: int, apply: Array):
+	emit_signal("apply_preset", apply[idx])
+
 func get_value():
 	if value_node != null:
 		if value_node is CheckButton:
 			return value_node.button_pressed
 		elif value_node is LineEdit:
 			return value_node.text
+		elif value_node is OptionButton:
+			return value_node.selected
 		else:
+			push_error("get_value() failed for unknown node type: %s" % value_node)
 			return null
 	else:
 		return null