diff options
Diffstat (limited to 'editor/editor_file_dialog.cpp')
| -rw-r--r-- | editor/editor_file_dialog.cpp | 414 |
1 files changed, 200 insertions, 214 deletions
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index 6a06c6657e..6d694358bf 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -33,7 +33,7 @@ #include "core/os/file_access.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "core/print_string.h" +#include "core/string/print_string.h" #include "dependency_editor.h" #include "editor_file_system.h" #include "editor_resource_preview.h" @@ -50,19 +50,26 @@ EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func = nullptr; EditorFileDialog::RegisterFunc EditorFileDialog::register_func = nullptr; EditorFileDialog::RegisterFunc EditorFileDialog::unregister_func = nullptr; +void EditorFileDialog::popup_file_dialog() { + popup_centered_clamped(Size2(1050, 700) * EDSCALE, 0.8); +} + VBoxContainer *EditorFileDialog::get_vbox() { return vbox; } void EditorFileDialog::_notification(int p_what) { - - if (p_what == NOTIFICATION_ENTER_TREE) { - - // update icons + if (p_what == NOTIFICATION_READY || p_what == NOTIFICATION_THEME_CHANGED || p_what == Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED || p_what == NOTIFICATION_TRANSLATION_CHANGED) { + // Update icons. mode_thumbnails->set_icon(item_list->get_theme_icon("FileThumbnail", "EditorIcons")); mode_list->set_icon(item_list->get_theme_icon("FileList", "EditorIcons")); - dir_prev->set_icon(item_list->get_theme_icon("Back", "EditorIcons")); - dir_next->set_icon(item_list->get_theme_icon("Forward", "EditorIcons")); + if (is_layout_rtl()) { + dir_prev->set_icon(item_list->get_theme_icon("Forward", "EditorIcons")); + dir_next->set_icon(item_list->get_theme_icon("Back", "EditorIcons")); + } else { + dir_prev->set_icon(item_list->get_theme_icon("Back", "EditorIcons")); + dir_next->set_icon(item_list->get_theme_icon("Forward", "EditorIcons")); + } dir_up->set_icon(item_list->get_theme_icon("ArrowUp", "EditorIcons")); refresh->set_icon(item_list->get_theme_icon("Reload", "EditorIcons")); favorite->set_icon(item_list->get_theme_icon("Favorites", "EditorIcons")); @@ -72,13 +79,13 @@ void EditorFileDialog::_notification(int p_what) { fav_down->set_icon(item_list->get_theme_icon("MoveDown", "EditorIcons")); } else if (p_what == NOTIFICATION_PROCESS) { - if (preview_waiting) { preview_wheel_timeout -= get_process_delta_time(); if (preview_wheel_timeout <= 0) { preview_wheel_index++; - if (preview_wheel_index >= 8) + if (preview_wheel_index >= 8) { preview_wheel_index = 0; + } Ref<Texture2D> frame = item_list->get_theme_icon("Progress" + itos(preview_wheel_index + 1), "EditorIcons"); preview->set_texture(frame); preview_wheel_timeout = 0.1; @@ -86,17 +93,22 @@ void EditorFileDialog::_notification(int p_what) { } } else if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { - bool is_showing_hidden = EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files"); - if (show_hidden_files != is_showing_hidden) + if (show_hidden_files != is_showing_hidden) { set_show_hidden_files(is_showing_hidden); + } set_display_mode((DisplayMode)EditorSettings::get_singleton()->get("filesystem/file_dialog/display_mode").operator int()); - // update icons + // Update icons. mode_thumbnails->set_icon(item_list->get_theme_icon("FileThumbnail", "EditorIcons")); mode_list->set_icon(item_list->get_theme_icon("FileList", "EditorIcons")); - dir_prev->set_icon(item_list->get_theme_icon("Back", "EditorIcons")); - dir_next->set_icon(item_list->get_theme_icon("Forward", "EditorIcons")); + if (is_layout_rtl()) { + dir_prev->set_icon(item_list->get_theme_icon("Forward", "EditorIcons")); + dir_next->set_icon(item_list->get_theme_icon("Back", "EditorIcons")); + } else { + dir_prev->set_icon(item_list->get_theme_icon("Back", "EditorIcons")); + dir_next->set_icon(item_list->get_theme_icon("Forward", "EditorIcons")); + } dir_up->set_icon(item_list->get_theme_icon("ArrowUp", "EditorIcons")); refresh->set_icon(item_list->get_theme_icon("Reload", "EditorIcons")); favorite->set_icon(item_list->get_theme_icon("Favorites", "EditorIcons")); @@ -106,7 +118,6 @@ void EditorFileDialog::_notification(int p_what) { // DO NOT CALL UPDATE FILE LIST HERE, ALL HUNDREDS OF HIDDEN DIALOGS WILL RESPOND, CALL INVALIDATE INSTEAD invalidate(); } else if (p_what == NOTIFICATION_VISIBILITY_CHANGED) { - if (!is_visible()) { set_process_unhandled_input(false); } @@ -114,13 +125,10 @@ void EditorFileDialog::_notification(int p_what) { } void EditorFileDialog::_unhandled_input(const Ref<InputEvent> &p_event) { - Ref<InputEventKey> k = p_event; if (k.is_valid()) { - if (k->is_pressed()) { - bool handled = false; if (ED_IS_SHORTCUT("file_dialog/go_back", p_event)) { @@ -140,9 +148,7 @@ void EditorFileDialog::_unhandled_input(const Ref<InputEvent> &p_event) { handled = true; } if (ED_IS_SHORTCUT("file_dialog/toggle_hidden_files", p_event)) { - bool show = !show_hidden_files; - set_show_hidden_files(show); - EditorSettings::get_singleton()->set("filesystem/file_dialog/show_hidden_files", show); + set_show_hidden_files(!show_hidden_files); handled = true; } if (ED_IS_SHORTCUT("file_dialog/toggle_favorite", p_event)) { @@ -186,37 +192,34 @@ void EditorFileDialog::_unhandled_input(const Ref<InputEvent> &p_event) { } void EditorFileDialog::set_enable_multiple_selection(bool p_enable) { - item_list->set_select_mode(p_enable ? ItemList::SELECT_MULTI : ItemList::SELECT_SINGLE); }; Vector<String> EditorFileDialog::get_selected_files() const { - Vector<String> list; for (int i = 0; i < item_list->get_item_count(); i++) { - if (item_list->is_selected(i)) + if (item_list->is_selected(i)) { list.push_back(item_list->get_item_text(i)); + } } return list; }; void EditorFileDialog::update_dir() { - if (drives->is_visible()) { drives->select(dir_access->get_current_drive()); } dir->set_text(dir_access->get_current_dir(false)); // Disable "Open" button only when selecting file(s) mode. - get_ok()->set_disabled(_is_open_should_be_disabled()); + get_ok_button()->set_disabled(_is_open_should_be_disabled()); switch (mode) { - case FILE_MODE_OPEN_FILE: case FILE_MODE_OPEN_FILES: - get_ok()->set_text(TTR("Open")); + get_ok_button()->set_text(TTR("Open")); break; case FILE_MODE_OPEN_DIR: - get_ok()->set_text(TTR("Select Current Folder")); + get_ok_button()->set_text(TTR("Select Current Folder")); break; case FILE_MODE_OPEN_ANY: case FILE_MODE_SAVE_FILE: @@ -226,21 +229,17 @@ void EditorFileDialog::update_dir() { } void EditorFileDialog::_dir_entered(String p_dir) { - dir_access->change_dir(p_dir); - file->set_text(""); invalidate(); update_dir(); _push_history(); } void EditorFileDialog::_file_entered(const String &p_file) { - _action_pressed(); } void EditorFileDialog::_save_confirm_pressed() { - String f = dir_access->get_current_dir().plus_file(file->get_text()); _save_to_recent(); hide(); @@ -248,16 +247,24 @@ void EditorFileDialog::_save_confirm_pressed() { } void EditorFileDialog::_post_popup() { - ConfirmationDialog::_post_popup(); + + // Check if the current path doesn't exist and correct it. + String current = dir_access->get_current_dir(); + while (!dir_access->dir_exists(current)) { + current = current.get_base_dir(); + } + set_current_dir(current); + if (invalidated) { update_file_list(); invalidated = false; } - if (mode == FILE_MODE_SAVE_FILE) + if (mode == FILE_MODE_SAVE_FILE) { file->grab_focus(); - else + } else { item_list->grab_focus(); + } if (mode == FILE_MODE_OPEN_DIR) { file_box->set_visible(false); @@ -265,8 +272,9 @@ void EditorFileDialog::_post_popup() { file_box->set_visible(true); } - if (is_visible() && get_current_file() != "") + if (is_visible() && get_current_file() != "") { _request_single_thumbnail(get_current_dir().plus_file(get_current_file())); + } if (is_visible()) { Ref<Texture2D> folder = item_list->get_theme_icon("folder", "FileDialog"); @@ -277,19 +285,26 @@ void EditorFileDialog::_post_popup() { Vector<String> recentd = EditorSettings::get_singleton()->get_recent_dirs(); for (int i = 0; i < recentd.size(); i++) { bool cres = recentd[i].begins_with("res://"); - if (cres != res) + if (cres != res) { continue; + } String name = recentd[i]; if (res && name == "res://") { name = "/"; } else { name = name.get_file() + "/"; } - - recent->add_item(name, folder); - recent->set_item_metadata(recent->get_item_count() - 1, recentd[i]); - recent->set_item_icon_modulate(recent->get_item_count() - 1, folder_color); + bool exists = dir_access->dir_exists(recentd[i]); + if (!exists) { + // Remove invalid directory from the list of Recent directories. + recentd.remove(i--); + } else { + recent->add_item(name, folder); + recent->set_item_metadata(recent->get_item_count() - 1, recentd[i]); + recent->set_item_icon_modulate(recent->get_item_count() - 1, folder_color); + } } + EditorSettings::get_singleton()->set_recent_dirs(recentd); local_history.clear(); local_history_pos = -1; @@ -302,9 +317,9 @@ void EditorFileDialog::_post_popup() { } void EditorFileDialog::_thumbnail_result(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata) { - - if (display_mode == DISPLAY_LIST || p_preview.is_null()) + if (display_mode == DISPLAY_LIST || p_preview.is_null()) { return; + } for (int i = 0; i < item_list->get_item_count(); i++) { Dictionary d = item_list->get_item_metadata(i); @@ -317,12 +332,10 @@ void EditorFileDialog::_thumbnail_result(const String &p_path, const Ref<Texture } void EditorFileDialog::_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata) { - set_process(false); preview_waiting = false; if (p_preview.is_valid() && get_current_path() == p_path) { - preview->set_texture(p_preview); if (display_mode == DISPLAY_THUMBNAILS) { preview_vb->hide(); @@ -337,9 +350,9 @@ void EditorFileDialog::_thumbnail_done(const String &p_path, const Ref<Texture2D } void EditorFileDialog::_request_single_thumbnail(const String &p_path) { - - if (!FileAccess::exists(p_path)) + if (!FileAccess::exists(p_path)) { return; + } set_process(true); preview_waiting = true; @@ -348,15 +361,14 @@ void EditorFileDialog::_request_single_thumbnail(const String &p_path) { } void EditorFileDialog::_action_pressed() { - if (mode == FILE_MODE_OPEN_FILES) { - String fbase = dir_access->get_current_dir(); Vector<String> files; for (int i = 0; i < item_list->get_item_count(); i++) { - if (item_list->is_selected(i)) + if (item_list->is_selected(i)) { files.push_back(fbase.plus_file(item_list->get_item_text(i))); + } } if (files.size()) { @@ -375,7 +387,6 @@ void EditorFileDialog::_action_pressed() { hide(); emit_signal("file_selected", f); } else if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_DIR) { - String path = dir_access->get_current_dir(); path = path.replace("\\", "/"); @@ -397,7 +408,6 @@ void EditorFileDialog::_action_pressed() { } if (mode == FILE_MODE_SAVE_FILE) { - bool valid = false; if (filter->get_selected() == filter->get_item_count() - 1) { @@ -405,29 +415,27 @@ void EditorFileDialog::_action_pressed() { } else if (filters.size() > 1 && filter->get_selected() == 0) { // match all filters for (int i = 0; i < filters.size(); i++) { - String flt = filters[i].get_slice(";", 0); for (int j = 0; j < flt.get_slice_count(","); j++) { - String str = flt.get_slice(",", j).strip_edges(); if (f.match(str)) { valid = true; break; } } - if (valid) + if (valid) { break; + } } } else { int idx = filter->get_selected(); - if (filters.size() > 1) + if (filters.size() > 1) { idx--; + } if (idx >= 0 && idx < filters.size()) { - String flt = filters[idx].get_slice(";", 0); int filterSliceCount = flt.get_slice_count(","); for (int j = 0; j < filterSliceCount; j++) { - String str = (flt.get_slice(",", j).strip_edges()); if (f.match(str)) { valid = true; @@ -447,17 +455,18 @@ void EditorFileDialog::_action_pressed() { } } + // Add first extension of filter if no valid extension is found. if (!valid) { - - exterr->popup_centered(Size2(250, 80) * EDSCALE); - return; + int idx = filter->get_selected(); + String flt = filters[idx].get_slice(";", 0); + String ext = flt.get_slice(",", 0).strip_edges().get_extension(); + f += "." + ext; } if (dir_access->file_exists(f) && !disable_overwrite_warning) { - confirm_save->set_text(TTR("File Exists, Overwrite?")); + confirm_save->set_text(TTR("File exists, overwrite?")); confirm_save->popup_centered(Size2(200, 80)); } else { - _save_to_recent(); hide(); emit_signal("file_selected", f); @@ -466,64 +475,59 @@ void EditorFileDialog::_action_pressed() { } void EditorFileDialog::_cancel_pressed() { - file->set_text(""); invalidate(); hide(); } void EditorFileDialog::_item_selected(int p_item) { - int current = p_item; - if (current < 0 || current >= item_list->get_item_count()) + if (current < 0 || current >= item_list->get_item_count()) { return; + } Dictionary d = item_list->get_item_metadata(current); if (!d["dir"]) { - file->set_text(d["name"]); _request_single_thumbnail(get_current_dir().plus_file(get_current_file())); } else if (mode == FILE_MODE_OPEN_DIR) { - get_ok()->set_text(TTR("Select This Folder")); + get_ok_button()->set_text(TTR("Select This Folder")); } - get_ok()->set_disabled(_is_open_should_be_disabled()); + get_ok_button()->set_disabled(_is_open_should_be_disabled()); } void EditorFileDialog::_multi_selected(int p_item, bool p_selected) { - int current = p_item; - if (current < 0 || current >= item_list->get_item_count()) + if (current < 0 || current >= item_list->get_item_count()) { return; + } Dictionary d = item_list->get_item_metadata(current); if (!d["dir"] && p_selected) { - file->set_text(d["name"]); _request_single_thumbnail(get_current_dir().plus_file(get_current_file())); } - get_ok()->set_disabled(_is_open_should_be_disabled()); + get_ok_button()->set_disabled(_is_open_should_be_disabled()); } void EditorFileDialog::_items_clear_selection() { - - item_list->unselect_all(); + item_list->deselect_all(); // If nothing is selected, then block Open button. switch (mode) { - case FILE_MODE_OPEN_FILE: case FILE_MODE_OPEN_FILES: - get_ok()->set_text(TTR("Open")); - get_ok()->set_disabled(!item_list->is_anything_selected()); + get_ok_button()->set_text(TTR("Open")); + get_ok_button()->set_disabled(!item_list->is_anything_selected()); break; case FILE_MODE_OPEN_DIR: - get_ok()->set_disabled(false); - get_ok()->set_text(TTR("Select Current Folder")); + get_ok_button()->set_disabled(false); + get_ok_button()->set_text(TTR("Select Current Folder")); break; case FILE_MODE_OPEN_ANY: @@ -534,7 +538,6 @@ void EditorFileDialog::_items_clear_selection() { } void EditorFileDialog::_push_history() { - local_history.resize(local_history_pos + 1); String new_path = dir_access->get_current_dir(); if (local_history.size() == 0 || new_path != local_history[local_history_pos]) { @@ -544,16 +547,16 @@ void EditorFileDialog::_push_history() { dir_next->set_disabled(true); } } -void EditorFileDialog::_item_dc_selected(int p_item) { +void EditorFileDialog::_item_dc_selected(int p_item) { int current = p_item; - if (current < 0 || current >= item_list->get_item_count()) + if (current < 0 || current >= item_list->get_item_count()) { return; + } Dictionary d = item_list->get_item_metadata(current); if (d["dir"]) { - dir_access->change_dir(d["name"]); call_deferred("_update_file_list"); call_deferred("_update_dir"); @@ -561,13 +564,11 @@ void EditorFileDialog::_item_dc_selected(int p_item) { _push_history(); } else { - _action_pressed(); } } void EditorFileDialog::_item_list_item_rmb_selected(int p_item, const Vector2 &p_pos) { - // Right click on specific file(s) or folder(s). item_menu->clear(); item_menu->set_size(Size2(1, 1)); @@ -582,7 +583,7 @@ void EditorFileDialog::_item_list_item_rmb_selected(int p_item, const Vector2 &p continue; } Dictionary item_meta = item_list->get_item_metadata(i); - if (item_meta["path"] == "res://.import") { + if (String(item_meta["path"]).begins_with("res://.godot")) { allow_delete = false; break; } @@ -608,10 +609,9 @@ void EditorFileDialog::_item_list_item_rmb_selected(int p_item, const Vector2 &p } void EditorFileDialog::_item_list_rmb_clicked(const Vector2 &p_pos) { - // Right click on folder background. Deselect all files so that actions are applied on the current folder. for (int i = 0; i < item_list->get_item_count(); i++) { - item_list->unselect(i); + item_list->deselect(i); } item_menu->clear(); @@ -629,9 +629,7 @@ void EditorFileDialog::_item_list_rmb_clicked(const Vector2 &p_pos) { } void EditorFileDialog::_item_menu_id_pressed(int p_option) { - switch (p_option) { - case ITEM_MENU_COPY_PATH: { Dictionary item_meta = item_list->get_item_metadata(item_list->get_current()); DisplayServer::get_singleton()->clipboard_set(item_meta["path"]); @@ -669,20 +667,21 @@ void EditorFileDialog::_item_menu_id_pressed(int p_option) { } bool EditorFileDialog::_is_open_should_be_disabled() { - - if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_SAVE_FILE) + if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_SAVE_FILE) { return false; + } Vector<int> items = item_list->get_selected_items(); - if (items.size() == 0) + if (items.size() == 0) { return mode != FILE_MODE_OPEN_DIR; // In "Open folder" mode, having nothing selected picks the current folder. + } for (int i = 0; i < items.size(); i++) { - Dictionary d = item_list->get_item_metadata(items.get(i)); - if (((mode == FILE_MODE_OPEN_FILE || mode == FILE_MODE_OPEN_FILES) && d["dir"]) || (mode == FILE_MODE_OPEN_DIR && !d["dir"])) + if (((mode == FILE_MODE_OPEN_FILE || mode == FILE_MODE_OPEN_FILES) && d["dir"]) || (mode == FILE_MODE_OPEN_DIR && !d["dir"])) { return true; + } } return false; @@ -691,7 +690,9 @@ bool EditorFileDialog::_is_open_should_be_disabled() { void EditorFileDialog::update_file_name() { int idx = filter->get_selected() - 1; if ((idx == -1 && filter->get_item_count() == 2) || (filter->get_item_count() > 2 && idx >= 0 && idx < filter->get_item_count() - 2)) { - if (idx == -1) idx += 1; + if (idx == -1) { + idx += 1; + } String filter_str = filters[idx]; String file_str = file->get_text(); String base_name = file_str.get_basename(); @@ -707,7 +708,6 @@ void EditorFileDialog::update_file_name() { // DO NOT USE THIS FUNCTION UNLESS NEEDED, CALL INVALIDATE() INSTEAD. void EditorFileDialog::update_file_list() { - int thumbnail_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size"); thumbnail_size *= EDSCALE; Ref<Texture2D> folder_thumbnail; @@ -719,7 +719,6 @@ void EditorFileDialog::update_file_list() { item_list->get_v_scroll()->set_value(0); if (display_mode == DISPLAY_THUMBNAILS) { - item_list->set_max_columns(0); item_list->set_icon_mode(ItemList::ICON_MODE_TOP); item_list->set_fixed_column_width(thumbnail_size * 3 / 2); @@ -737,14 +736,14 @@ void EditorFileDialog::update_file_list() { preview_vb->hide(); } else { - item_list->set_icon_mode(ItemList::ICON_MODE_LEFT); item_list->set_max_columns(1); item_list->set_max_text_lines(1); item_list->set_fixed_column_width(0); item_list->set_fixed_icon_size(Size2()); - if (preview->get_texture().is_valid()) + if (preview->get_texture().is_valid()) { preview_vb->show(); + } } String cdir = dir_access->get_current_dir(); @@ -759,31 +758,30 @@ void EditorFileDialog::update_file_list() { String item; while ((item = dir_access->get_next()) != "") { - - if (item == "." || item == "..") + if (item == "." || item == "..") { continue; + } if (show_hidden_files || !dir_access->current_is_hidden()) { - if (!dir_access->current_is_dir()) + if (!dir_access->current_is_dir()) { files.push_back(item); - else + } else { dirs.push_back(item); + } } } dirs.sort_custom<NaturalNoCaseComparator>(); files.sort_custom<NaturalNoCaseComparator>(); - while (!dirs.empty()) { + while (!dirs.is_empty()) { const String &dir_name = dirs.front()->get(); item_list->add_item(dir_name); if (display_mode == DISPLAY_THUMBNAILS) { - item_list->set_item_icon(item_list->get_item_count() - 1, folder_thumbnail); } else { - item_list->set_item_icon(item_list->get_item_count() - 1, folder); } @@ -801,55 +799,45 @@ void EditorFileDialog::update_file_list() { List<String> patterns; // build filter if (filter->get_selected() == filter->get_item_count() - 1) { - // match all } else if (filters.size() > 1 && filter->get_selected() == 0) { // match all filters for (int i = 0; i < filters.size(); i++) { - String f = filters[i].get_slice(";", 0); for (int j = 0; j < f.get_slice_count(","); j++) { - patterns.push_back(f.get_slice(",", j).strip_edges()); } } } else { int idx = filter->get_selected(); - if (filters.size() > 1) + if (filters.size() > 1) { idx--; + } if (idx >= 0 && idx < filters.size()) { - String f = filters[idx].get_slice(";", 0); for (int j = 0; j < f.get_slice_count(","); j++) { - patterns.push_back(f.get_slice(",", j).strip_edges()); } } } - while (!files.empty()) { - - bool match = patterns.empty(); + while (!files.is_empty()) { + bool match = patterns.is_empty(); for (List<String>::Element *E = patterns.front(); E; E = E->next()) { - if (files.front()->get().matchn(E->get())) { - match = true; break; } } if (match) { - item_list->add_item(files.front()->get()); if (get_icon_func) { - Ref<Texture2D> icon = get_icon_func(cdir.plus_file(files.front()->get())); if (display_mode == DISPLAY_THUMBNAILS) { - item_list->set_item_icon(item_list->get_item_count() - 1, file_thumbnail); item_list->set_item_tag_icon(item_list->get_item_count() - 1, icon); } else { @@ -868,21 +856,22 @@ void EditorFileDialog::update_file_list() { EditorResourcePreview::get_singleton()->queue_resource_preview(fullpath, this, "_thumbnail_result", fullpath); } - if (file->get_text() == files.front()->get()) + if (file->get_text() == files.front()->get()) { item_list->set_current(item_list->get_item_count() - 1); + } } files.pop_front(); } if (favorites->get_current() >= 0) { - favorites->unselect(favorites->get_current()); + favorites->deselect(favorites->get_current()); } favorite->set_pressed(false); fav_up->set_disabled(true); fav_down->set_disabled(true); - get_ok()->set_disabled(_is_open_should_be_disabled()); + get_ok_button()->set_disabled(_is_open_should_be_disabled()); for (int i = 0; i < favorites->get_item_count(); i++) { if (favorites->get_item_metadata(i) == cdir || favorites->get_item_metadata(i) == cdir + "/") { favorites->select(i); @@ -904,7 +893,6 @@ void EditorFileDialog::_filter_selected(int) { } void EditorFileDialog::update_filters() { - filter->clear(); if (filters.size() > 1) { @@ -914,86 +902,87 @@ void EditorFileDialog::update_filters() { for (int i = 0; i < MIN(max_filters, filters.size()); i++) { String flt = filters[i].get_slice(";", 0).strip_edges(); - if (i > 0) + if (i > 0) { all_filters += ", "; + } all_filters += flt; } - if (max_filters < filters.size()) + if (max_filters < filters.size()) { all_filters += ", ..."; + } filter->add_item(TTR("All Recognized") + " (" + all_filters + ")"); } for (int i = 0; i < filters.size(); i++) { - String flt = filters[i].get_slice(";", 0).strip_edges(); String desc = filters[i].get_slice(";", 1).strip_edges(); - if (desc.length()) + if (desc.length()) { filter->add_item(desc + " (" + flt + ")"); - else + } else { filter->add_item("(" + flt + ")"); + } } filter->add_item(TTR("All Files (*)")); } void EditorFileDialog::clear_filters() { - filters.clear(); update_filters(); invalidate(); } -void EditorFileDialog::add_filter(const String &p_filter) { +void EditorFileDialog::add_filter(const String &p_filter) { filters.push_back(p_filter); update_filters(); invalidate(); } String EditorFileDialog::get_current_dir() const { - return dir_access->get_current_dir(); } -String EditorFileDialog::get_current_file() const { +String EditorFileDialog::get_current_file() const { return file->get_text(); } -String EditorFileDialog::get_current_path() const { +String EditorFileDialog::get_current_path() const { return dir_access->get_current_dir().plus_file(file->get_text()); } -void EditorFileDialog::set_current_dir(const String &p_dir) { - if (p_dir.is_rel_path()) +void EditorFileDialog::set_current_dir(const String &p_dir) { + if (p_dir.is_rel_path()) { dir_access->change_dir(OS::get_singleton()->get_resource_dir()); + } dir_access->change_dir(p_dir); update_dir(); invalidate(); } -void EditorFileDialog::set_current_file(const String &p_file) { +void EditorFileDialog::set_current_file(const String &p_file) { file->set_text(p_file); update_dir(); invalidate(); - int lp = p_file.find_last("."); + int lp = p_file.rfind("."); if (lp != -1) { file->select(0, lp); file->grab_focus(); } - if (is_visible()) + if (is_visible()) { _request_single_thumbnail(get_current_dir().plus_file(get_current_file())); + } } -void EditorFileDialog::set_current_path(const String &p_path) { - if (!p_path.size()) +void EditorFileDialog::set_current_path(const String &p_path) { + if (!p_path.size()) { return; - int pos = MAX(p_path.find_last("/"), p_path.find_last("\\")); + } + int pos = MAX(p_path.rfind("/"), p_path.rfind("\\")); if (pos == -1) { - set_current_file(p_path); } else { - String dir = p_path.substr(0, pos); String file = p_path.substr(pos + 1, p_path.length()); set_current_dir(dir); @@ -1002,32 +991,30 @@ void EditorFileDialog::set_current_path(const String &p_path) { } void EditorFileDialog::set_file_mode(FileMode p_mode) { - mode = p_mode; switch (mode) { - case FILE_MODE_OPEN_FILE: - get_ok()->set_text(TTR("Open")); + get_ok_button()->set_text(TTR("Open")); set_title(TTR("Open a File")); can_create_dir = false; break; case FILE_MODE_OPEN_FILES: - get_ok()->set_text(TTR("Open")); + get_ok_button()->set_text(TTR("Open")); set_title(TTR("Open File(s)")); can_create_dir = false; break; case FILE_MODE_OPEN_DIR: - get_ok()->set_text(TTR("Open")); + get_ok_button()->set_text(TTR("Open")); set_title(TTR("Open a Directory")); can_create_dir = true; break; case FILE_MODE_OPEN_ANY: - get_ok()->set_text(TTR("Open")); + get_ok_button()->set_text(TTR("Open")); set_title(TTR("Open a File or Directory")); can_create_dir = true; break; case FILE_MODE_SAVE_FILE: - get_ok()->set_text(TTR("Save")); + get_ok_button()->set_text(TTR("Save")); set_title(TTR("Save a File")); can_create_dir = true; break; @@ -1047,27 +1034,23 @@ void EditorFileDialog::set_file_mode(FileMode p_mode) { } EditorFileDialog::FileMode EditorFileDialog::get_file_mode() const { - return mode; } void EditorFileDialog::set_access(Access p_access) { - ERR_FAIL_INDEX(p_access, 3); - if (access == p_access) + if (access == p_access) { return; + } memdelete(dir_access); switch (p_access) { case ACCESS_FILESYSTEM: { - dir_access = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); } break; case ACCESS_RESOURCES: { - dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES); } break; case ACCESS_USERDATA: { - dir_access = DirAccess::create(DirAccess::ACCESS_USERDATA); } break; } @@ -1079,7 +1062,6 @@ void EditorFileDialog::set_access(Access p_access) { } void EditorFileDialog::invalidate() { - if (is_visible()) { update_file_list(); _update_favorites(); @@ -1090,12 +1072,10 @@ void EditorFileDialog::invalidate() { } EditorFileDialog::Access EditorFileDialog::get_access() const { - return access; } void EditorFileDialog::_make_dir_confirm() { - Error err = dir_access->make_dir(makedirname->get_text()); if (err == OK) { dir_access->change_dir(makedirname->get_text()); @@ -1111,13 +1091,11 @@ void EditorFileDialog::_make_dir_confirm() { } void EditorFileDialog::_make_dir() { - makedialog->popup_centered(Size2(250, 80) * EDSCALE); makedirname->grab_focus(); } void EditorFileDialog::_delete_items() { - // Collect the selected folders and files to delete and check them in the deletion dependency dialog. Vector<String> folders; Vector<String> files; @@ -1139,7 +1117,6 @@ void EditorFileDialog::_delete_items() { } void EditorFileDialog::_select_drive(int p_idx) { - String d = drives->get_item_text(p_idx); dir_access->change_dir(d); file->set_text(""); @@ -1149,7 +1126,6 @@ void EditorFileDialog::_select_drive(int p_idx) { } void EditorFileDialog::_update_drives() { - int dc = dir_access->get_drive_count(); if (dc == 0 || access != ACCESS_FILESYSTEM) { drives->hide(); @@ -1173,16 +1149,13 @@ void EditorFileDialog::_update_drives() { } void EditorFileDialog::_favorite_selected(int p_idx) { - dir_access->change_dir(favorites->get_item_metadata(p_idx)); - file->set_text(""); update_dir(); invalidate(); _push_history(); } void EditorFileDialog::_favorite_move_up() { - int current = favorites->get_current(); if (current > 0 && current < favorites->get_item_count()) { @@ -1191,8 +1164,9 @@ void EditorFileDialog::_favorite_move_up() { int a_idx = favorited.find(String(favorites->get_item_metadata(current - 1))); int b_idx = favorited.find(String(favorites->get_item_metadata(current))); - if (a_idx == -1 || b_idx == -1) + if (a_idx == -1 || b_idx == -1) { return; + } SWAP(favorited.write[a_idx], favorited.write[b_idx]); EditorSettings::get_singleton()->set_favorites(favorited); @@ -1201,8 +1175,8 @@ void EditorFileDialog::_favorite_move_up() { update_file_list(); } } -void EditorFileDialog::_favorite_move_down() { +void EditorFileDialog::_favorite_move_down() { int current = favorites->get_current(); if (current >= 0 && current < favorites->get_item_count() - 1) { @@ -1211,8 +1185,9 @@ void EditorFileDialog::_favorite_move_down() { int a_idx = favorited.find(String(favorites->get_item_metadata(current + 1))); int b_idx = favorited.find(String(favorites->get_item_metadata(current))); - if (a_idx == -1 || b_idx == -1) + if (a_idx == -1 || b_idx == -1) { return; + } SWAP(favorited.write[a_idx], favorited.write[b_idx]); EditorSettings::get_singleton()->set_favorites(favorited); @@ -1223,7 +1198,6 @@ void EditorFileDialog::_favorite_move_down() { } void EditorFileDialog::_update_favorites() { - bool res = access == ACCESS_RESOURCES; String current = get_current_dir(); @@ -1236,20 +1210,23 @@ void EditorFileDialog::_update_favorites() { Vector<String> favorited = EditorSettings::get_singleton()->get_favorites(); for (int i = 0; i < favorited.size(); i++) { bool cres = favorited[i].begins_with("res://"); - if (cres != res) + if (cres != res) { continue; + } String name = favorited[i]; bool setthis = false; if (res && name == "res://") { - if (name == current) + if (name == current) { setthis = true; + } name = "/"; favorites->add_item(name, folder_icon); } else if (name.ends_with("/")) { - if (name == current || name == current + "/") + if (name == current || name == current + "/") { setthis = true; + } name = name.substr(0, name.length() - 1); name = name.get_file(); @@ -1264,7 +1241,7 @@ void EditorFileDialog::_update_favorites() { if (setthis) { favorite->set_pressed(true); favorites->set_current(favorites->get_item_count() - 1); - recent->unselect_all(); + recent->deselect_all(); } } } @@ -1273,16 +1250,18 @@ void EditorFileDialog::_favorite_pressed() { bool res = access == ACCESS_RESOURCES; String cd = get_current_dir(); - if (!cd.ends_with("/")) + if (!cd.ends_with("/")) { cd += "/"; + } Vector<String> favorited = EditorSettings::get_singleton()->get_favorites(); bool found = false; for (int i = 0; i < favorited.size(); i++) { bool cres = favorited[i].begins_with("res://"); - if (cres != res) + if (cres != res) { continue; + } if (favorited[i] == cd) { found = true; @@ -1290,10 +1269,11 @@ void EditorFileDialog::_favorite_pressed() { } } - if (found) + if (found) { favorited.erase(cd); - else + } else { favorited.push_back(cd); + } EditorSettings::get_singleton()->set_favorites(favorited); @@ -1301,7 +1281,6 @@ void EditorFileDialog::_favorite_pressed() { } void EditorFileDialog::_recent_selected(int p_idx) { - Vector<String> recentd = EditorSettings::get_singleton()->get_recent_dirs(); ERR_FAIL_INDEX(p_idx, recentd.size()); @@ -1312,7 +1291,6 @@ void EditorFileDialog::_recent_selected(int p_idx) { } void EditorFileDialog::_go_up() { - dir_access->change_dir(".."); update_file_list(); update_dir(); @@ -1320,7 +1298,6 @@ void EditorFileDialog::_go_up() { } void EditorFileDialog::_go_back() { - if (local_history_pos <= 0) { return; } @@ -1333,8 +1310,8 @@ void EditorFileDialog::_go_back() { dir_prev->set_disabled(local_history_pos == 0); dir_next->set_disabled(local_history_pos == local_history.size() - 1); } -void EditorFileDialog::_go_forward() { +void EditorFileDialog::_go_forward() { if (local_history_pos == local_history.size() - 1) { return; } @@ -1353,9 +1330,9 @@ bool EditorFileDialog::default_show_hidden_files = false; EditorFileDialog::DisplayMode EditorFileDialog::default_display_mode = DISPLAY_THUMBNAILS; void EditorFileDialog::set_display_mode(DisplayMode p_mode) { - - if (display_mode == p_mode) + if (display_mode == p_mode) { return; + } if (p_mode == DISPLAY_THUMBNAILS) { mode_list->set_pressed(false); mode_thumbnails->set_pressed(true); @@ -1368,12 +1345,10 @@ void EditorFileDialog::set_display_mode(DisplayMode p_mode) { } EditorFileDialog::DisplayMode EditorFileDialog::get_display_mode() const { - return display_mode; } void EditorFileDialog::_bind_methods() { - ClassDB::bind_method(D_METHOD("_unhandled_input"), &EditorFileDialog::_unhandled_input); ClassDB::bind_method(D_METHOD("_cancel_pressed"), &EditorFileDialog::_cancel_pressed); @@ -1433,6 +1408,11 @@ void EditorFileDialog::_bind_methods() { } void EditorFileDialog::set_show_hidden_files(bool p_show) { + if (p_show == show_hidden_files) { + return; + } + + EditorSettings::get_singleton()->set("filesystem/file_dialog/show_hidden_files", p_show); show_hidden_files = p_show; show_hidden->set_pressed(p_show); invalidate(); @@ -1451,7 +1431,6 @@ void EditorFileDialog::set_default_display_mode(DisplayMode p_mode) { } void EditorFileDialog::_save_to_recent() { - String dir = get_current_dir(); Vector<String> recent = EditorSettings::get_singleton()->get_recent_dirs(); @@ -1475,17 +1454,14 @@ void EditorFileDialog::_save_to_recent() { } void EditorFileDialog::set_disable_overwrite_warning(bool p_disable) { - disable_overwrite_warning = p_disable; } bool EditorFileDialog::is_overwrite_warning_disabled() const { - return disable_overwrite_warning; } EditorFileDialog::EditorFileDialog() { - show_hidden_files = default_show_hidden_files; display_mode = default_display_mode; local_history_pos = 0; @@ -1511,11 +1487,14 @@ EditorFileDialog::EditorFileDialog() { HBoxContainer *pathhb = memnew(HBoxContainer); - dir_prev = memnew(ToolButton); + dir_prev = memnew(Button); + dir_prev->set_flat(true); dir_prev->set_tooltip(TTR("Go to previous folder.")); - dir_next = memnew(ToolButton); + dir_next = memnew(Button); + dir_next->set_flat(true); dir_next->set_tooltip(TTR("Go to next folder.")); - dir_up = memnew(ToolButton); + dir_up = memnew(Button); + dir_up->set_flat(true); dir_up->set_tooltip(TTR("Go to parent folder.")); pathhb->add_child(dir_prev); @@ -1532,21 +1511,25 @@ EditorFileDialog::EditorFileDialog() { pathhb->add_child(drives_container); dir = memnew(LineEdit); + dir->set_structured_text_bidi_override(Control::STRUCTURED_TEXT_FILE); pathhb->add_child(dir); dir->set_h_size_flags(Control::SIZE_EXPAND_FILL); - refresh = memnew(ToolButton); + refresh = memnew(Button); + refresh->set_flat(true); refresh->set_tooltip(TTR("Refresh files.")); refresh->connect("pressed", callable_mp(this, &EditorFileDialog::update_file_list)); pathhb->add_child(refresh); - favorite = memnew(ToolButton); + favorite = memnew(Button); + favorite->set_flat(true); favorite->set_toggle_mode(true); favorite->set_tooltip(TTR("(Un)favorite current folder.")); favorite->connect("pressed", callable_mp(this, &EditorFileDialog::_favorite_pressed)); pathhb->add_child(favorite); - show_hidden = memnew(ToolButton); + show_hidden = memnew(Button); + show_hidden->set_flat(true); show_hidden->set_toggle_mode(true); show_hidden->set_pressed(is_showing_hidden_files()); show_hidden->set_tooltip(TTR("Toggle the visibility of hidden files.")); @@ -1558,7 +1541,8 @@ EditorFileDialog::EditorFileDialog() { Ref<ButtonGroup> view_mode_group; view_mode_group.instance(); - mode_thumbnails = memnew(ToolButton); + mode_thumbnails = memnew(Button); + mode_thumbnails->set_flat(true); mode_thumbnails->connect("pressed", callable_mp(this, &EditorFileDialog::set_display_mode), varray(DISPLAY_THUMBNAILS)); mode_thumbnails->set_toggle_mode(true); mode_thumbnails->set_pressed(display_mode == DISPLAY_THUMBNAILS); @@ -1566,7 +1550,8 @@ EditorFileDialog::EditorFileDialog() { mode_thumbnails->set_tooltip(TTR("View items as a grid of thumbnails.")); pathhb->add_child(mode_thumbnails); - mode_list = memnew(ToolButton); + mode_list = memnew(Button); + mode_list->set_flat(true); mode_list->connect("pressed", callable_mp(this, &EditorFileDialog::set_display_mode), varray(DISPLAY_LIST)); mode_list->set_toggle_mode(true); mode_list->set_pressed(display_mode == DISPLAY_LIST); @@ -1603,10 +1588,12 @@ EditorFileDialog::EditorFileDialog() { fav_vb->add_child(fav_hb); fav_hb->add_child(memnew(Label(TTR("Favorites:")))); fav_hb->add_spacer(); - fav_up = memnew(ToolButton); + fav_up = memnew(Button); + fav_up->set_flat(true); fav_hb->add_child(fav_up); fav_up->connect("pressed", callable_mp(this, &EditorFileDialog::_favorite_move_up)); - fav_down = memnew(ToolButton); + fav_down = memnew(Button); + fav_down->set_flat(true); fav_hb->add_child(fav_down); fav_down->connect("pressed", callable_mp(this, &EditorFileDialog::_favorite_move_down)); @@ -1663,6 +1650,7 @@ EditorFileDialog::EditorFileDialog() { file_box = memnew(HBoxContainer); file_box->add_child(memnew(Label(TTR("File:")))); file = memnew(LineEdit); + file->set_structured_text_bidi_override(Control::STRUCTURED_TEXT_FILE); file->set_stretch_ratio(4); file->set_h_size_flags(Control::SIZE_EXPAND_FILL); file_box->add_child(file); @@ -1688,7 +1676,7 @@ EditorFileDialog::EditorFileDialog() { filter->connect("item_selected", callable_mp(this, &EditorFileDialog::_filter_selected)); confirm_save = memnew(ConfirmationDialog); - //confirm_save->set_as_toplevel(true); + //confirm_save->set_as_top_level(true); add_child(confirm_save); confirm_save->connect("confirmed", callable_mp(this, &EditorFileDialog::_save_confirm_pressed)); @@ -1701,6 +1689,7 @@ EditorFileDialog::EditorFileDialog() { makedialog->add_child(makevb); makedirname = memnew(LineEdit); + makedirname->set_structured_text_bidi_override(Control::STRUCTURED_TEXT_FILE); makevb->add_margin_child(TTR("Name:"), makedirname); add_child(makedialog); makedialog->register_text_enter(makedirname); @@ -1709,10 +1698,6 @@ EditorFileDialog::EditorFileDialog() { mkdirerr->set_text(TTR("Could not create folder.")); add_child(mkdirerr); - exterr = memnew(AcceptDialog); - exterr->set_text(TTR("Must use a valid extension.")); - add_child(exterr); - update_filters(); update_dir(); @@ -1720,8 +1705,9 @@ EditorFileDialog::EditorFileDialog() { vbox = vbc; invalidated = true; - if (register_func) + if (register_func) { register_func(this); + } preview_wheel_timeout = 0; preview_wheel_index = 0; @@ -1729,8 +1715,8 @@ EditorFileDialog::EditorFileDialog() { } EditorFileDialog::~EditorFileDialog() { - - if (unregister_func) + if (unregister_func) { unregister_func(this); + } memdelete(dir_access); } |