godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make EditorFileDialog be able to pick a folder when entering it

This commit is contained in:
Michael Alexsander Silva Dias 2018-09-11 03:32:14 -03:00
parent ef7b384861
commit 622bae393b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/editor_file_dialog.cpp
View File

@ -198,8 +198,18 @@ void EditorFileDialog::update_dir() {
dir->set_text(dir_access->get_current_dir()); dir->set_text(dir_access->get_current_dir());
// Disable "Open" button only when we in selecting file(s) mode or open dir mode. // Disable "Open" button only when selecting file(s) mode.
get_ok()->set_disabled(_is_open_should_be_disabled()); get_ok()->set_disabled(_is_open_should_be_disabled());
switch (mode) {
case MODE_OPEN_FILE:
case MODE_OPEN_FILES:
get_ok()->set_text(TTR("Open"));
break;
case MODE_OPEN_DIR:
get_ok()->set_text(TTR("Select Current Folder"));
break;
}
} }
void EditorFileDialog::_dir_entered(String p_dir) { void EditorFileDialog::_dir_entered(String p_dir) {
@ -453,6 +463,8 @@ void EditorFileDialog::_item_selected(int p_item) {
file->set_text(d["name"]); file->set_text(d["name"]);
_request_single_thumbnail(get_current_dir().plus_file(get_current_file())); _request_single_thumbnail(get_current_dir().plus_file(get_current_file()));
} else if (mode == MODE_OPEN_DIR) {
get_ok()->set_text(TTR("Select This Folder"));
} }
get_ok()->set_disabled(_is_open_should_be_disabled()); get_ok()->set_disabled(_is_open_should_be_disabled());
@ -637,7 +649,7 @@ bool EditorFileDialog::_is_open_should_be_disabled() {
Vector<int> items = item_list->get_selected_items(); Vector<int> items = item_list->get_selected_items();
if (items.size() == 0) if (items.size() == 0)
return true; return mode != MODE_OPEN_DIR; // In "Open folder" mode, having nothing selected picks the current folder.
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {

2
scene/gui/file_dialog.cpp
View File

@ -349,7 +349,7 @@ void FileDialog::_tree_selected() {
file->set_text(d["name"]); file->set_text(d["name"]);
} else if (mode == MODE_OPEN_DIR) { } else if (mode == MODE_OPEN_DIR) {
get_ok()->set_text(RTR("Select this Folder")); get_ok()->set_text(RTR("Select This Folder"));
} }
get_ok()->set_disabled(_is_open_should_be_disabled()); get_ok()->set_disabled(_is_open_should_be_disabled());