From f2f9687ceacb87f64774a367ef6dfedbfffdf08c Mon Sep 17 00:00:00 2001 From: yds Date: Mon, 30 Sep 2024 00:48:08 -0300 Subject: [PATCH] Make the "Quick Open" dialog available via EditorInterface --- doc/classes/EditorInterface.xml | 11 +++++++++++ editor/editor_interface.cpp | 23 +++++++++++++++++++++++ editor/editor_interface.h | 4 ++++ 3 files changed, 38 insertions(+) diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml index 795c5c1c2f0b..8e51e293c45c 100644 --- a/doc/classes/EditorInterface.xml +++ b/doc/classes/EditorInterface.xml @@ -343,6 +343,17 @@ [/codeblock] + + + + + + + + + Pops up an editor dialog for quick selecting a resource file. The [param callback] must take a single argument of type [PackedStringArray] which will be called with a list of selected paths or empty if the dialog is canceled. If [param base_type] is provided, the dialog will only show resources that match the base type. If [param enable_multi] is [code]true[/code], multiple files can be selected. If [param dont_clear] is [code]true[/code], the previous search filter will be reused. The dialog title can be specified in [param title]. + + diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp index fa6198f6950d..7a8e02dfaa3d 100644 --- a/editor/editor_interface.cpp +++ b/editor/editor_interface.cpp @@ -36,6 +36,7 @@ #include "editor/editor_main_screen.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" +#include "editor/editor_quick_open.h" #include "editor/editor_resource_preview.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" @@ -336,6 +337,23 @@ void EditorInterface::popup_property_selector(Object *p_object, const Callable & property_selector->connect(SNAME("canceled"), canceled_callback, CONNECT_DEFERRED); } +void EditorInterface::popup_quick_open(const Callable &p_callback, const String &p_base_type, bool p_enable_multi, bool p_dontclear, const String &p_title) { + const Callable selected_callback = callable_mp(this, &EditorInterface::_quick_open).bind(p_callback); + const Callable canceled_callback = callable_mp(this, &EditorInterface::_call_dialog_callback).bind(p_callback, PackedStringArray(), "quick open canceled"); + if (!quick_open) { + quick_open = memnew(EditorQuickOpen); + get_base_control()->add_child(quick_open); + } else { + quick_open->disconnect(SNAME("quick_open"), selected_callback); + quick_open->disconnect(SNAME("canceled"), canceled_callback); + } + quick_open->connect(SNAME("quick_open"), selected_callback, CONNECT_DEFERRED); + quick_open->connect(SNAME("canceled"), canceled_callback, CONNECT_DEFERRED); + + quick_open->set_title(p_title); + quick_open->popup_dialog(p_base_type, p_enable_multi, p_dontclear); +} + void EditorInterface::_node_selected(const NodePath &p_node_path, const Callable &p_callback) { const NodePath path = get_edited_scene_root()->get_path().rel_path_to(p_node_path); _call_dialog_callback(p_callback, path, "node selected"); @@ -353,6 +371,10 @@ void EditorInterface::_property_selection_canceled(const Callable &p_callback) { _call_dialog_callback(p_callback, NodePath(), "property selection canceled"); } +void EditorInterface::_quick_open(const Callable &p_callback) { + _call_dialog_callback(p_callback, quick_open->get_selected_files(), "quick open"); +} + void EditorInterface::_call_dialog_callback(const Callable &p_callback, const Variant &p_selected, const String &p_context) { Callable::CallError ce; Variant ret; @@ -568,6 +590,7 @@ void EditorInterface::_bind_methods() { ClassDB::bind_method(D_METHOD("popup_node_selector", "callback", "valid_types", "current_value"), &EditorInterface::popup_node_selector, DEFVAL(TypedArray()), DEFVAL(Variant())); ClassDB::bind_method(D_METHOD("popup_property_selector", "object", "callback", "type_filter", "current_value"), &EditorInterface::popup_property_selector, DEFVAL(PackedInt32Array()), DEFVAL(String())); + ClassDB::bind_method(D_METHOD("popup_quick_open", "callback", "base_type", "enable_multi", "dont_clear", "title"), &EditorInterface::popup_quick_open, DEFVAL(String()), DEFVAL(false), DEFVAL(false), DEFVAL(TTR("Quick Open"))); // Editor docks. diff --git a/editor/editor_interface.h b/editor/editor_interface.h index 20d66d71f53b..6003dfb08fc5 100644 --- a/editor/editor_interface.h +++ b/editor/editor_interface.h @@ -42,6 +42,7 @@ class EditorFileSystem; class EditorInspector; class EditorPaths; class EditorPlugin; +class EditorQuickOpen; class EditorResourcePreview; class EditorSelection; class EditorSettings; @@ -67,11 +68,13 @@ class EditorInterface : public Object { PropertySelector *property_selector = nullptr; SceneTreeDialog *node_selector = nullptr; + EditorQuickOpen *quick_open = nullptr; void _node_selected(const NodePath &p_node_paths, const Callable &p_callback); void _node_selection_canceled(const Callable &p_callback); void _property_selected(const String &p_property_name, const Callable &p_callback); void _property_selection_canceled(const Callable &p_callback); + void _quick_open(const Callable &p_callback); void _call_dialog_callback(const Callable &p_callback, const Variant &p_selected, const String &p_context); // Editor tools. @@ -138,6 +141,7 @@ class EditorInterface : public Object { void popup_node_selector(const Callable &p_callback, const TypedArray &p_valid_types = TypedArray(), Node *p_current_value = nullptr); // Must use Vector because exposing Vector is not supported. void popup_property_selector(Object *p_object, const Callable &p_callback, const PackedInt32Array &p_type_filter = PackedInt32Array(), const String &p_current_value = String()); + void popup_quick_open(const Callable &p_callback, const String &p_base_type = String(), bool p_enable_multi = false, bool p_dontclear = false, const String &p_title = TTR("Quick Open")); // Editor docks.