Merge pull request #6 from DarthPapalo666/advanced_filter_options

Advanced filter options

Author: DarthPapalo

.gitignore

@@ -18,3 +18,5 @@ export_presets.cfg
 .mono/
 data_*/
 mono_crash.*.json
+plugin_icon.png.import
+plugin_icon.svg.import

addons/resource_databases/editor_only/editor_data_classes/editor_database_collection.gd

@@ -187,6 +187,15 @@ func remove_category(category: StringName) -> void:
 		_emit_collection_entries_changed()
 
 
+func clear_category(category: StringName) -> void:
+	assert(has_category(category))
+	var was_empty := (_categories_to_ints[category] as Dictionary).size() == 0
+	(_categories_to_ints[category] as Dictionary).clear()
+	_emit_categories_changed()
+	if not was_empty:
+		_emit_collection_entries_changed()
+
+
 func get_all_categories() -> Array[StringName]:
 	var arr: Array[StringName]
 	arr.assign(_categories_to_ints.keys())

addons/resource_databases/editor_only/plugin.cfg

@@ -3,5 +3,5 @@
 name="Resource Databases"
 description="Use the fully-fledged database editor to create and modify your resource databases!\n\nLoad them at runtime as the new resource type \"Database\" and load resources dynamically!"
 author="DarthPapalo"
-version="1.2.1"
+version="1.3.1"
 script="plugin.gd"

addons/resource_databases/editor_only/ui/components/collection_view/category_filter/category_filter.tscn

@@ -19,6 +19,7 @@ corner_radius_bottom_left = 6
 [node name="CategoryFilter" type="PanelContainer" node_paths=PackedStringArray("_button", "_texture")]
 offset_right = 8.0
 offset_bottom = 31.0
+size_flags_horizontal = 3
 theme_override_styles/panel = SubResource("StyleBoxFlat_bnakq")
 script = ExtResource("1_iqelm")
 _button = NodePath("Button")
@@ -30,6 +31,7 @@ theme_override_styles/focus = SubResource("StyleBoxEmpty_lr1dy")
 text = "      <category_name>"
 flat = true
 alignment = 0
+text_overrun_behavior = 3
 
 [node name="TextureRect" type="TextureRect" parent="."]
 custom_minimum_size = Vector2(0, 24)

addons/resource_databases/editor_only/ui/components/collection_view/collection_view.gd

