asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Improvements and fixes of filesystem dock

Browse source
This commit is contained in:
iwek7 2019-08-10 01:15:25 +02:00
parent cce148b024
commit 2b8d65761c
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
editor/filesystem_dock.cpp
View file

@ -1484,8 +1484,15 @@ Vector<String> FileSystemDock::_tree_get_selected(bool remove_self_inclusion) {
selected = tree->get_next_selected(selected); selected = tree->get_next_selected(selected);
} }
if (remove_self_inclusion) {
selected_strings = _remove_self_included_paths(selected_strings);
}
return selected_strings;
}
Vector<String> FileSystemDock::_remove_self_included_paths(Vector<String> selected_strings) {
// Remove paths or files that are included into another // Remove paths or files that are included into another
if (remove_self_inclusion && selected_strings.size() > 1) { if (selected_strings.size() > 1) {
selected_strings.sort_custom<NaturalNoCaseComparator>(); selected_strings.sort_custom<NaturalNoCaseComparator>();
String last_path = ""; String last_path = "";
for (int i = 0; i < selected_strings.size(); i++) { for (int i = 0; i < selected_strings.size(); i++) {
@ -1503,7 +1510,7 @@ Vector<String> FileSystemDock::_tree_get_selected(bool remove_self_inclusion) {
void FileSystemDock::_tree_rmb_option(int p_option) { void FileSystemDock::_tree_rmb_option(int p_option) {
Vector<String> selected_strings = _tree_get_selected(); Vector<String> selected_strings = _tree_get_selected(false);
// Execute the current option // Execute the current option
switch (p_option) { switch (p_option) {
@ -1642,8 +1649,9 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
case FILE_MOVE: { case FILE_MOVE: {
// Move the files to a given location // Move the files to a given location
to_move.clear(); to_move.clear();
for (int i = 0; i < p_selected.size(); i++) { Vector<String> collapsed_paths = _remove_self_included_paths(p_selected);
String fpath = p_selected[i]; for (int i = collapsed_paths.size() - 1; i >= 0; i--) {
String fpath = collapsed_paths[i];
if (fpath != "res://") { if (fpath != "res://") {
to_move.push_back(FileOrFolder(fpath, !fpath.ends_with("/"))); to_move.push_back(FileOrFolder(fpath, !fpath.ends_with("/")));
} }
@ -1680,9 +1688,10 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
// Remove the selected files // Remove the selected files
Vector<String> remove_files; Vector<String> remove_files;
Vector<String> remove_folders; Vector<String> remove_folders;
Vector<String> collapsed_paths = _remove_self_included_paths(p_selected);
for (int i = 0; i < p_selected.size(); i++) { for (int i = 0; i < collapsed_paths.size(); i++) {
String fpath = p_selected[i]; String fpath = collapsed_paths[i];
if (fpath != "res://") { if (fpath != "res://") {
if (fpath.ends_with("/")) { if (fpath.ends_with("/")) {
remove_folders.push_back(fpath); remove_folders.push_back(fpath);
@ -2195,12 +2204,16 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, Vector<Str
if (p_paths.size() == 1) { if (p_paths.size() == 1) {
p_popup->add_item(TTR("Copy Path"), FILE_COPY_PATH); p_popup->add_item(TTR("Copy Path"), FILE_COPY_PATH);
p_popup->add_item(TTR("Rename..."), FILE_RENAME); if (p_paths[0] != "res://") {
p_popup->add_item(TTR("Duplicate..."), FILE_DUPLICATE); p_popup->add_item(TTR("Rename..."), FILE_RENAME);
p_popup->add_item(TTR("Duplicate..."), FILE_DUPLICATE);
}
} }
p_popup->add_item(TTR("Move To..."), FILE_MOVE); if (p_paths.size() > 1 || p_paths[0] != "res://") {
p_popup->add_item(TTR("Delete"), FILE_REMOVE); p_popup->add_item(TTR("Move To..."), FILE_MOVE);
p_popup->add_item(TTR("Delete"), FILE_REMOVE);
}
if (p_paths.size() == 1) { if (p_paths.size() == 1) {
p_popup->add_separator(); p_popup->add_separator();
@ -2219,7 +2232,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, Vector<Str
void FileSystemDock::_tree_rmb_select(const Vector2 &p_pos) { void FileSystemDock::_tree_rmb_select(const Vector2 &p_pos) {
// Right click is pressed in the tree // Right click is pressed in the tree
Vector<String> paths = _tree_get_selected(); Vector<String> paths = _tree_get_selected(false);
if (paths.size() == 1) { if (paths.size() == 1) {
if (paths[0].ends_with("/")) { if (paths[0].ends_with("/")) {

1
editor/filesystem_dock.h
View file

@ -279,6 +279,7 @@ private:
bool _is_file_type_disabled_by_feature_profile(const StringName &p_class); bool _is_file_type_disabled_by_feature_profile(const StringName &p_class);
void _feature_profile_changed(); void _feature_profile_changed();
Vector<String> _remove_self_included_paths(Vector<String> selected_strings);
protected: protected:
void _notification(int p_what); void _notification(int p_what);