finish update

- Removed testing code from collection_view.

- Fixed warning dialog size not updating.

- Updated category filters container.

- Fixed update category button disabling/enabling code.

- Added text to advanced options where there are no categories.

- Reworked options, overwrite is now default. (You can use Select > Add category to selected to just add elements)

 - Renamed empty_category method from EditorDatabaseCollection to clear_category.

- Added clear category option.

- Updated version number.

Author: DarthPapalo

addons/resource_databases/editor_only/editor_data_classes/editor_database_collection.gd

@@ -187,7 +187,7 @@ func remove_category(category: StringName) -> void:
 		_emit_collection_entries_changed()
 
 
-func empty_category(category: StringName) -> void:
+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()

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,13 +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 overwrite_check_box: CheckBox
+@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()
@@ -303,6 +304,10 @@ func _on_collection_categories_changed(categories: Dictionary) -> void:
 		_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
 
 
@@ -453,25 +458,21 @@ func _on_filters_check_button_toggled(toggled_on: bool) -> void:
 #region Advanced filter options
 func _on_advanced_filter_options_check_button_toggled(toggled_on: bool) -> void:
 	_advanced_filter_options.visible = toggled_on
-	_update_category_button.disabled = _categories_option_button.selected == -1
 
 
 func _on_update_category_button_pressed() -> void:
-	if not await DatabaseEditor.warn("Update category", "Are you sure you want to update the selected category with the currently filtered IDs?"):
+	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()
-	var category: StringName = _categories_option_button.get_item_metadata(_categories_option_button.selected)
-	if overwrite_check_box.button_pressed:
-		_get_collection().empty_category(category)
+	_get_collection().clear_category(category)
 	for id: int in filtered_ids:
 		_get_collection().add_category_to_resource(category, id, false)
-#endregion
 
 
-# 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
+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

@@ -43,7 +43,7 @@ member_keyword_colors = {
 "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", "_advanced_filter_options", "overwrite_check_box", "_categories_option_button", "_update_category_button")]
+[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
@@ -65,9 +65,10 @@ _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")
-overwrite_check_box = NodePath("VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions/OverwriteCheckBox")
+_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
@@ -136,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
@@ -215,12 +211,10 @@ 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
@@ -269,21 +263,29 @@ text = "Advanced"
 visible = false
 layout_mode = 2
 
-[node name="OverwriteCheckBox" type="CheckBox" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions"]
+[node name="NoCategoriesLabel" type="Label" parent="VBoxContainer/HSplitContainer/FiltersContainer/VBoxContainer/AdvancedFilterOptions"]
 layout_mode = 2
-text = "Overwrite"
+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
 
-[connection signal="pressed" from="VBoxContainer/ToolsPanel/ToolsContainer/TestingButton" to="." method="_on_testing_button_pressed"]
+[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"]
@@ -292,3 +294,4 @@ flat = true
 [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"]