diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-27 08:11:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 08:11:05 +0200 |
| commit | d730ee66a4664c2142030fe3bfae4847b8990fa8 (patch) | |
| tree | e3ae75aea931c758399138e776c6b296df6404b4 | |
| parent | 2feb24953c996c7548f101b8ee35939516dacb69 (diff) | |
| parent | 0af6c39f36f4f1d302133cb826cfd1e934c1eee9 (diff) | |
Merge pull request #8515 from attilix/folder-file-manager
Right-clicking a folder now gives the option Show in file manager
| -rw-r--r-- | editor/filesystem_dock.cpp | 8 | ||||
| -rw-r--r-- | editor/filesystem_dock.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 218ccd4b30..b5f77d1d33 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -1065,6 +1065,11 @@ void FileSystemDock::_folder_option(int p_option) { child = child->get_next(); } break; + case FOLDER_SHOW_IN_EXPLORER: + String path = item->get_metadata(tree->get_selected_column()); + String dir = GlobalConfig::get_singleton()->globalize_path(path); + OS::get_singleton()->shell_open(String("file://") + dir); + return; } } @@ -1103,6 +1108,9 @@ 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); + folder_options->set_position(tree->get_global_position() + p_pos); folder_options->popup(); } diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 2b85cfa96d..77898aa6c2 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -76,7 +76,8 @@ private: enum FolderMenu { FOLDER_EXPAND_ALL, - FOLDER_COLLAPSE_ALL + FOLDER_COLLAPSE_ALL, + FOLDER_SHOW_IN_EXPLORER }; VBoxContainer *scanning_vb; |