Updated UIPanel to extend UIBase for settings support

Author: Liam Sherwin

components/ClientComponentSettings/ClientComponentSettings.gd

@@ -9,15 +9,19 @@ class_name ClientComponentSettings extends PanelContainer
 @export var _settings_module_container: VBoxContainer
 
 ## The current component
-var _component: ClientComponent = null
+var _component: Object = null
 
 
 ## Sets the component
-func set_component(component: ClientComponent) -> void:
+func set_component(component: Object) -> void:
 	for old_module: ClientClassSettingsModule in _settings_module_container.get_children():
 		old_module.queue_free()
 		_settings_module_container.remove_child(old_module)
 
+	if not (component is ClientComponent or component is UIBase):
+		_component = null
+		return
+	
 	_component = component
 	if not is_instance_valid(component):
 		return

components/PlaybackColumn/PlaybackColumn.gd

@@ -103,6 +103,7 @@ func set_component(component: EngineComponent, no_remove: bool = false) -> void:
 
 	_set_disalbed(component == null)
 	title_button.text = component.get_name()
+	title_button.tooltip_text = component.get_name()
 
 	if not no_remove and _trigger_block:
 		_trigger_block.reset_column(_column)
@@ -148,6 +149,7 @@ func set_row_name(row: int, p_name: String) -> void:
 ## Resets this PlaybackColumn
 func reset() -> void:
 	title_button.set_text("Empty")
+	title_button.set_tooltip_text("")
 	slider.set_editable(false)
 	_component = null
 
@@ -170,6 +172,7 @@ func _set_disalbed(disabled: bool) -> void:
 ## Emitted when the component's name is changed
 func _on_component_name_changed(new_name: String) -> void:
 	title_button.set_text(new_name)
+	title_button.set_tooltip_text(new_name)
 
 
 ## Called when the Title Button is pressed

components/UIPanel/EditControls.tscn

@@ -30,7 +30,6 @@ icon = ExtResource("1_x4jel")
 
 [node name="Settings" type="Button" parent="HBoxContainer"]
 layout_mode = 2
-disabled = true
 icon = ExtResource("2_1xcge")
 
 [node name="Close" type="Button" parent="HBoxContainer"]

core/components/containers/DataContainer.gd

@@ -128,7 +128,7 @@ func _store_item(p_item: ContainerItem, no_signal: bool = false) -> bool:
 	_items.append(p_item)
 	_fixture.get_or_add(p_item.get_fixture(), {}).get_or_add(p_item.get_zone(), {})[p_item.get_parameter()] = p_item
 
-	#ComponentDB.register_component(p_item)
+	ComponentDB.register_component(p_item)
 	p_item.delete_requested.connect(_erase_item.bind(p_item))
 
 	if not no_signal:
@@ -157,7 +157,7 @@ func _erase_item(p_item: ContainerItem, no_signal: bool = false) -> bool:
 
 	_items.erase(p_item)
 	_fixture[p_item.get_fixture()][p_item.get_zone()].erase(p_item.get_parameter())
-
+	
 	if not no_signal:
 		items_erased.emit([p_item])
 

core/global/ComponentDB.gd

@@ -95,7 +95,10 @@ func get_component(uuid: String) -> EngineComponent:
 
 
 ## Use this method if you need to call a function once a component is added to the engine. This will only be called once
-func request_component(uuid: String, callback) -> void:
+func request_component(uuid: String, callback: Callable) -> void:
+	if not uuid:
+		return
+	
 	if uuid in components:
 		callback.call(components[uuid])
 

panels/ComponentControlMethodPicker/ComponentControlMethodPicker.gd

@@ -33,9 +33,19 @@ func set_component(component: EngineComponent) -> void:
 		_list.add_item(control_name)
 
 
-## Called when the confirm button is pressed
-func _on_confirm_pressed() -> void:
+## Confirms the current selection
+func _confirm_selection() -> void:
 	var selected: int = _list.get_selected_items()[0]
 	var control_name: String = _controls.keys()[selected - 1] if selected else ""
 
 	method_chosen.emit(control_name)
