godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Merge pull request #110323 from bruvzg/csv_text

Browse Source 
Open translation CSV in the text editor instead of printing errors.
This commit is contained in:
Thaddeus Crews
2025-10-28 12:19:28 -05:00
parent f1f3f06843 9318466183
commit f2f806fa04
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_node.cpp
View File

@@ -1556,7 +1556,12 @@ Error EditorNode::load_resource(const String &p_resource, bool p_ignore_broken_d
Error err; Error err;
Ref<Resource> res; Ref<Resource> res;
if (ResourceLoader::exists(p_resource, "")) { if (force_textfile_extensions.has(p_resource.get_extension())) {
res = ResourceCache::get_ref(p_resource);
if (res.is_null() || !res->is_class("TextFile")) {
res = ScriptEditor::get_singleton()->open_file(p_resource);
}
} else if (ResourceLoader::exists(p_resource, "")) {
res = ResourceLoader::load(p_resource, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err); res = ResourceLoader::load(p_resource, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
} else if (textfile_extensions.has(p_resource.get_extension())) { } else if (textfile_extensions.has(p_resource.get_extension())) {
res = ScriptEditor::get_singleton()->open_file(p_resource); res = ScriptEditor::get_singleton()->open_file(p_resource);
@@ -7912,6 +7917,8 @@ EditorNode::EditorNode() {
other_file_extensions.insert(E); other_file_extensions.insert(E);
} }
force_textfile_extensions.insert("csv"); // CSV translation source, has `Translation` resource type, but not loadable as resource.
resource_preview = memnew(EditorResourcePreview); resource_preview = memnew(EditorResourcePreview);
add_child(resource_preview); add_child(resource_preview);
progress_dialog = memnew(ProgressDialog); progress_dialog = memnew(ProgressDialog);

1
editor/editor_node.h
View File

@@ -477,6 +477,7 @@ private:
SceneImportSettingsDialog *scene_import_settings = nullptr; SceneImportSettingsDialog *scene_import_settings = nullptr;
AudioStreamImportSettingsDialog *audio_stream_import_settings = nullptr; AudioStreamImportSettingsDialog *audio_stream_import_settings = nullptr;
HashSet<String> force_textfile_extensions;
HashSet<String> textfile_extensions; HashSet<String> textfile_extensions;
HashSet<String> other_file_extensions; HashSet<String> other_file_extensions;
HashSet<FileDialog *> file_dialogs; HashSet<FileDialog *> file_dialogs;