From 6370c371604e4e5c7621b70366e91b68267dfc19 Mon Sep 17 00:00:00 2001 From: kobewi Date: Fri, 19 Dec 2025 02:47:45 +0100 Subject: [PATCH] Use EditorFileDialog eveywhere in the editor --- editor/export/export_template_manager.cpp | 4 ++-- editor/script/find_in_files.cpp | 4 ++-- editor/version_control/version_control_editor_plugin.cpp | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index c5ba88ce206..a0f4385dcb9 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -39,10 +39,10 @@ #include "editor/export/editor_export_preset.h" #include "editor/file_system/editor_file_system.h" #include "editor/file_system/editor_paths.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/gui/progress_dialog.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/file_dialog.h" #include "scene/gui/line_edit.h" #include "scene/gui/link_button.h" #include "scene/gui/margin_container.h" @@ -1163,7 +1163,7 @@ ExportTemplateManager::ExportTemplateManager() { add_child(uninstall_confirm); uninstall_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ExportTemplateManager::_uninstall_template_confirmed)); - install_file_dialog = memnew(FileDialog); + install_file_dialog = memnew(EditorFileDialog); install_file_dialog->set_title(TTR("Select Template File")); install_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM); install_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE); diff --git a/editor/script/find_in_files.cpp b/editor/script/find_in_files.cpp index b42d7ee1c08..9d351d6efce 100644 --- a/editor/script/find_in_files.cpp +++ b/editor/script/find_in_files.cpp @@ -35,13 +35,13 @@ #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/settings/editor_command_palette.h" #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" -#include "scene/gui/file_dialog.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" @@ -409,7 +409,7 @@ FindInFilesDialog::FindInFilesDialog() { folder_button->connect(SceneStringName(pressed), callable_mp(this, &FindInFilesDialog::_on_folder_button_pressed)); hbc->add_child(folder_button); - _folder_dialog = memnew(FileDialog); + _folder_dialog = memnew(EditorFileDialog); _folder_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_DIR); _folder_dialog->connect("dir_selected", callable_mp(this, &FindInFilesDialog::_on_folder_selected)); add_child(_folder_dialog); diff --git a/editor/version_control/version_control_editor_plugin.cpp b/editor/version_control/version_control_editor_plugin.cpp index c5e9ff601c8..54557207fe4 100644 --- a/editor/version_control/version_control_editor_plugin.cpp +++ b/editor/version_control/version_control_editor_plugin.cpp @@ -41,6 +41,7 @@ #include "editor/editor_string_names.h" #include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_bottom_panel.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/script/script_editor_plugin.h" #include "editor/settings/editor_command_palette.h" #include "editor/settings/editor_settings.h" @@ -1073,7 +1074,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { set_up_ssh_public_key_path->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning)); set_up_ssh_public_key_input_hbc->add_child(set_up_ssh_public_key_path); - set_up_ssh_public_key_file_dialog = memnew(FileDialog); + set_up_ssh_public_key_file_dialog = memnew(EditorFileDialog); set_up_ssh_public_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM); set_up_ssh_public_key_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE); set_up_ssh_public_key_file_dialog->set_show_hidden_files(true); @@ -1108,7 +1109,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { set_up_ssh_private_key_path->set_accessibility_name(TTRC("SSH Private Key Path")); set_up_ssh_private_key_input_hbc->add_child(set_up_ssh_private_key_path); - set_up_ssh_private_key_file_dialog = memnew(FileDialog); + set_up_ssh_private_key_file_dialog = memnew(EditorFileDialog); set_up_ssh_private_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM); set_up_ssh_private_key_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE); set_up_ssh_private_key_file_dialog->set_show_hidden_files(true);