@@ -22,8 +22,14 @@ const CATEGORY_FILTER_SCENE := preload("res://addons/resource_databases/editor_o
 @export_subgroup("Filters components")
 @export var _filters_check_button: CheckButton
 @export var _filters_panel: PanelContainer
-@export var _category_filters_container: HFlowContainer
+@export var _category_filters_container: VBoxContainer
 @export var _expression_filter_text_edit: TextEdit
+# Advanced filter options
+@export var _advanced_filter_options: VBoxContainer
+@export var _no_categories_label: Label
+@export var _categories_option_button: OptionButton
+@export var _update_category_button: Button
+@export var _clear_category_button: Button
 
 var DatabaseEditor := Namespace.get_editor_singleton()
 var DatabaseSettings := Namespace.get_settings_singleton()
@@ -185,7 +191,20 @@ func _get_filtered_ids() -> Array[int]:
 	var expr := _get_filter_expression()
 	if expr == null:
 		return result
+	var expression_ids := _get_expression_ids()
 	result = result.filter(
+		func(int_id: int) -> bool:
+			return int_id in expression_ids
+	)
+	return result
+
+
+func _get_expression_ids() -> Array[int]:
+	var expr := _get_filter_expression()
+	assert(expr != null, "Can't get expression IDs if expression is null.")
+	var entries_ids: Array[int] = []
+	entries_ids.assign(_current_entries.ints_to_locators.keys())
+	var ids = entries_ids.filter(
 		func(int_id: int) -> bool:
 			var locator := _current_entries.ints_to_locators[int_id] as String
 			var locator_references_resource := false
@@ -214,7 +233,7 @@ func _get_filtered_ids() -> Array[int]:
 				return false
 			return expr_result as bool
 	)
-	return result
+	return ids
 
 
 func _get_filter_expression() -> Expression:
@@ -227,7 +246,7 @@ func _get_filter_expression() -> Expression:
 	return expr
 
 
-func _on_evaluate_expression_button_pressed() -> void:
+func _on_filter_with_expression_button_pressed() -> void:
 	_update_entries()
 
 
@@ -237,14 +256,14 @@ func _on_clear_expression_button_pressed() -> void:
 	_update_entries()
 
 
-func _register_resources_collection(paths: PackedStringArray) -> void:
+func _register_resources_in_collection(paths: PackedStringArray) -> void:
 	for path: String in paths:
 		if FileAccess.file_exists(path): # Is file
 			_get_collection().register_resource(path)
 		elif DirAccess.dir_exists_absolute(path): # Is folder
 			_get_collection().register_folder_resources(path)
 		else:
-			print_rich("[color=orange]Error on drag and drop, invalid path [color=yellow](%s)" % path)
+			print_rich("[color=orange][ResourceDatabase] Error on drag and drop, invalid path [color=yellow](%s)" % path)
 
 
 #region Collection callbacks
@@ -267,8 +286,11 @@ func _on_collection_categories_changed(categories: Dictionary) -> void:
 	for category: StringName in _categories_view_exclude_filter.keys():
 		if category not in categories:
 			_categories_view_exclude_filter.erase(category)
+	# Remove categories from option button of advanced expression options
+	_categories_option_button.clear()
 	# Add new filters
 	for category: StringName in categories:
+		# Update category filters
 		var new_filter: Namespace.CategoryFilter = CATEGORY_FILTER_SCENE.instantiate()
 		var initial_state := 0
 		if _categories_view_include_filter.has(category):
@@ -278,7 +300,14 @@ func _on_collection_categories_changed(categories: Dictionary) -> void:
 		new_filter.set_category(category, initial_state)
 		new_filter.filter_changed.connect(_on_category_filter_state_changed.bind(category))
 		_category_filters_container.add_child(new_filter)
+		# Update category option button for advanced expression options
+		_categories_option_button.add_item(String(category))
+		_categories_option_button.set_item_metadata(_categories_option_button.item_count - 1, category)
 	_update_entries()
+	_update_category_button.disabled = _categories_option_button.selected == -1
+	_clear_category_button.disabled = _categories_option_button.selected == -1
+	_no_categories_label.visible = _categories_option_button.selected == -1
+	_categories_option_button.visible = _categories_option_button.selected != -1
 #endregion
 
 
@@ -426,10 +455,24 @@ func _on_filters_check_button_toggled(toggled_on: bool) -> void:
 	_update_entries()
 
 
-# TESTING
-func _on_testing_button_pressed() -> void:
-	#print(load(_get_collection().get_entries()[&"ints_to_locators"][0] as String).get_script().get_script_property_list())
-	#print("Size: ", DatabaseEditor.get_database().get_collection(collection_uid).collection_size)
-	for u in 5:
-		_get_collection().register_test_res()
-	pass
+#region Advanced filter options
+func _on_advanced_filter_options_check_button_toggled(toggled_on: bool) -> void:
+	_advanced_filter_options.visible = toggled_on
+
+
+func _on_update_category_button_pressed() -> void:
+	var category: StringName = _categories_option_button.get_item_metadata(_categories_option_button.selected)
+	if not await DatabaseEditor.warn("Update category", "Are you sure you want to update the [b]%s[/b] category with the currently filtered IDs?" % category):
+		return
+	var filtered_ids := _get_filtered_ids()
+	_get_collection().clear_category(category)
+	for id: int in filtered_ids:
+		_get_collection().add_category_to_resource(category, id, false)
+
+
+func _on_clear_category_button_pressed() -> void:
+	var category: StringName = _categories_option_button.get_item_metadata(_categories_option_button.selected)
+	if not await DatabaseEditor.warn("Clear category", "Are you sure you want to clear the [b]%s[/b] category?" % category):
+		return
+	_get_collection().clear_category(category)
+#endregion

addons/resource_databases/editor_only/ui/components/collection_view/collection_view.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://c6snrkt0lx7rr"]
+[gd_scene load_steps=11 format=3 uid="uid://c6snrkt0lx7rr"]
 
 [ext_resource type="Script" path="res://addons/resource_databases/editor_only/ui/components/collection_view/collection_view.gd" id="2_r2ggo"]
 [ext_resource type="PackedScene" uid="uid://drfc1vxe6tdt2" path="res://addons/resource_databases/editor_only/ui/components/database_entry/database_entries_top_bar.tscn" id="5_yml8w"]
@@ -29,13 +29,21 @@ bg_color = Color(0.113725, 0.133333, 0.160784, 1)
 border_width_left = 2
 border_color = Color(0.439216, 0.729412, 0.980392, 1)
 
+[sub_resource type="StyleBoxLine" id="StyleBoxLine_66tam"]
+color = Color(0.441, 0.728467, 0.98, 0.392157)
+thickness = 2
+
 [sub_resource type="CodeHighlighter" id="CodeHighlighter_jhtmh"]
 number_color = Color(1, 0.70742, 0.783604, 1)
 symbol_color = Color(0.758361, 0.414505, 1, 1)
 function_color = Color(0.177751, 0.378312, 1, 1)
 member_variable_color = Color(0.447388, 0.890726, 1, 1)
+member_keyword_colors = {
+"res": Color(1, 0.627451, 0.478431, 1),
+"res_type": Color(1, 0.713726, 0.756863, 1)
+}
 
-[node name="CollectionView" type="PanelContainer" node_paths=PackedStringArray("_collection_button", "_selection_button", "_selected_collection_label", "_collection_entries_container", "_search_line_edit", "_entries_view_page_counter", "_filters_check_button", "_filters_panel", "_category_filters_container", "_expression_filter_text_edit")]
+[node name="CollectionView" type="PanelContainer" node_paths=PackedStringArray("_collection_button", "_selection_button", "_selected_collection_label", "_collection_entries_container", "_search_line_edit", "_entries_view_page_counter", "_filters_check_button", "_filters_panel", "_category_filters_container", "_expression_filter_text_edit", "_advanced_filter_options", "_no_categories_label", "_categories_option_button", "_update_category_button", "_clear_category_button")]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -56,6 +64,11 @@ _filters_check_button = NodePath("VBoxContainer/ToolsPanel/ToolsContainer/Filter
 _filters_panel = NodePath("VBoxContainer/HSplitContainer/FiltersContainer")
 _category_filters_container = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ScrollContainer/CategoryFiltersContainer")
 _expression_filter_text_edit = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionFilterTextEdit")
+_advanced_filter_options = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions")
+_no_categories_label = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/NoCategoriesLabel")
+_categories_option_button = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/CategoriesOptionButton")
+_update_category_button = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/UpdateCategoryButton")
+_clear_category_button = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/ClearCategoryButton")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
@@ -124,11 +137,6 @@ popup/item_8/text = "Remove category from selected"
 popup/item_8/id = 8
 popup/item_8/disabled = true
 
-[node name="TestingButton" type="Button" parent="VBoxContainer/ToolsPanel/ToolsContainer"]
-visible = false
-layout_mode = 2
-text = "Testing"
-
 [node name="FiltersCheckButton" type="CheckButton" parent="VBoxContainer/ToolsPanel/ToolsContainer"]
 layout_mode = 2
 size_flags_horizontal = 10
@@ -203,12 +211,15 @@ layout_mode = 2
 size_flags_vertical = 3
 size_flags_stretch_ratio = 2.0
 
-[node name="CategoryFiltersContainer" type="HFlowContainer" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ScrollContainer"]
+[node name="CategoryFiltersContainer" type="VBoxContainer" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ScrollContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-theme_override_constants/h_separation = 6
-theme_override_constants/v_separation = 6
+
+[node name="HSeparator" type="HSeparator" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 7
+theme_override_styles/separator = SubResource("StyleBoxLine_66tam")
 
 [node name="Label2" type="Label" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer"]
 layout_mode = 2
@@ -227,9 +238,10 @@ layout_mode = 2
 theme_override_constants/separation = 6
 alignment = 1
 
-[node name="EvaluateExpressionButton" type="Button" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionOptionsContainer"]
+[node name="FilterWithExpressionButton" type="Button" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionOptionsContainer"]
 layout_mode = 2
-text = "Evaluate"
+size_flags_horizontal = 3
+text = "Filter"
 flat = true
 
 [node name="ClearExpressionButton" type="Button" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionOptionsContainer"]
@@ -238,10 +250,48 @@ size_flags_horizontal = 3
 text = "Clear"
 flat = true
 
-[connection signal="pressed" from="VBoxContainer/ToolsPanel/ToolsContainer/TestingButton" to="." method="_on_testing_button_pressed"]
+[node name="HSeparator2" type="HSeparator" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 7
+theme_override_styles/separator = SubResource("StyleBoxLine_66tam")
+
+[node name="AdvancedFilterOptionsCheckButton" type="CheckButton" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer"]
+layout_mode = 2
+text = "Advanced"
+
+[node name="AdvancedFilterOptions" type="VBoxContainer" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer"]
+visible = false
+layout_mode = 2
+
+[node name="NoCategoriesLabel" type="Label" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions"]
+layout_mode = 2
+text = "No categories"
+horizontal_alignment = 1
+
+[node name="CategoriesOptionButton" type="OptionButton" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions"]
+visible = false
+layout_mode = 2
+text_overrun_behavior = 3
+fit_to_longest_item = false
+
+[node name="UpdateCategoryButton" type="Button" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions"]
+layout_mode = 2
+disabled = true
+text = "Update category"
+flat = true
+
+[node name="ClearCategoryButton" type="Button" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions"]
+layout_mode = 2
+disabled = true
+text = "Clear category"
+flat = true
+
 [connection signal="toggled" from="VBoxContainer/ToolsPanel/ToolsContainer/FiltersCheckButton" to="." method="_on_filters_check_button_toggled"]
 [connection signal="text_changed" from="VBoxContainer/HSplitContainer/EntriesElements/VBoxContainer/SearchLineEdit" to="." method="_on_search_line_edit_text_changed"]
 [connection signal="change_page_requested" from="VBoxContainer/HSplitContainer/EntriesElements/VBoxContainer/ViewPageCounter" to="." method="_on_view_page_counter_change_page_requested"]
-[connection signal="paths_dropped" from="VBoxContainer/HSplitContainer/EntriesElements/DragAndDropPanel" to="." method="_register_resources_collection"]
-[connection signal="pressed" from="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionOptionsContainer/EvaluateExpressionButton" to="." method="_on_evaluate_expression_button_pressed"]
+[connection signal="paths_dropped" from="VBoxContainer/HSplitContainer/EntriesElements/DragAndDropPanel" to="." method="_register_resources_in_collection"]
+[connection signal="pressed" from="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionOptionsContainer/FilterWithExpressionButton" to="." method="_on_filter_with_expression_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/ExpressionOptionsContainer/ClearExpressionButton" to="." method="_on_clear_expression_button_pressed"]
+[connection signal="toggled" from="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptionsCheckButton" to="." method="_on_advanced_filter_options_check_button_toggled"]
+[connection signal="pressed" from="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/UpdateCategoryButton" to="." method="_on_update_category_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/ClearCategoryButton" to="." method="_on_clear_category_button_pressed"]

addons/resource_databases/editor_only/ui/components/dialogs/warning_dialog/warning_dialog.gd

@@ -20,3 +20,8 @@ func _on_accept_button_pressed() -> void:
 func _on_cancel_button_pressed() -> void:
 	hide()
 	decision.emit(false)
+
+
+func _on_about_to_popup() -> void:
+	# Forces the window to adopt the minimum size
+	size = Vector2i.ZERO

addons/resource_databases/editor_only/ui/components/dialogs/warning_dialog/warning_dialog.tscn

@@ -25,11 +25,12 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 6
-size_flags_vertical = 2
+size_flags_vertical = 6
 theme_type_variation = &"DialogPanel"
 
 [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
 layout_mode = 2
+size_flags_horizontal = 4
 theme_override_constants/separation = 20
 alignment = 1
 
@@ -55,6 +56,7 @@ text = "Accept"
 layout_mode = 2
 text = "Cancel"
 
+[connection signal="about_to_popup" from="." to="." method="_on_about_to_popup"]
 [connection signal="close_requested" from="." to="." method="_on_cancel_button_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/AcceptButton" to="." method="_on_accept_button_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/CancelButton" to="." method="_on_cancel_button_pressed"]