godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Allow dragging TextFiles from the Filesystem dock

Browse Source
This commit is contained in:
Paulb23
2021-10-12 17:31:20 +01:00
parent fa3164e90c
commit 31c1215c25
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
editor/plugins/script_editor_plugin.cpp
View File

@@ -1080,7 +1080,6 @@ void ScriptEditor::_file_dialog_action(String p_file) {
memdelete(file); memdelete(file);
if (EditorFileSystem::get_singleton()) { if (EditorFileSystem::get_singleton()) {
const Vector<String> textfile_extensions = ((String)(EditorSettings::get_singleton()->get("docks/filesystem/textfile_extensions"))).split(",", false);
if (textfile_extensions.has(p_file.get_extension())) { if (textfile_extensions.has(p_file.get_extension())) {
EditorFileSystem::get_singleton()->update_file(p_file); EditorFileSystem::get_singleton()->update_file(p_file);
} }
@@ -1168,9 +1167,8 @@ void ScriptEditor::_menu_option(int p_option) {
file_dialog_option = FILE_NEW_TEXTFILE; file_dialog_option = FILE_NEW_TEXTFILE;
file_dialog->clear_filters(); file_dialog->clear_filters();
const Vector<String> textfile_ext = ((String)(EditorSettings::get_singleton()->get("docks/filesystem/textfile_extensions"))).split(",", false); for (const String &E : textfile_extensions) {
for (int i = 0; i < textfile_ext.size(); i++) { file_dialog->add_filter("*." + E + " ; " + E.to_upper());
file_dialog->add_filter("*." + textfile_ext[i] + " ; " + textfile_ext[i].to_upper());
} }
file_dialog->popup_file_dialog(); file_dialog->popup_file_dialog();
file_dialog->set_title(TTR("New Text File...")); file_dialog->set_title(TTR("New Text File..."));
@@ -1188,9 +1186,8 @@ void ScriptEditor::_menu_option(int p_option) {
file_dialog->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper()); file_dialog->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
} }
const Vector<String> textfile_ext = ((String)(EditorSettings::get_singleton()->get("docks/filesystem/textfile_extensions"))).split(",", false); for (const String &E : textfile_extensions) {
for (int i = 0; i < textfile_ext.size(); i++) { file_dialog->add_filter("*." + E + " ; " + E.to_upper());
file_dialog->add_filter("*." + textfile_ext[i] + " ; " + textfile_ext[i].to_upper());
} }
file_dialog->popup_file_dialog(); file_dialog->popup_file_dialog();
@@ -1543,6 +1540,7 @@ void ScriptEditor::_notification(int p_what) {
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &ScriptEditor::_editor_settings_changed)); EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &ScriptEditor::_editor_settings_changed));
EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &ScriptEditor::_filesystem_changed)); EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &ScriptEditor::_filesystem_changed));
_editor_settings_changed();
[[fallthrough]]; [[fallthrough]];
} }
case NOTIFICATION_TRANSLATION_CHANGED: case NOTIFICATION_TRANSLATION_CHANGED:
@@ -2118,7 +2116,7 @@ void ScriptEditor::_update_script_connections() {
} }
} }
Ref<TextFile> ScriptEditor::_load_text_file(const String &p_path, Error *r_error) { Ref<TextFile> ScriptEditor::_load_text_file(const String &p_path, Error *r_error) const {
if (r_error) { if (r_error) {
*r_error = ERR_FILE_CANT_OPEN; *r_error = ERR_FILE_CANT_OPEN;
} }
@@ -2602,6 +2600,12 @@ void ScriptEditor::_save_layout() {
} }
void ScriptEditor::_editor_settings_changed() { void ScriptEditor::_editor_settings_changed() {
textfile_extensions.clear();
const Vector<String> textfile_ext = ((String)(EditorSettings::get_singleton()->get("docks/filesystem/textfile_extensions"))).split(",", false);
for (const String &E : textfile_ext) {
textfile_extensions.insert(E);
}
trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/behavior/files/trim_trailing_whitespace_on_save"); trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/behavior/files/trim_trailing_whitespace_on_save");
convert_indent_on_save = EditorSettings::get_singleton()->get("text_editor/behavior/files/convert_indent_on_save"); convert_indent_on_save = EditorSettings::get_singleton()->get("text_editor/behavior/files/convert_indent_on_save");
use_space_indentation = EditorSettings::get_singleton()->get("text_editor/behavior/indent/type"); use_space_indentation = EditorSettings::get_singleton()->get("text_editor/behavior/indent/type");
@@ -2808,13 +2812,23 @@ bool ScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data
if (file == "" || !FileAccess::exists(file)) { if (file == "" || !FileAccess::exists(file)) {
continue; continue;
} }
if (ResourceLoader::exists(file, "Script")) {
Ref<Script> scr = ResourceLoader::load(file); Ref<Script> scr = ResourceLoader::load(file);
if (scr.is_valid()) { if (scr.is_valid()) {
return true; return true;
} }
} }
if (textfile_extensions.has(file.get_extension())) {
Error err;
Ref<TextFile> text_file = _load_text_file(file, &err);
if (text_file.is_valid() && err == OK) {
return true; return true;
} }
}
}
return false;
}
return false; return false;
} }
@@ -2878,9 +2892,13 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
if (file == "" || !FileAccess::exists(file)) { if (file == "" || !FileAccess::exists(file)) {
continue; continue;
} }
Ref<Script> scr = ResourceLoader::load(file);
if (scr.is_valid()) { if (!ResourceLoader::exists(file, "Script") && !textfile_extensions.has(file.get_extension())) {
edit(scr); continue;
}
RES res = open_file(file);
if (res.is_valid()) {
if (tab_container->get_child_count() > num_tabs_before) { if (tab_container->get_child_count() > num_tabs_before) {
tab_container->move_child(tab_container->get_child(tab_container->get_child_count() - 1), new_index); tab_container->move_child(tab_container->get_child(tab_container->get_child_count() - 1), new_index);
num_tabs_before = tab_container->get_child_count(); num_tabs_before = tab_container->get_child_count();

3
editor/plugins/script_editor_plugin.h
View File

@@ -453,7 +453,8 @@ class ScriptEditor : public PanelContainer {
Ref<Script> _get_current_script(); Ref<Script> _get_current_script();
Array _get_open_scripts() const; Array _get_open_scripts() const;
Ref<TextFile> _load_text_file(const String &p_path, Error *r_error); Set<String> textfile_extensions;
Ref<TextFile> _load_text_file(const String &p_path, Error *r_error) const;
Error _save_text_file(Ref<TextFile> p_text_file, const String &p_path); Error _save_text_file(Ref<TextFile> p_text_file, const String &p_path);
void _on_find_in_files_requested(String text); void _on_find_in_files_requested(String text);