diff options
Diffstat (limited to 'editor/filesystem_dock.cpp')
| -rw-r--r-- | editor/filesystem_dock.cpp | 1252 |
1 files changed, 627 insertions, 625 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index d0d8b0f0cd..62d77f56bc 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -38,16 +38,12 @@ #include "project_settings.h" #include "scene/main/viewport.h" -bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir) { +bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir, Vector<String> &uncollapsed_paths) { TreeItem *item = tree->create_item(p_parent); String dname = p_dir->get_name(); if (dname == "") dname = "res://"; - else { - // collapse every tree item but the root folder - item->set_collapsed(true); - } item->set_text(0, dname); item->set_icon(0, get_icon("Folder", "EditorIcons")); @@ -61,38 +57,78 @@ bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory item->select(0); } + if ((path.begins_with(lpath) && path != lpath)) { + item->set_collapsed(false); + } else { + bool is_collapsed = true; + for (int i = 0; i < uncollapsed_paths.size(); i++) { + if (lpath == uncollapsed_paths[i]) { + is_collapsed = false; + break; + } + } + item->set_collapsed(is_collapsed); + } + for (int i = 0; i < p_dir->get_subdir_count(); i++) - _create_tree(item, p_dir->get_subdir(i)); + _create_tree(item, p_dir->get_subdir(i), uncollapsed_paths); return true; } -void FileSystemDock::_update_tree() { +void FileSystemDock::_update_tree(bool keep_collapse_state) { + + Vector<String> uncollapsed_paths; + if (keep_collapse_state) { + TreeItem *root = tree->get_root(); + if (root) { + TreeItem *resTree = root->get_children()->get_next(); + + Vector<TreeItem *> needs_check; + needs_check.push_back(resTree); + + while (needs_check.size()) { + if (!needs_check[0]->is_collapsed()) { + uncollapsed_paths.push_back(needs_check[0]->get_metadata(0)); + TreeItem *child = needs_check[0]->get_children(); + while (child) { + needs_check.push_back(child); + child = child->get_next(); + } + } + needs_check.remove(0); + } + } + } tree->clear(); updating_tree = true; + TreeItem *root = tree->create_item(); TreeItem *favorites = tree->create_item(root); favorites->set_icon(0, get_icon("Favorites", "EditorIcons")); favorites->set_text(0, TTR("Favorites:")); favorites->set_selectable(0, false); - Vector<String> faves = EditorSettings::get_singleton()->get_favorite_dirs(); - for (int i = 0; i < faves.size(); i++) { - if (!faves[i].begins_with("res://")) + + Vector<String> favorite_paths = EditorSettings::get_singleton()->get_favorite_dirs(); + String res_path = "res://"; + Ref<Texture> folder_icon = get_icon("Folder", "EditorIcons"); + for (int i = 0; i < favorite_paths.size(); i++) { + String fave = favorite_paths[i]; + if (!fave.begins_with(res_path)) continue; TreeItem *ti = tree->create_item(favorites); - String fv = faves[i]; - if (fv == "res://") + if (fave == res_path) ti->set_text(0, "/"); else - ti->set_text(0, faves[i].get_file()); - ti->set_icon(0, get_icon("Folder", "EditorIcons")); + ti->set_text(0, fave.get_file()); + ti->set_icon(0, folder_icon); ti->set_selectable(0, true); - ti->set_metadata(0, faves[i]); + ti->set_metadata(0, fave); } - _create_tree(root, EditorFileSystem::get_singleton()->get_filesystem()); + _create_tree(root, EditorFileSystem::get_singleton()->get_filesystem(), uncollapsed_paths); updating_tree = false; } @@ -104,26 +140,28 @@ void FileSystemDock::_notification(int p_what) { bool new_mode = get_size().height < get_viewport_rect().size.height / 2; - if (new_mode != split_mode) { + if (new_mode != low_height_mode) { - split_mode = new_mode; + low_height_mode = new_mode; - //print_line("SPLIT MODE? "+itos(split_mode)); - if (split_mode) { + if (low_height_mode) { file_list_vb->hide(); - tree->set_custom_minimum_size(Size2(0, 0)); tree->set_v_size_flags(SIZE_EXPAND_FILL); - button_back->show(); + button_tree->show(); } else { - tree->show(); - file_list_vb->show(); - tree->set_custom_minimum_size(Size2(0, 200) * EDSCALE); tree->set_v_size_flags(SIZE_FILL); - button_back->hide(); - if (!EditorFileSystem::get_singleton()->is_scanning()) { - _fs_changed(); + if (!tree->is_visible()) { + tree->show(); + button_favorite->show(); + _update_tree(true); + } + + if (!file_list_vb->is_visible()) { + file_list_vb->show(); + button_tree->hide(); + _update_files(true); } } } @@ -138,34 +176,32 @@ void FileSystemDock::_notification(int p_what) { EditorFileSystem::get_singleton()->connect("filesystem_changed", this, "_fs_changed"); EditorResourcePreview::get_singleton()->connect("preview_invalidated", this, "_preview_invalidated"); - button_reload->set_icon(get_icon("Reload", "EditorIcons")); - button_favorite->set_icon(get_icon("Favorites", "EditorIcons")); - //button_instance->set_icon( get_icon("Add","EditorIcons")); - //button_open->set_icon( get_icon("Folder","EditorIcons")); - button_back->set_icon(get_icon("Filesystem", "EditorIcons")); - if (display_mode == DISPLAY_THUMBNAILS) { - button_display_mode->set_icon(get_icon("FileList", "EditorIcons")); - } else { - button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons")); - } + String ei = "EditorIcons"; + button_reload->set_icon(get_icon("Reload", ei)); + button_favorite->set_icon(get_icon("Favorites", ei)); + //button_instance->set_icon(get_icon("Add", ei)); + //button_open->set_icon(get_icon("Folder", ei)); + button_tree->set_icon(get_icon("Filesystem", ei)); + _update_file_display_toggle_button(); button_display_mode->connect("pressed", this, "_change_file_display"); - //file_options->set_icon( get_icon("Tools","EditorIcons")); + //file_options->set_icon( get_icon("Tools","ei")); files->connect("item_activated", this, "_select_file"); button_hist_next->connect("pressed", this, "_fw_history"); button_hist_prev->connect("pressed", this, "_bw_history"); - search_box->add_icon_override("right_icon", get_icon("Search", "EditorIcons")); + search_box->add_icon_override("right_icon", get_icon("Search", ei)); - button_hist_next->set_icon(get_icon("Forward", "EditorIcons")); - button_hist_prev->set_icon(get_icon("Back", "EditorIcons")); + button_hist_next->set_icon(get_icon("Forward", ei)); + button_hist_prev->set_icon(get_icon("Back", ei)); file_options->connect("id_pressed", this, "_file_option"); folder_options->connect("id_pressed", this, "_folder_option"); - button_back->connect("pressed", this, "_go_to_tree", varray(), CONNECT_DEFERRED); - current_path->connect("text_entered", this, "_go_to_dir"); - _update_tree(); //maybe it finished already + button_tree->connect("pressed", this, "_go_to_tree", varray(), CONNECT_DEFERRED); + current_path->connect("text_entered", this, "navigate_to_path"); if (EditorFileSystem::get_singleton()->is_scanning()) { _set_scanning_mode(); + } else { + _update_tree(false); } } break; @@ -183,8 +219,7 @@ void FileSystemDock::_notification(int p_what) { if (tree->is_visible_in_tree() && dd.has("type")) { if ((String(dd["type"]) == "files") || (String(dd["type"]) == "files_and_dirs") || (String(dd["type"]) == "resource")) { tree->set_drop_mode_flags(Tree::DROP_MODE_ON_ITEM); - } - if ((String(dd["type"]) == "favorite")) { + } else if ((String(dd["type"]) == "favorite")) { tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN); } } @@ -197,37 +232,54 @@ void FileSystemDock::_notification(int p_what) { } break; case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { + String ei = "EditorIcons"; int new_mode = int(EditorSettings::get_singleton()->get("docks/filesystem/display_mode")); + //_update_icons + + button_reload->set_icon(get_icon("Reload", ei)); + button_favorite->set_icon(get_icon("Favorites", ei)); + button_tree->set_icon(get_icon("Filesystem", ei)); + button_hist_next->set_icon(get_icon("Forward", ei)); + button_hist_prev->set_icon(get_icon("Back", ei)); + + search_box->add_icon_override("right_icon", get_icon("Search", ei)); + if (new_mode != display_mode) { set_display_mode(new_mode); } else { + _update_file_display_toggle_button(); _update_files(true); } + + _update_tree(true); } break; } } void FileSystemDock::_dir_selected() { - TreeItem *ti = tree->get_selected(); - if (!ti) + TreeItem *sel = tree->get_selected(); + if (!sel) return; - String dir = ti->get_metadata(0); + path = sel->get_metadata(0); + bool found = false; Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs(); for (int i = 0; i < favorites.size(); i++) { - if (favorites[i] == dir) { + if (favorites[i] == path) { found = true; break; } } button_favorite->set_pressed(found); + current_path->set_text(path); + _push_to_history(); - if (!split_mode) { - _open_pressed(); //go directly to dir + if (!low_height_mode) { + _update_files(false); } } @@ -236,27 +288,25 @@ void FileSystemDock::_favorites_pressed() { TreeItem *sel = tree->get_selected(); if (!sel) return; - String dir = sel->get_metadata(0); + path = sel->get_metadata(0); int idx = -1; Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs(); for (int i = 0; i < favorites.size(); i++) { - if (favorites[i] == dir) { + if (favorites[i] == path) { idx = i; break; } } - if (button_favorite->is_pressed() && idx == -1) { - favorites.push_back(dir); - EditorSettings::get_singleton()->set_favorite_dirs(favorites); - _update_tree(); - } else if (!button_favorite->is_pressed() && idx != -1) { + if (idx == -1) { + favorites.push_back(path); + } else { favorites.remove(idx); - EditorSettings::get_singleton()->set_favorite_dirs(favorites); - _update_tree(); } + EditorSettings::get_singleton()->set_favorite_dirs(favorites); + _update_tree(true); } String FileSystemDock::get_selected_path() const { @@ -264,8 +314,8 @@ String FileSystemDock::get_selected_path() const { TreeItem *sel = tree->get_selected(); if (!sel) return ""; - String path = sel->get_metadata(0); - return "res://" + path; + + return sel->get_metadata(0); } String FileSystemDock::get_current_path() const { @@ -275,27 +325,33 @@ String FileSystemDock::get_current_path() const { void FileSystemDock::navigate_to_path(const String &p_path) { // If the path is a file, do not only go to the directory in the tree, also select the file in the file list. - String dir_path = ""; String file_name = ""; DirAccess *dirAccess = DirAccess::open("res://"); if (dirAccess->file_exists(p_path)) { - dir_path = p_path.get_base_dir(); + path = p_path.get_base_dir(); file_name = p_path.get_file(); } else if (dirAccess->dir_exists(p_path)) { - dir_path = p_path; + path = p_path; } else { ERR_EXPLAIN(TTR("Cannot navigate to '" + p_path + "' as it has not been found in the file system!")); ERR_FAIL(); } - path = dir_path; - _update_tree(); - tree->ensure_cursor_is_visible(); + current_path->set_text(path); + _push_to_history(); - if (!file_name.empty()) { - _open_pressed(); // Seems to be the only way to get into the file view. This also pushes to history. + if (!low_height_mode) { + _update_tree(true); + _update_files(false); + } else { + if (file_name.empty()) { + _go_to_tree(); + } else { + _go_to_file_list(); + } + } - // Focus the given file. + if (!file_name.empty()) { for (int i = 0; i < files->get_item_count(); i++) { if (files->get_item_text(i) == file_name) { files->select(i, true); @@ -308,39 +364,32 @@ void FileSystemDock::navigate_to_path(const String &p_path) { void FileSystemDock::_thumbnail_done(const String &p_path, const Ref<Texture> &p_preview, const Variant &p_udata) { - bool valid = false; - - if (search_box->is_visible()) { - valid = true; - } else { - valid = (path == p_path.get_base_dir()); - } - - if (p_preview.is_valid() && valid) { + if ((file_list_vb->is_visible_in_tree() || path == p_path.get_base_dir()) && p_preview.is_valid()) { Array uarr = p_udata; int idx = uarr[0]; String file = uarr[1]; - if (idx >= files->get_item_count()) - return; - if (files->get_item_text(idx) != file) - return; - String fpath = files->get_item_metadata(idx); - if (fpath != p_path) - return; - files->set_item_icon(idx, p_preview); + if (idx < files->get_item_count() && files->get_item_text(idx) == file && files->get_item_metadata(idx) == p_path) + files->set_item_icon(idx, p_preview); } } -void FileSystemDock::_change_file_display() { +void FileSystemDock::_update_file_display_toggle_button() { if (button_display_mode->is_pressed()) { display_mode = DISPLAY_LIST; button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons")); + button_display_mode->set_tooltip(TTR("View items as a grid of thumbnails")); } else { display_mode = DISPLAY_THUMBNAILS; button_display_mode->set_icon(get_icon("FileList", "EditorIcons")); + button_display_mode->set_tooltip(TTR("View items as a list")); } +} + +void FileSystemDock::_change_file_display() { + + _update_file_display_toggle_button(); EditorSettings::get_singleton()->set("docks/filesystem/display_mode", display_mode); @@ -367,6 +416,7 @@ void FileSystemDock::_search(EditorFileSystemDirectory *p_path, List<FileInfo> * fi.name = file; fi.type = p_path->get_file_type(i); fi.path = p_path->get_file_path(i); + fi.import_broken = !p_path->get_file_import_is_valid(i); fi.import_status = 0; matches->push_back(fi); @@ -397,15 +447,19 @@ void FileSystemDock::_update_files(bool p_keep_selection) { if (!efd) return; + String ei = "EditorIcons"; int thumbnail_size = EditorSettings::get_singleton()->get("docks/filesystem/thumbnail_size"); thumbnail_size *= EDSCALE; Ref<Texture> folder_thumbnail; Ref<Texture> file_thumbnail; + Ref<Texture> file_thumbnail_broken; + + bool always_show_folders = EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders"); bool use_thumbnails = (display_mode == DISPLAY_THUMBNAILS); - bool use_folders = search_box->get_text().length() == 0 && split_mode; + bool use_folders = search_box->get_text().length() == 0 && (low_height_mode || always_show_folders); - if (use_thumbnails) { //thumbnails + if (use_thumbnails) { files->set_max_columns(0); files->set_icon_mode(ItemList::ICON_MODE_TOP); @@ -413,29 +467,15 @@ void FileSystemDock::_update_files(bool p_keep_selection) { files->set_max_text_lines(2); files->set_fixed_icon_size(Size2(thumbnail_size, thumbnail_size)); - if (!has_icon("ResizedFolder", "EditorIcons")) { - Ref<ImageTexture> folder = get_icon("FolderBig", "EditorIcons"); - Ref<Image> img = folder->get_data(); - img = img->duplicate(); - img->resize(thumbnail_size, thumbnail_size); - Ref<ImageTexture> resized_folder = Ref<ImageTexture>(memnew(ImageTexture)); - resized_folder->create_from_image(img, 0); - Theme::get_default()->set_icon("ResizedFolder", "EditorIcons", resized_folder); - } - - folder_thumbnail = get_icon("ResizedFolder", "EditorIcons"); - - if (!has_icon("ResizedFile", "EditorIcons")) { - Ref<ImageTexture> file = get_icon("FileBig", "EditorIcons"); - Ref<Image> img = file->get_data(); - img->resize(thumbnail_size, thumbnail_size); - Ref<ImageTexture> resized_file = Ref<ImageTexture>(memnew(ImageTexture)); - resized_file->create_from_image(img, 0); - Theme::get_default()->set_icon("ResizedFile", "EditorIcons", resized_file); + if (thumbnail_size < 64) { + folder_thumbnail = get_icon("FolderMediumThumb", ei); + file_thumbnail = get_icon("FileMediumThumb", ei); + file_thumbnail_broken = get_icon("FileDeadMediumThumb", ei); + } else { + folder_thumbnail = get_icon("FolderBigThumb", ei); + file_thumbnail = get_icon("FileBigThumb", ei); + file_thumbnail_broken = get_icon("FileDeadBigThumb", ei); } - - file_thumbnail = get_icon("ResizedFile", "EditorIcons"); - } else { files->set_icon_mode(ItemList::ICON_MODE_LEFT); @@ -446,14 +486,10 @@ void FileSystemDock::_update_files(bool p_keep_selection) { } if (use_folders) { + Ref<Texture> folderIcon = (use_thumbnails) ? folder_thumbnail : get_icon("folder", "FileDialog"); if (path != "res://") { - - if (use_thumbnails) { - files->add_item("..", folder_thumbnail, true); - } else { - files->add_item("..", get_icon("folder", "FileDialog"), true); - } + files->add_item("..", folderIcon, false); String bd = path.get_base_dir(); if (bd != "res://" && !bd.ends_with("/")) @@ -466,12 +502,7 @@ void FileSystemDock::_update_files(bool p_keep_selection) { String dname = efd->get_subdir(i)->get_name(); - if (use_thumbnails) { - files->add_item(dname, folder_thumbnail, true); - } else { - files->add_item(dname, get_icon("folder", "FileDialog"), true); - } - + files->add_item(dname, folderIcon, true); files->set_item_metadata(files->get_item_count() - 1, path.plus_file(dname) + "/"); if (cselection.has(dname)) @@ -481,12 +512,9 @@ void FileSystemDock::_update_files(bool p_keep_selection) { List<FileInfo> filelist; - if (search_box->get_text().length()) { - - if (search_box->get_text().length() > 1) { - _search(EditorFileSystem::get_singleton()->get_filesystem(), &filelist, 128); - } + if (search_box->get_text().length() > 0) { + _search(EditorFileSystem::get_singleton()->get_filesystem(), &filelist, 128); filelist.sort(); } else { @@ -496,97 +524,100 @@ void FileSystemDock::_update_files(bool p_keep_selection) { fi.name = efd->get_file(i); fi.path = path.plus_file(fi.name); fi.type = efd->get_file_type(i); + fi.import_broken = !efd->get_file_import_is_valid(i); fi.import_status = 0; filelist.push_back(fi); } } - StringName ei = "EditorIcons"; //make it faster.. - StringName oi = "Object"; + String oi = "Object"; for (List<FileInfo>::Element *E = filelist.front(); E; E = E->next()) { - String fname = E->get().name; - String fp = E->get().path; - StringName type = E->get().type; + FileInfo *finfo = &(E->get()); + String fname = finfo->name; + String fpath = finfo->path; + String ftype = finfo->type; Ref<Texture> type_icon; + Ref<Texture> big_icon; String tooltip = fname; - if (E->get().import_status == 0) { - - if (has_icon(type, ei)) { - type_icon = get_icon(type, ei); - } else { - type_icon = get_icon(oi, ei); - } - } else if (E->get().import_status == 1) { - type_icon = get_icon("DependencyOk", "EditorIcons"); - } else if (E->get().import_status == 2) { - type_icon = get_icon("DependencyChanged", "EditorIcons"); - tooltip += TTR("\nStatus: Needs Re-Import"); - } else if (E->get().import_status == 3) { - type_icon = get_icon("ImportFail", "EditorIcons"); - tooltip += ("\nStatus: Missing Dependencies"); - } - - if (E->get().sources.size()) { - for (int i = 0; i < E->get().sources.size(); i++) { - tooltip += TTR("\nSource: ") + E->get().sources[i]; - } + if (!finfo->import_broken) { + type_icon = (has_icon(ftype, ei)) ? get_icon(ftype, ei) : get_icon(oi, ei); + big_icon = file_thumbnail; + } else { + type_icon = get_icon("ImportFail", ei); + big_icon = file_thumbnail_broken; + tooltip += TTR("\nStatus: Import of file failed. Please fix file and reimport manually."); } + int item_index; if (use_thumbnails) { - files->add_item(fname, file_thumbnail, true); - files->set_item_metadata(files->get_item_count() - 1, fp); - files->set_item_tag_icon(files->get_item_count() - 1, type_icon); - Array udata; - udata.resize(2); - udata[0] = files->get_item_count() - 1; - udata[1] = fname; - EditorResourcePreview::get_singleton()->queue_resource_preview(fp, this, "_thumbnail_done", udata); + files->add_item(fname, big_icon, true); + item_index = files->get_item_count() - 1; + files->set_item_metadata(item_index, fpath); + files->set_item_tag_icon(item_index, type_icon); + if (!finfo->import_broken) { + Array udata; + udata.resize(2); + udata[0] = item_index; + udata[1] = fname; + EditorResourcePreview::get_singleton()->queue_resource_preview(fpath, this, "_thumbnail_done", udata); + } } else { files->add_item(fname, type_icon, true); - files->set_item_metadata(files->get_item_count() - 1, fp); + item_index = files->get_item_count() - 1; + files->set_item_metadata(item_index, fpath); } if (cselection.has(fname)) - files->select(files->get_item_count() - 1, false); + files->select(item_index, false); - files->set_item_tooltip(files->get_item_count() - 1, tooltip); + if (finfo->sources.size()) { + for (int j = 0; j < finfo->sources.size(); j++) { + tooltip += "\nSource: " + finfo->sources[j]; + } + } + files->set_item_tooltip(item_index, tooltip); } } void FileSystemDock::_select_file(int p_idx) { - - files->select(p_idx, true); - _file_option(FILE_OPEN); + String fpath = files->get_item_metadata(p_idx); + if (fpath.ends_with("/")) { + if (fpath != "res://") { + fpath = fpath.substr(0, fpath.length() - 1); + } + path = fpath; + _update_files(false); + current_path->set_text(path); + _push_to_history(); + } else { + if (ResourceLoader::get_resource_type(path) == "PackedScene") { + editor->open_request(path); + } else { + editor->load_resource(path); + } + } } void FileSystemDock::_go_to_tree() { - tree->show(); - file_list_vb->hide(); - _update_tree(); + if (low_height_mode) { + tree->show(); + button_favorite->show(); + file_list_vb->hide(); + } + + _update_tree(true); tree->grab_focus(); tree->ensure_cursor_is_visible(); - button_favorite->show(); //button_open->hide(); //file_options->hide(); } -void FileSystemDock::_go_to_dir(const String &p_dir) { - - DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); - if (da->change_dir(p_dir) == OK) { - path = da->get_current_dir(); - _update_files(false); - } - current_path->set_text(path); - memdelete(da); -} - void FileSystemDock::_preview_invalidated(const String &p_path) { if (display_mode == DISPLAY_THUMBNAILS && p_path.get_base_dir() == path && search_box->get_text() == String() && file_list_vb->is_visible_in_tree()) { @@ -609,17 +640,15 @@ void FileSystemDock::_preview_invalidated(const String &p_path) { void FileSystemDock::_fs_changed() { button_hist_prev->set_disabled(history_pos == 0); - button_hist_next->set_disabled(history_pos + 1 == history.size()); + button_hist_next->set_disabled(history_pos == history.size() - 1); scanning_vb->hide(); split_box->show(); if (tree->is_visible()) { - button_favorite->show(); - _update_tree(); + _update_tree(true); } if (file_list_vb->is_visible()) { - _update_files(true); } @@ -628,9 +657,9 @@ void FileSystemDock::_fs_changed() { void FileSystemDock::_set_scanning_mode() { - split_box->hide(); button_hist_prev->set_disabled(true); button_hist_next->set_disabled(true); + split_box->hide(); scanning_vb->show(); set_process(true); if (EditorFileSystem::get_singleton()->is_scanning()) { @@ -645,69 +674,63 @@ void FileSystemDock::_fw_history() { if (history_pos < history.size() - 1) history_pos++; - path = history[history_pos]; - - if (tree->is_visible()) { - _update_tree(); - tree->grab_focus(); - tree->ensure_cursor_is_visible(); - } - - if (file_list_vb->is_visible()) { - _update_files(false); - current_path->set_text(path); - } - - button_hist_prev->set_disabled(history_pos == 0); - button_hist_next->set_disabled(history_pos + 1 == history.size()); + _update_history(); } void FileSystemDock::_bw_history() { - if (history_pos > 0) history_pos--; + _update_history(); +} + +void FileSystemDock::_update_history() { path = history[history_pos]; + current_path->set_text(path); if (tree->is_visible()) { - _update_tree(); + _update_tree(true); tree->grab_focus(); tree->ensure_cursor_is_visible(); } if (file_list_vb->is_visible()) { _update_files(false); - current_path->set_text(path); } button_hist_prev->set_disabled(history_pos == 0); - button_hist_next->set_disabled(history_pos + 1 == history.size()); + button_hist_next->set_disabled(history_pos == history.size() - 1); } void FileSystemDock::_push_to_history() { - - history.resize(history_pos + 1); if (history[history_pos] != path) { + history.resize(history_pos + 1); history.push_back(path); history_pos++; + + if (history.size() > history_max_size) { + history.remove(0); + history_pos = history_max_size - 1; + } } button_hist_prev->set_disabled(history_pos == 0); - button_hist_next->set_disabled(history_pos + 1 == history.size()); + button_hist_next->set_disabled(history_pos == history.size() - 1); } -void FileSystemDock::_find_inside_move_files(EditorFileSystemDirectory *efsd, Vector<String> &files) { +void FileSystemDock::_get_all_files_in_dir(EditorFileSystemDirectory *efsd, Vector<String> &files) const { + if (efsd == NULL) + return; for (int i = 0; i < efsd->get_subdir_count(); i++) { - _find_inside_move_files(efsd->get_subdir(i), files); + _get_all_files_in_dir(efsd->get_subdir(i), files); } for (int i = 0; i < efsd->get_file_count(); i++) { files.push_back(efsd->get_file_path(i)); } } -void FileSystemDock::_find_remaps(EditorFileSystemDirectory *efsd, Map<String, String> &renames, List<String> &to_remaps) { - +void FileSystemDock::_find_remaps(EditorFileSystemDirectory *efsd, const Map<String, String> &renames, Vector<String> &to_remaps) const { for (int i = 0; i < efsd->get_subdir_count(); i++) { _find_remaps(efsd->get_subdir(i), renames, to_remaps); } @@ -722,187 +745,157 @@ void FileSystemDock::_find_remaps(EditorFileSystemDirectory *efsd, Map<String, S } } -void FileSystemDock::_rename_operation(const String &p_to_path) { +void FileSystemDock::_try_move_item(const FileOrFolder &p_item, const String &p_new_path, Map<String, String> &p_renames) const { + //Ensure folder paths end with "/" + String old_path = (p_item.is_file || p_item.path.ends_with("/")) ? p_item.path : (p_item.path + "/"); + String new_path = (p_item.is_file || p_new_path.ends_with("/")) ? p_new_path : (p_new_path + "/"); - if (move_files[0] == p_to_path) { - EditorNode::get_singleton()->show_warning(TTR("Same source and destination files, doing nothing.")); + if (new_path == old_path) { return; - } - if (FileAccess::exists(p_to_path)) { - EditorNode::get_singleton()->show_warning(TTR("Target file exists, can't overwrite. Delete first.")); + } else if (old_path == "res://") { + EditorNode::get_singleton()->add_io_error(TTR("Cannot move/rename resources root.")); + return; + } else if (!p_item.is_file && new_path.begins_with(old_path)) { + //This check doesn't erroneously catch renaming to a longer name as folder paths always end with "/" + EditorNode::get_singleton()->add_io_error(TTR("Cannot move a folder into itself.\n") + old_path + "\n"); return; } - Map<String, String> renames; - renames[move_files[0]] = p_to_path; - - List<String> remap; - - _find_remaps(EditorFileSystem::get_singleton()->get_filesystem(), renames, remap); - print_line("found files to remap: " + itos(remap.size())); - - //perform remaps - for (List<String>::Element *E = remap.front(); E; E = E->next()) { - - Error err = ResourceLoader::rename_dependencies(E->get(), renames); - print_line("remapping: " + E->get()); - - if (err != OK) { - EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n" + E->get() + "\n"); - } + //Build a list of files which will have new paths as a result of this operation + Vector<String> changed_paths; + if (p_item.is_file) { + changed_paths.push_back(old_path); + } else { + _get_all_files_in_dir(EditorFileSystem::get_singleton()->get_filesystem_path(old_path), changed_paths); } - //finally, perform moves - DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); + print_line("Moving " + old_path + " -> " + new_path); + Error err = da->rename(old_path, new_path); + if (err == OK) { + //Move/Rename any corresponding import settings too + if (p_item.is_file && FileAccess::exists(old_path + ".import")) { + err = da->rename(old_path + ".import", new_path + ".import"); + if (err != OK) { + EditorNode::get_singleton()->add_io_error(TTR("Error moving:\n") + old_path + ".import\n"); + } + } - Error err = da->rename(move_files[0], p_to_path); - print_line("moving file " + move_files[0] + " to " + p_to_path); - if (err != OK) { - EditorNode::get_singleton()->add_io_error("Error moving file:\n" + move_files[0] + "\n"); + //Only treat as a changed dependency if it was successfully moved + for (int i = 0; i < changed_paths.size(); ++i) { + p_renames[changed_paths[i]] = changed_paths[i].replace_first(old_path, new_path); + print_line(" Remap: " + changed_paths[i] + " -> " + p_renames[changed_paths[i]]); + } + } else { + EditorNode::get_singleton()->add_io_error(TTR("Error moving:\n") + old_path + "\n"); } - - //rescan everything memdelete(da); - print_line("call rescan!"); - _rescan(); } -void FileSystemDock::_move_operation(const String &p_to_path) { - - if (p_to_path == path) { - EditorNode::get_singleton()->show_warning(TTR("Same source and destination paths, doing nothing.")); - return; - } - - //find files inside dirs to be moved - - Vector<String> inside_files; - - for (int i = 0; i < move_dirs.size(); i++) { - if (p_to_path.begins_with(move_dirs[i])) { - EditorNode::get_singleton()->show_warning(TTR("Can't move directories to within themselves.")); - return; +void FileSystemDock::_update_dependencies_after_move(const Map<String, String> &p_renames) const { + //The following code assumes that the following holds: + // 1) EditorFileSystem contains the old paths/folder structure from before the rename/move. + // 2) ResourceLoader can use the new paths without needing to call rescan. + Vector<String> remaps; + _find_remaps(EditorFileSystem::get_singleton()->get_filesystem(), p_renames, remaps); + for (int i = 0; i < remaps.size(); ++i) { + //Because we haven't called a rescan yet the found remap might still be an old path itself. + String file = p_renames.has(remaps[i]) ? p_renames[remaps[i]] : remaps[i]; + print_line("Remapping dependencies for: " + file); + Error err = ResourceLoader::rename_dependencies(file, p_renames); + if (err != OK) { + EditorNode::get_singleton()->add_io_error(TTR("Unable to update dependencies:\n") + remaps[i] + "\n"); } - - EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->get_filesystem_path(move_dirs[i]); - if (!efsd) - continue; - _find_inside_move_files(efsd, inside_files); } +} - //make list of remaps - Map<String, String> renames; - String repfrom = path == "res://" ? path : String(path + "/"); - String repto = p_to_path == "res://" ? p_to_path : String(p_to_path + "/"); +void FileSystemDock::_make_dir_confirm() { + String dir_name = make_dir_dialog_text->get_text().strip_edges(); - for (int i = 0; i < move_files.size(); i++) { - renames[move_files[i]] = move_files[i].replace_first(repfrom, repto); - print_line("move file " + move_files[i] + " -> " + renames[move_files[i]]); - } - for (int i = 0; i < inside_files.size(); i++) { - renames[inside_files[i]] = inside_files[i].replace_first(repfrom, repto); - print_line("inside file " + inside_files[i] + " -> " + renames[inside_files[i]]); + if (dir_name.length() == 0) { + EditorNode::get_singleton()->show_warning(TTR("No name provided")); + return; + } else if (dir_name.find("/") != -1 || dir_name.find("\\") != -1 || dir_name.find(":") != -1) { + EditorNode::get_singleton()->show_warning(TTR("Provided name contains invalid characters")); + return; } - //make list of files that will be run the remapping - List<String> remap; - - _find_remaps(EditorFileSystem::get_singleton()->get_filesystem(), renames, remap); - print_line("found files to remap: " + itos(remap.size())); + print_line("Making folder " + dir_name + " in " + path); + DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); + Error err = da->change_dir(path); + if (err == OK) { + err = da->make_dir(dir_name); + } + memdelete(da); - //perform remaps - for (List<String>::Element *E = remap.front(); E; E = E->next()) { + if (err == OK) { + print_line("call rescan!"); + _rescan(); + } else { + EditorNode::get_singleton()->show_warning(TTR("Could not create folder.")); + } +} - Error err = ResourceLoader::rename_dependencies(E->get(), renames); - print_line("remapping: " + E->get()); +void FileSystemDock::_rename_operation_confirm() { - if (err != OK) { - EditorNode::get_singleton()->add_io_error(TTR("Can't rename deps for:\n") + E->get() + "\n"); - } + String new_name = rename_dialog_text->get_text().strip_edges(); + if (new_name.length() == 0) { + EditorNode::get_singleton()->show_warning(TTR("No name provided.")); + return; + } else if (new_name.find("/") != -1 || new_name.find("\\") != -1 || new_name.find(":") != -1) { + EditorNode::get_singleton()->show_warning(TTR("Name contains invalid characters.")); + return; } - //finally, perform moves + String old_path = to_rename.path.ends_with("/") ? to_rename.path.substr(0, to_rename.path.length() - 1) : to_rename.path; + String new_path = old_path.get_base_dir().plus_file(new_name); + if (old_path == new_path) { + return; + } + //Present a more user friendly warning for name conflict DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); - - for (int i = 0; i < move_files.size(); i++) { - - String to = move_files[i].replace_first(repfrom, repto); - Error err = da->rename(move_files[i], to); - print_line("moving file " + move_files[i] + " to " + to); - if (err != OK) { - EditorNode::get_singleton()->add_io_error(TTR("Error moving file:\n") + move_files[i] + "\n"); - } + if (da->file_exists(new_path) || da->dir_exists(new_path)) { + EditorNode::get_singleton()->show_warning(TTR("A file or folder with this name already exists.")); + memdelete(da); + return; } + memdelete(da); - for (int i = 0; i < move_dirs.size(); i++) { + Map<String, String> renames; + _try_move_item(to_rename, new_path, renames); + _update_dependencies_after_move(renames); - String mdir = move_dirs[i]; - if (mdir == "res://") - continue; + //Rescan everything + print_line("call rescan!"); + _rescan(); +} - if (mdir.ends_with("/")) { - mdir = mdir.substr(0, mdir.length() - 1); - } +void FileSystemDock::_move_operation_confirm(const String &p_to_path) { - String to = p_to_path.plus_file(mdir.get_file()); - Error err = da->rename(mdir, to); - print_line("moving dir " + mdir + " to " + to); - if (err != OK) { - EditorNode::get_singleton()->add_io_error(TTR("Error moving dir:\n") + move_dirs[i] + "\n"); - } + Map<String, String> renames; + for (int i = 0; i < to_move.size(); i++) { + String old_path = to_move[i].path.ends_with("/") ? to_move[i].path.substr(0, to_move[i].path.length() - 1) : to_move[i].path; + String new_path = p_to_path.plus_file(old_path.get_file()); + _try_move_item(to_move[i], new_path, renames); } - memdelete(da); - //rescan everything + _update_dependencies_after_move(renames); print_line("call rescan!"); _rescan(); } void FileSystemDock::_file_option(int p_option) { - switch (p_option) { - - case FILE_SHOW_IN_EXPLORER: + case FILE_SHOW_IN_EXPLORER: { + String dir = ProjectSettings::get_singleton()->globalize_path(this->path); + OS::get_singleton()->shell_open(String("file://") + dir); + } break; case FILE_OPEN: { - int idx = -1; - for (int i = 0; i < files->get_item_count(); i++) { - if (files->is_selected(i)) { - idx = i; - break; - } - } - - if (idx < 0) - return; - - String path = files->get_item_metadata(idx); - if (p_option == FILE_SHOW_IN_EXPLORER) { - String dir = ProjectSettings::get_singleton()->globalize_path(path); - dir = dir.substr(0, dir.find_last("/")); - OS::get_singleton()->shell_open(String("file://") + dir); - return; - } - - if (path.ends_with("/")) { - if (path != "res://") { - path = path.substr(0, path.length() - 1); - } - this->path = path; - _update_files(false); - current_path->set_text(path); - _push_to_history(); - } else { - - if (ResourceLoader::get_resource_type(path) == "PackedScene") { - - editor->open_request(path); - } else { - - editor->load_resource(path); - } - } + int idx = files->get_current(); + if (idx < 0 || idx >= files->get_item_count()) + break; + _select_file(idx); } break; case FILE_INSTANCE: { @@ -911,9 +904,9 @@ void FileSystemDock::_file_option(int p_option) { for (int i = 0; i < files->get_item_count(); i++) { if (!files->is_selected(i)) continue; - String path = files->get_item_metadata(i); - if (EditorFileSystem::get_singleton()->get_file_type(path) == "PackedScene") { - paths.push_back(path); + String fpath = files->get_item_metadata(i); + if (EditorFileSystem::get_singleton()->get_file_type(fpath) == "PackedScene") { + paths.push_back(fpath); } } @@ -926,76 +919,71 @@ void FileSystemDock::_file_option(int p_option) { int idx = files->get_current(); if (idx < 0 || idx >= files->get_item_count()) break; - String path = files->get_item_metadata(idx); - deps_editor->edit(path); + String fpath = files->get_item_metadata(idx); + deps_editor->edit(fpath); } break; case FILE_OWNERS: { int idx = files->get_current(); if (idx < 0 || idx >= files->get_item_count()) break; - String path = files->get_item_metadata(idx); - owners_editor->show(path); + String fpath = files->get_item_metadata(idx); + owners_editor->show(fpath); } break; case FILE_MOVE: { - - move_dirs.clear(); - move_files.clear(); - + to_move.clear(); for (int i = 0; i < files->get_item_count(); i++) { - - String path = files->get_item_metadata(i); if (!files->is_selected(i)) continue; - if (files->get_item_text(i) == "..") { - EditorNode::get_singleton()->show_warning(TTR("Can't operate on '..'")); - return; - } - - if (path.ends_with("/")) { - move_dirs.push_back(path.substr(0, path.length() - 1)); - } else { - move_files.push_back(path); - } + String fpath = files->get_item_metadata(i); + to_move.push_back(FileOrFolder(fpath, !fpath.ends_with("/"))); } - - if (move_dirs.empty() && move_files.size() == 1) { - - rename_dialog->clear_filters(); - rename_dialog->add_filter("*." + move_files[0].get_extension()); - rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE); - rename_dialog->set_current_path(move_files[0]); - rename_dialog->popup_centered_ratio(); - rename_dialog->set_title(TTR("Pick New Name and Location For:") + " " + move_files[0].get_file()); - - } else { - //just move + if (to_move.size() > 0) { move_dialog->popup_centered_ratio(); } + } break; + case FILE_RENAME: { + int idx = files->get_current(); + if (idx < 0 || idx >= files->get_item_count()) + break; + to_rename.path = files->get_item_metadata(idx); + to_rename.is_file = !to_rename.path.ends_with("/"); + if (to_rename.is_file) { + String name = to_rename.path.get_file(); + rename_dialog->set_title(TTR("Renaming file:") + " " + name); + rename_dialog_text->set_text(name); + rename_dialog_text->select(0, name.find_last(".")); + } else { + String name = to_rename.path.substr(0, to_rename.path.length() - 1).get_file(); + rename_dialog->set_title(TTR("Renaming folder:") + " " + name); + rename_dialog_text->set_text(name); + rename_dialog_text->select(0, name.length()); + } + rename_dialog->popup_centered_minsize(Size2(250, 80) * EDSCALE); + rename_dialog_text->grab_focus(); } break; case FILE_REMOVE: { - - Vector<String> torem; + Vector<String> remove_files; + Vector<String> remove_folders; for (int i = 0; i < files->get_item_count(); i++) { - - String path = files->get_item_metadata(i); - if (path.ends_with("/") || !files->is_selected(i)) - continue; - torem.push_back(path); + String fpath = files->get_item_metadata(i); + if (files->is_selected(i) && fpath != "res://") { + if (fpath.ends_with("/")) { + remove_folders.push_back(fpath); + } else { + remove_files.push_back(fpath); + } + } } - if (torem.empty()) { - EditorNode::get_singleton()->show_warning(TTR("No files selected!")); - break; + if (remove_files.size() + remove_folders.size() > 0) { + remove_dialog->show(remove_folders, remove_files); + //1) find if used + //2) warn } - - remove_dialog->show(torem); - //1) find if used - //2) warn - } break; case FILE_INFO: { @@ -1008,8 +996,8 @@ void FileSystemDock::_file_option(int p_option) { if (!files->is_selected(i)) continue; - String path = files->get_item_metadata(i); - reimport.push_back(path); + String fpath = files->get_item_metadata(i); + reimport.push_back(fpath); } ERR_FAIL_COND(reimport.size() == 0); @@ -1032,61 +1020,97 @@ void FileSystemDock::_file_option(int p_option) { } */ - } break; - case FILE_COPY_PATH: - + case FILE_NEW_FOLDER: { + make_dir_dialog_text->set_text("new folder"); + make_dir_dialog_text->select_all(); + make_dir_dialog->popup_centered_minsize(Size2(250, 80) * EDSCALE); + make_dir_dialog_text->grab_focus(); + } break; + case FILE_COPY_PATH: { int idx = files->get_current(); if (idx < 0 || idx >= files->get_item_count()) break; - String path = files->get_item_metadata(idx); - OS::get_singleton()->set_clipboard(path); + String fpath = files->get_item_metadata(idx); + OS::get_singleton()->set_clipboard(fpath); + } break; } } void FileSystemDock::_folder_option(int p_option) { - TreeItem *item = tree->get_selected(); - TreeItem *child = item->get_children(); + TreeItem *selected = tree->get_selected(); switch (p_option) { - case FOLDER_EXPAND_ALL: - item->set_collapsed(false); - while (child) { - child->set_collapsed(false); - child = child->get_next(); - } - break; + case FOLDER_COLLAPSE_ALL: { + bool is_collapsed = (p_option == FOLDER_COLLAPSE_ALL); + Vector<TreeItem *> needs_check; + needs_check.push_back(selected); + + while (needs_check.size()) { + needs_check[0]->set_collapsed(is_collapsed); + + TreeItem *child = needs_check[0]->get_children(); + while (child) { + needs_check.push_back(child); + child = child->get_next(); + } - case FOLDER_COLLAPSE_ALL: - while (child) { - child->set_collapsed(true); - child = child->get_next(); + needs_check.remove(0); } - break; - case FOLDER_SHOW_IN_EXPLORER: - String path = item->get_metadata(tree->get_selected_column()); - String dir = ProjectSettings::get_singleton()->globalize_path(path); + } break; + case FOLDER_MOVE: { + to_move.clear(); + String fpath = selected->get_metadata(tree->get_selected_column()); + if (fpath != "res://") { + fpath = fpath.ends_with("/") ? fpath.substr(0, fpath.length() - 1) : fpath; + to_move.push_back(FileOrFolder(fpath, false)); + move_dialog->popup_centered_ratio(); + } + } break; + case FOLDER_RENAME: { + to_rename.path = selected->get_metadata(tree->get_selected_column()); + to_rename.is_file = false; + if (to_rename.path != "res://") { + String name = to_rename.path.ends_with("/") ? to_rename.path.substr(0, to_rename.path.length() - 1).get_file() : to_rename.path.get_file(); + rename_dialog->set_title(TTR("Renaming folder:") + " " + name); + rename_dialog_text->set_text(name); + rename_dialog_text->select(0, name.length()); + rename_dialog->popup_centered_minsize(Size2(250, 80) * EDSCALE); + rename_dialog_text->grab_focus(); + } + } break; + case FOLDER_REMOVE: { + Vector<String> remove_folders; + Vector<String> remove_files; + String fpath = selected->get_metadata(tree->get_selected_column()); + if (fpath != "res://") { + remove_folders.push_back(fpath); + remove_dialog->show(remove_folders, remove_files); + } + } break; + case FOLDER_NEW_FOLDER: { + make_dir_dialog_text->set_text("new folder"); + make_dir_dialog_text->select_all(); + make_dir_dialog->popup_centered_minsize(Size2(250, 80) * EDSCALE); + make_dir_dialog_text->grab_focus(); + } break; + case FOLDER_COPY_PATH: { + String fpath = selected->get_metadata(tree->get_selected_column()); + OS::get_singleton()->set_clipboard(fpath); + } break; + case FOLDER_SHOW_IN_EXPLORER: { + String fpath = selected->get_metadata(tree->get_selected_column()); + String dir = ProjectSettings::get_singleton()->globalize_path(fpath); OS::get_singleton()->shell_open(String("file://") + dir); - return; + } break; } } -void FileSystemDock::_open_pressed() { - - TreeItem *sel = tree->get_selected(); - if (!sel) { - return; - } - path = sel->get_metadata(0); - /*if (path!="res://" && path.ends_with("/")) { - path=path.substr(0,path.length()-1); - }*/ - - //tree_mode=false; +void FileSystemDock::_go_to_file_list() { - if (split_mode) { + if (low_height_mode) { tree->hide(); file_list_vb->show(); button_favorite->hide(); @@ -1095,8 +1119,6 @@ void FileSystemDock::_open_pressed() { //file_options->show(); _update_files(false); - current_path->set_text(path); - _push_to_history(); //emit_signal("open",path); } @@ -1108,19 +1130,28 @@ void FileSystemDock::_dir_rmb_pressed(const Vector2 &p_pos) { folder_options->add_item(TTR("Expand all"), FOLDER_EXPAND_ALL); folder_options->add_item(TTR("Collapse all"), FOLDER_COLLAPSE_ALL); - folder_options->add_separator(); - folder_options->add_item(TTR("Show In File Manager"), FOLDER_SHOW_IN_EXPLORER); - + TreeItem *item = tree->get_selected(); + if (item) { + String fpath = item->get_metadata(tree->get_selected_column()); + folder_options->add_separator(); + folder_options->add_item(TTR("Copy Path"), FOLDER_COPY_PATH); + if (fpath != "res://") { + folder_options->add_item(TTR("Rename.."), FOLDER_RENAME); + folder_options->add_item(TTR("Move To.."), FOLDER_MOVE); + folder_options->add_item(TTR("Delete"), FOLDER_REMOVE); + } + folder_options->add_separator(); + folder_options->add_item(TTR("New Folder.."), FOLDER_NEW_FOLDER); + folder_options->add_item(TTR("Show In File Manager"), FOLDER_SHOW_IN_EXPLORER); + } folder_options->set_position(tree->get_global_position() + p_pos); folder_options->popup(); } void FileSystemDock::_search_changed(const String &p_text) { - if (!search_box->is_visible_in_tree()) - return; //wtf - - _update_files(false); + if (file_list_vb->is_visible()) + _update_files(false); } void FileSystemDock::_rescan() { @@ -1135,7 +1166,7 @@ void FileSystemDock::fix_dependencies(const String &p_for_file) { void FileSystemDock::focus_on_filter() { - if (!search_box->is_visible_in_tree()) { + if (low_height_mode && tree->is_visible()) { // Tree mode, switch to files list with search box tree->hide(); file_list_vb->show(); @@ -1162,13 +1193,13 @@ Variant FileSystemDock::get_drag_data_fw(const Point2 &p_point, Control *p_from) if (!selected) return Variant(); - String path = selected->get_metadata(0); - if (path == String()) + String fpath = selected->get_metadata(0); + if (fpath == String()) return Variant(); - if (!path.ends_with("/")) - path = path + "/"; + if (!fpath.ends_with("/")) + fpath = fpath + "/"; Vector<String> paths; - paths.push_back(path); + paths.push_back(fpath); Dictionary d = EditorNode::get_singleton()->drag_files(paths, p_from); if (selected->get_parent() && tree->get_root()->get_children() == selected->get_parent()) { @@ -1186,8 +1217,8 @@ Variant FileSystemDock::get_drag_data_fw(const Point2 &p_point, Control *p_from) for (int i = 0; i < files->get_item_count(); i++) { if (files->is_selected(i)) { - String path = files->get_item_metadata(i); - if (path.ends_with("/")) + String fpath = files->get_item_metadata(i); + if (fpath.ends_with("/")) seldirs.push_back(i); else selfiles.push_back(i); @@ -1208,22 +1239,20 @@ Variant FileSystemDock::get_drag_data_fw(const Point2 &p_point, Control *p_from) } }*/ - if (selfiles.size() > 0 && seldirs.size() == 0) { - Vector<String> fnames; - for (List<int>::Element *E = selfiles.front(); E; E = E->next()) { - fnames.push_back(files->get_item_metadata(E->get())); - } - return EditorNode::get_singleton()->drag_files(fnames, p_from); - } - + Vector<String> fnames; if (selfiles.size() > 0 || seldirs.size() > 0) { - Vector<String> fnames; - for (List<int>::Element *E = selfiles.front(); E; E = E->next()) { - fnames.push_back(files->get_item_metadata(E->get())); + if (selfiles.size() > 0) { + for (List<int>::Element *E = selfiles.front(); E; E = E->next()) { + fnames.push_back(files->get_item_metadata(E->get())); + } + if (seldirs.size() == 0) + return EditorNode::get_singleton()->drag_files(fnames, p_from); } + for (List<int>::Element *E = seldirs.front(); E; E = E->next()) { fnames.push_back(files->get_item_metadata(E->get())); } + return EditorNode::get_singleton()->drag_files_and_dirs(fnames, p_from); } } @@ -1238,11 +1267,11 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da if (drag_data.has("type") && String(drag_data["type"]) == "favorite") { //moving favorite around - TreeItem *ti = tree->get_item_at_pos(p_point); + TreeItem *ti = tree->get_item_at_position(p_point); if (!ti) return false; - int what = tree->get_drop_section_at_pos(p_point); + int what = tree->get_drop_section_at_position(p_point); if (ti == tree->get_root()->get_children()) { return (what == 1); //the parent, first fav @@ -1268,7 +1297,7 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da if (p_from == files) { - int at_pos = files->get_item_at_pos(p_point); + int at_pos = files->get_item_at_position(p_point); if (at_pos != -1) { String dir = files->get_item_metadata(at_pos); @@ -1279,12 +1308,12 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da if (p_from == tree) { - TreeItem *ti = tree->get_item_at_pos(p_point); + TreeItem *ti = tree->get_item_at_position(p_point); if (!ti) return false; - String path = ti->get_metadata(0); - if (path == String()) + String fpath = ti->get_metadata(0); + if (fpath == String()) return false; return true; @@ -1303,7 +1332,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, if (drag_data.has("type") && String(drag_data["type"]) == "favorite") { //moving favorite around - TreeItem *ti = tree->get_item_at_pos(p_point); + TreeItem *ti = tree->get_item_at_position(p_point); if (!ti) return; @@ -1316,7 +1345,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, swap = swap.substr(0, swap.length() - 1); } - int what = tree->get_drop_section_at_pos(p_point); + int what = tree->get_drop_section_at_position(p_point); TreeItem *swap_item = NULL; @@ -1358,7 +1387,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, } EditorSettings::get_singleton()->set_favorite_dirs(dirs); - _update_tree(); + _update_tree(true); return; } @@ -1371,22 +1400,22 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, if (p_from == tree) { - TreeItem *ti = tree->get_item_at_pos(p_point); + TreeItem *ti = tree->get_item_at_position(p_point); if (!ti) return; - String path = ti->get_metadata(0); - if (path == String()) + String fpath = ti->get_metadata(0); + if (fpath == String()) return; - EditorNode::get_singleton()->save_resource_as(res, path); + EditorNode::get_singleton()->save_resource_as(res, fpath); return; } if (p_from == files) { String save_path = path; - int at_pos = files->get_item_at_pos(p_point); + int at_pos = files->get_item_at_position(p_point); if (at_pos != -1) { String to_dir = files->get_item_metadata(at_pos); if (to_dir.ends_with("/")) { @@ -1409,11 +1438,11 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, if (p_from == files) { - int at_pos = files->get_item_at_pos(p_point); + int at_pos = files->get_item_at_position(p_point); ERR_FAIL_COND(at_pos == -1); to_dir = files->get_item_metadata(at_pos); } else { - TreeItem *ti = tree->get_item_at_pos(p_point); + TreeItem *ti = tree->get_item_at_position(p_point); if (!ti) return; to_dir = ti->get_metadata(0); @@ -1425,129 +1454,86 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, } Vector<String> fnames = drag_data["files"]; - move_files.clear(); - move_dirs.clear(); - + to_move.clear(); for (int i = 0; i < fnames.size(); i++) { - if (fnames[i].ends_with("/")) - move_dirs.push_back(fnames[i]); - else - move_files.push_back(fnames[i]); + to_move.push_back(FileOrFolder(fnames[i], !fnames[i].ends_with("/"))); } - - _move_operation(to_dir); + _move_operation_confirm(to_dir); } } } void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) { - Vector<String> filenames; + //Right clicking ".." should clear current selection + if (files->get_item_text(p_item) == "..") { + for (int i = 0; i < files->get_item_count(); i++) { + files->unselect(i); + } + } - bool all_scenes = true; - bool all_can_reimport = true; - Set<String> types; + Vector<String> filenames; + Vector<String> foldernames; + bool all_files = true; + bool all_files_scenes = true; + bool all_folders = true; for (int i = 0; i < files->get_item_count(); i++) { - - if (!files->is_selected(i)) + if (!files->is_selected(i)) { continue; - - String path = files->get_item_metadata(i); - - if (files->get_item_text(i) == "..") { - // no operate on .. - return; } - if (path.ends_with("/")) { - //no operate on dirs - return; - } - - int pos; - - EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->find_file(path, &pos); - - if (efsd) { - + String fpath = files->get_item_metadata(i); + if (fpath.ends_with("/")) { + foldernames.push_back(fpath); + all_files = false; } else { - all_can_reimport = false; + filenames.push_back(fpath); + all_folders = false; + all_files_scenes &= (EditorFileSystem::get_singleton()->get_file_type(fpath) == "PackedScene"); } - - filenames.push_back(path); - if (EditorFileSystem::get_singleton()->get_file_type(path) != "PackedScene") - all_scenes = false; } - if (filenames.size() == 0) - return; - file_options->clear(); file_options->set_size(Size2(1, 1)); + if (all_files && filenames.size() > 0) { + file_options->add_item(TTR("Open"), FILE_OPEN); + if (all_files_scenes) { + file_options->add_item(TTR("Instance"), FILE_INSTANCE); + } - file_options->add_item(TTR("Open"), FILE_OPEN); - if (all_scenes) { - file_options->add_item(TTR("Instance"), FILE_INSTANCE); + if (filenames.size() == 1) { + file_options->add_separator(); + file_options->add_item(TTR("Edit Dependencies.."), FILE_DEPENDENCIES); + file_options->add_item(TTR("View Owners.."), FILE_OWNERS); + } + } else if (all_folders && foldernames.size() > 0) { + file_options->add_item(TTR("Open"), FILE_OPEN); } file_options->add_separator(); - if (filenames.size() == 1) { - file_options->add_item(TTR("Edit Dependencies.."), FILE_DEPENDENCIES); - file_options->add_item(TTR("View Owners.."), FILE_OWNERS); - file_options->add_separator(); - } - - if (filenames.size() == 1) { - file_options->add_item(TTR("Copy Path"), FILE_COPY_PATH); - file_options->add_item(TTR("Rename or Move.."), FILE_MOVE); - } else { + int num_items = filenames.size() + foldernames.size(); + if (num_items >= 1) { + if (num_items == 1) { + file_options->add_item(TTR("Copy Path"), FILE_COPY_PATH); + file_options->add_item(TTR("Rename.."), FILE_RENAME); + } file_options->add_item(TTR("Move To.."), FILE_MOVE); + file_options->add_item(TTR("Delete"), FILE_REMOVE); + file_options->add_separator(); } - file_options->add_item(TTR("Delete"), FILE_REMOVE); - - //file_options->add_item(TTR("Info"),FILE_INFO); - - file_options->add_separator(); + file_options->add_item(TTR("New Folder.."), FILE_NEW_FOLDER); file_options->add_item(TTR("Show In File Manager"), FILE_SHOW_IN_EXPLORER); - if (all_can_reimport && types.size() == 1) { //all can reimport and are of the same type - - /* - bool valid=true; - Ref<EditorImportPlugin> rimp = EditorImportExport::get_singleton()->get_import_plugin_by_name(types.front()->get()); - if (rimp.is_valid()) { - - if (filenames.size()>1 && !rimp->can_reimport_multiple_files()) { - valid=false; - } - } else { - valid=false; - } - - if (valid) { - file_options->add_separator(); - file_options->add_item(TTR("Re-Import.."),FILE_REIMPORT); - } - */ - } - file_options->set_position(files->get_global_position() + p_pos); file_options->popup(); } void FileSystemDock::select_file(const String &p_file) { - _go_to_dir(p_file.get_base_dir()); - for (int i = 0; i < files->get_item_count(); i++) { - if (files->get_item_metadata(i) == p_file) { - files->select(i); - files->ensure_current_is_visible(); - break; - } - } + navigate_to_path(p_file); } void FileSystemDock::_file_multi_selected(int p_index, bool p_selected) { @@ -1565,14 +1551,14 @@ void FileSystemDock::_file_selected() { if (!files->is_selected(i)) continue; - String p = files->get_item_metadata(i); - if (!FileAccess::exists(p + ".import")) { + String fpath = files->get_item_metadata(i); + if (!FileAccess::exists(fpath + ".import")) { imports.clear(); break; } Ref<ConfigFile> cf; cf.instance(); - Error err = cf->load(p + ".import"); + Error err = cf->load(fpath + ".import"); if (err != OK) { imports.clear(); break; @@ -1586,7 +1572,7 @@ void FileSystemDock::_file_selected() { imports.clear(); break; } - imports.push_back(p); + imports.push_back(fpath); } if (imports.size() == 0) { @@ -1604,13 +1590,13 @@ void FileSystemDock::_bind_methods() { ClassDB::bind_method(D_METHOD("_rescan"), &FileSystemDock::_rescan); ClassDB::bind_method(D_METHOD("_favorites_pressed"), &FileSystemDock::_favorites_pressed); //ClassDB::bind_method(D_METHOD("_instance_pressed"),&ScenesDock::_instance_pressed); - ClassDB::bind_method(D_METHOD("_open_pressed"), &FileSystemDock::_open_pressed); + ClassDB::bind_method(D_METHOD("_go_to_file_list"), &FileSystemDock::_go_to_file_list); ClassDB::bind_method(D_METHOD("_dir_rmb_pressed"), &FileSystemDock::_dir_rmb_pressed); ClassDB::bind_method(D_METHOD("_thumbnail_done"), &FileSystemDock::_thumbnail_done); ClassDB::bind_method(D_METHOD("_select_file"), &FileSystemDock::_select_file); ClassDB::bind_method(D_METHOD("_go_to_tree"), &FileSystemDock::_go_to_tree); - ClassDB::bind_method(D_METHOD("_go_to_dir"), &FileSystemDock::_go_to_dir); + ClassDB::bind_method(D_METHOD("navigate_to_path"), &FileSystemDock::navigate_to_path); ClassDB::bind_method(D_METHOD("_change_file_display"), &FileSystemDock::_change_file_display); ClassDB::bind_method(D_METHOD("_fw_history"), &FileSystemDock::_fw_history); ClassDB::bind_method(D_METHOD("_bw_history"), &FileSystemDock::_bw_history); @@ -1618,8 +1604,9 @@ void FileSystemDock::_bind_methods() { ClassDB::bind_method(D_METHOD("_dir_selected"), &FileSystemDock::_dir_selected); ClassDB::bind_method(D_METHOD("_file_option"), &FileSystemDock::_file_option); ClassDB::bind_method(D_METHOD("_folder_option"), &FileSystemDock::_folder_option); - ClassDB::bind_method(D_METHOD("_move_operation"), &FileSystemDock::_move_operation); - ClassDB::bind_method(D_METHOD("_rename_operation"), &FileSystemDock::_rename_operation); + ClassDB::bind_method(D_METHOD("_make_dir_confirm"), &FileSystemDock::_make_dir_confirm); + ClassDB::bind_method(D_METHOD("_move_operation_confirm"), &FileSystemDock::_move_operation_confirm); + ClassDB::bind_method(D_METHOD("_rename_operation_confirm"), &FileSystemDock::_rename_operation_confirm); ClassDB::bind_method(D_METHOD("_search_changed"), &FileSystemDock::_search_changed); @@ -1639,21 +1626,22 @@ void FileSystemDock::_bind_methods() { FileSystemDock::FileSystemDock(EditorNode *p_editor) { editor = p_editor; + path = "res://"; HBoxContainer *toolbar_hbc = memnew(HBoxContainer); add_child(toolbar_hbc); button_hist_prev = memnew(ToolButton); - toolbar_hbc->add_child(button_hist_prev); button_hist_prev->set_disabled(true); + button_hist_prev->set_focus_mode(FOCUS_NONE); button_hist_prev->set_tooltip(TTR("Previous Directory")); + toolbar_hbc->add_child(button_hist_prev); button_hist_next = memnew(ToolButton); - toolbar_hbc->add_child(button_hist_next); button_hist_next->set_disabled(true); - button_hist_prev->set_focus_mode(FOCUS_NONE); button_hist_next->set_focus_mode(FOCUS_NONE); button_hist_next->set_tooltip(TTR("Next Directory")); + toolbar_hbc->add_child(button_hist_next); current_path = memnew(LineEdit); current_path->set_h_size_flags(SIZE_EXPAND_FILL); @@ -1662,10 +1650,10 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { button_reload = memnew(Button); button_reload->set_flat(true); button_reload->connect("pressed", this, "_rescan"); - toolbar_hbc->add_child(button_reload); button_reload->set_focus_mode(FOCUS_NONE); button_reload->set_tooltip(TTR("Re-Scan Filesystem")); button_reload->hide(); + toolbar_hbc->add_child(button_reload); //toolbar_hbc->add_spacer(); @@ -1673,17 +1661,16 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { button_favorite->set_flat(true); button_favorite->set_toggle_mode(true); button_favorite->connect("pressed", this, "_favorites_pressed"); - toolbar_hbc->add_child(button_favorite); button_favorite->set_tooltip(TTR("Toggle folder status as Favorite")); - button_favorite->set_focus_mode(FOCUS_NONE); + toolbar_hbc->add_child(button_favorite); //Control *spacer = memnew( Control); /* button_open = memnew( Button ); button_open->set_flat(true); - button_open->connect("pressed",this,"_open_pressed"); + button_open->connect("pressed",this,"_go_to_file_list"); toolbar_hbc->add_child(button_open); button_open->hide(); button_open->set_focus_mode(FOCUS_NONE); @@ -1706,62 +1693,63 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { add_child(folder_options); split_box = memnew(VSplitContainer); - add_child(split_box); split_box->set_v_size_flags(SIZE_EXPAND_FILL); + add_child(split_box); tree = memnew(Tree); tree->set_hide_root(true); - split_box->add_child(tree); tree->set_drag_forwarding(this); tree->set_allow_rmb_select(true); + tree->set_custom_minimum_size(Size2(0, 200 * EDSCALE)); + split_box->add_child(tree); - //tree->set_v_size_flags(SIZE_EXPAND_FILL); tree->connect("item_edited", this, "_favorite_toggled"); - tree->connect("item_activated", this, "_open_pressed"); + tree->connect("item_activated", this, "_go_to_file_list"); tree->connect("cell_selected", this, "_dir_selected"); tree->connect("item_rmb_selected", this, "_dir_rmb_pressed"); - files = memnew(ItemList); - files->set_v_size_flags(SIZE_EXPAND_FILL); - files->set_select_mode(ItemList::SELECT_MULTI); - files->set_drag_forwarding(this); - files->connect("item_rmb_selected", this, "_files_list_rmb_select"); - files->connect("item_selected", this, "_file_selected"); - files->connect("multi_selected", this, "_file_multi_selected"); - files->set_allow_rmb_select(true); - file_list_vb = memnew(VBoxContainer); - split_box->add_child(file_list_vb); file_list_vb->set_v_size_flags(SIZE_EXPAND_FILL); + split_box->add_child(file_list_vb); path_hb = memnew(HBoxContainer); file_list_vb->add_child(path_hb); - button_back = memnew(ToolButton); - path_hb->add_child(button_back); - button_back->hide(); + button_tree = memnew(ToolButton); + button_tree->hide(); + path_hb->add_child(button_tree); search_box = memnew(LineEdit); search_box->set_h_size_flags(SIZE_EXPAND_FILL); - path_hb->add_child(search_box); search_box->connect("text_changed", this, "_search_changed"); + path_hb->add_child(search_box); button_display_mode = memnew(ToolButton); - path_hb->add_child(button_display_mode); button_display_mode->set_toggle_mode(true); + path_hb->add_child(button_display_mode); + files = memnew(ItemList); + files->set_v_size_flags(SIZE_EXPAND_FILL); + files->set_select_mode(ItemList::SELECT_MULTI); + files->set_drag_forwarding(this); + files->connect("item_rmb_selected", this, "_files_list_rmb_select"); + files->connect("item_selected", this, "_file_selected"); + files->connect("multi_selected", this, "_file_multi_selected"); + files->set_allow_rmb_select(true); file_list_vb->add_child(files); scanning_vb = memnew(VBoxContainer); + scanning_vb->hide(); + add_child(scanning_vb); + Label *slabel = memnew(Label); slabel->set_text(TTR("Scanning Files,\nPlease Wait..")); slabel->set_align(Label::ALIGN_CENTER); scanning_vb->add_child(slabel); + scanning_progress = memnew(ProgressBar); scanning_vb->add_child(scanning_progress); - add_child(scanning_vb); - scanning_vb->hide(); deps_editor = memnew(DependencyEditor); add_child(deps_editor); @@ -1773,27 +1761,41 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { add_child(remove_dialog); move_dialog = memnew(EditorDirDialog); - add_child(move_dialog); - move_dialog->connect("dir_selected", this, "_move_operation"); move_dialog->get_ok()->set_text(TTR("Move")); + add_child(move_dialog); + move_dialog->connect("dir_selected", this, "_move_operation_confirm"); + + rename_dialog = memnew(ConfirmationDialog); + VBoxContainer *rename_dialog_vb = memnew(VBoxContainer); + rename_dialog->add_child(rename_dialog_vb); - rename_dialog = memnew(EditorFileDialog); - rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE); - rename_dialog->connect("file_selected", this, "_rename_operation"); + rename_dialog_text = memnew(LineEdit); + rename_dialog_vb->add_margin_child(TTR("Name:"), rename_dialog_text); + rename_dialog->get_ok()->set_text(TTR("Rename")); add_child(rename_dialog); + rename_dialog->register_text_enter(rename_dialog_text); + rename_dialog->connect("confirmed", this, "_rename_operation_confirm"); + + make_dir_dialog = memnew(ConfirmationDialog); + make_dir_dialog->set_title(TTR("Create Folder")); + VBoxContainer *make_folder_dialog_vb = memnew(VBoxContainer); + make_dir_dialog->add_child(make_folder_dialog_vb); + + make_dir_dialog_text = memnew(LineEdit); + make_folder_dialog_vb->add_margin_child(TTR("Name:"), make_dir_dialog_text); + add_child(make_dir_dialog); + make_dir_dialog->register_text_enter(make_dir_dialog_text); + make_dir_dialog->connect("confirmed", this, "_make_dir_confirm"); updating_tree = false; initialized = false; - history.push_back("res://"); history_pos = 0; + history_max_size = 20; + history.push_back("res://"); - split_mode = false; + low_height_mode = false; display_mode = DISPLAY_THUMBNAILS; - - path = "res://"; - - add_constant_override("separation", 3); } FileSystemDock::~FileSystemDock() { |