+
+
+## Called when the confirm button is pressed
+func _on_confirm_pressed() -> void:
+	_confirm_selection()
+
+
+## Called when an item is dubble clicked in the tree
+func _on_list_item_activated(index: int) -> void:
+	_confirm_selection()

panels/ComponentControlMethodPicker/ComponentControlMethodPicker.tscn

@@ -75,4 +75,5 @@ size_flags_horizontal = 3
 text = "Confirm"
 icon = ExtResource("5_uhjji")
 
+[connection signal="item_activated" from="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/List" to="." method="_on_list_item_activated"]
 [connection signal="pressed" from="VBoxContainer/PanelContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"]

panels/Playbacks/Playbacks.gd

@@ -5,6 +5,10 @@ class_name UIPlaybacks extends UIPanel
 ## Ui panel for controling scenes, with sliders and extra buttons
 
 
+## Emitted when the visable colum count is changed
+signal columns_changed(columns: int)
+
+
 ## The NewPlaybackRowComponent container for columns
 @export var _container: HBoxContainer 
 
@@ -15,16 +19,25 @@ class_name UIPlaybacks extends UIPanel
 ## Mode Enum
 enum Mode {ASIGN, DELETE, EDIT}
 
+## Default number of columns to show
+const _default_columns: int = 10
+
+## Dialog text for changeing column count
+const _change_column_count_text: String = "Are you sure you want to change the column count to: $columns? This may be destructive."
+
 
 ## The function group
 var _trigger_block: TriggerBlock
 
-## Default number of columns to show
-var _default_columns: int = 10
-
 ## All UI columns
 var _columns: Dictionary[int, PlaybackColumn]
 
+## Flag for if columns have been loaded from _load()
+var _columns_set_from_load: bool = false
+
+## Total number of columns to show, defaults to _default_columns
+var _visable_columns: int = _default_columns
+
 ## The current mode
 var _mode: Mode = Mode.ASIGN
 
@@ -39,20 +52,13 @@ var _trigger_block_connections: Dictionary[String, Callable] = {
 
 ## Load Default Columns
 func _ready() -> void:
+	_set_class_name("UIPlaybacks")
 	set_edit_mode_disabled(true)
 
-	for column: int in range(0, _default_columns + 1):
-		var new_column: PlaybackColumn = load("res://components/PlaybackColumn/PlaybackColumn.tscn").instantiate()
-		
-		new_column.set_column(column)
-		new_column.control_pressed_edit_mode.connect(_on_column_control_pressed_edit_mode)
-		
-		_columns[column] = new_column
-		_container.add_child(new_column)
-		
-		for button: Button in new_column.get_buttons():
-			if button:
-				buttons.append(button)
+	register_setting_int("columns", set_columns_ui, get_columns, columns_changed, 0, 100)
+	
+	if not _columns_set_from_load:
+		_set_columns(_visable_columns)
 
 
 ## Sets the trigger block
@@ -89,6 +95,34 @@ func set_mode(p_mode: Mode) -> void:
 		column.set_mode(_mode)
 
 
+## Sets the number of columns to show
+func set_columns(p_column: int) -> bool:
+	if p_column == _visable_columns:
+		return false
+	
+	_visable_columns = p_column
+	_set_columns(_visable_columns)
+	columns_changed.emit(_visable_columns)
+	
+	return true
+
+
+## Sets the number of columns to show. But showing a confirmation dialog box first
+func set_columns_ui(p_columns: int) -> bool:
+	if p_columns == _visable_columns:
+		return false
+	
+	Interface.show_confirmation_dialog(_change_column_count_text.replace("$columns", str(p_columns)), self).then(func () -> void:
+		set_columns(p_columns)
+	)
+	return true
+
+
+## Gets the current number of columns
+func get_columns() -> int:
+	return _visable_columns
+
+
 ## Called when editmode state is changed
 func _edit_mode_toggled(state: bool) -> void:
 	if not _trigger_block:
@@ -123,6 +157,41 @@ func _rename_trigger(row: int, column: int, name: String) -> void:
 		_columns[column].set_row_name(row, "")
 
 
+## Loads the default number of columns
+func _set_columns(p_columns: int) -> void:
+	if p_columns > _columns.size():
+		for column: int in range(_columns.size(), p_columns):
+			var new_column: PlaybackColumn = load("res://components/PlaybackColumn/PlaybackColumn.tscn").instantiate()
+			
+			new_column.set_column(column)
+			new_column.set_trigger_block(_trigger_block)
+			new_column.set_edit_mode(_edit_mode)
+			new_column.set_mode(_mode)
+			new_column.control_pressed_edit_mode.connect(_on_column_control_pressed_edit_mode)
+			
+			_columns[column] = new_column
+			_container.add_child(new_column)
+			
+			for button: Button in new_column.get_buttons():
+				if button:
+					add_button(button)
+	
+	elif p_columns < _columns.size():
+		var columns: Dictionary[int, PlaybackColumn] = _columns.duplicate()
+		
+		for column: int in range(p_columns, _columns.size()):
+			var column_item: PlaybackColumn = columns[column]
+			_columns.erase(column)
+			
+			for button: Button in column_item.get_buttons():
+				if button:
+					remove_all_button_actions(button)
+					remove_button(button)
+			
+			_container.remove_child(column_item)
+			column_item.queue_free()
+
+
 ## Called when a control is pressed when in Mode.EDIT
 func _on_column_control_pressed_edit_mode(control: Control) -> void:
 	if control is Button:
@@ -137,13 +206,16 @@ func _on_object_picker_button_object_selected(object: EngineComponent) -> void:
 
 ## Saves this into a dict
 func _save() -> Dictionary:
-	if _trigger_block: 
-		return { "uuid": _trigger_block.uuid }
-	else: 
-		return {}
+	return { 
+			"trigger_block": _trigger_block.uuid if _trigger_block else "",
+			"columns": _visable_columns,
+		}
 
 
 ## Loads this from a dict
 func _load(saved_data: Dictionary) -> void:
-	if saved_data.get("uuid") is String:
-		_object_picker_button.look_for(saved_data.uuid)
+	_object_picker_button.look_for(type_convert(saved_data.get("trigger_block", ""), TYPE_STRING))
+	_visable_columns = type_convert(saved_data.get("columns", _visable_columns), TYPE_INT)
+	
+	_columns_set_from_load = true
+	_set_columns(_visable_columns)

panels/Playbacks/Playbacks.tscn

@@ -80,7 +80,6 @@ icon = ExtResource("8_5st74")
 
 [node name="EditControls" parent="VBoxContainer/PanelContainer3/HBoxContainer" instance=ExtResource("6_ms2qx")]
 layout_mode = 2
-show_settings = false
 
 [node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
 layout_mode = 2

panels/UIPanelSettings/Shortcuts.gd

@@ -48,6 +48,13 @@ func set_panel(panel: UIPanel) -> void:
 
 ## Sets the current button
 func set_buton(button: Button) -> void:
+	if not _button_items.has_left(button):
+		return
+	
+	var button_item: TreeItem = _button_items.left(button)
+	button_item.select(0)
+	_button_tree.scroll_to_item(button_item)
+	
 	_selected_button = button
 	_add_action_button.set_disabled(false)
 
@@ -62,7 +69,7 @@ func set_buton(button: Button) -> void:
 
 ## Loads and displays all buttons from the UIPanel
 func _load_buttons() -> void:
-	for button in _panel.buttons:
+	for button in _panel.get_buttons():
 		var item: TreeItem = _button_tree.create_item()
 
 		item.set_text(0, button.get_name())