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

Merge pull request #33091 from MCrafterzz/fix10567

Browse source 
Improved project creation UX
This commit is contained in:
Rémi Verschelde 2019-10-29 13:27:41 +01:00 • committed by GitHub
commit 948a2a03d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editor/editor_file_dialog.cpp
View file

@ -253,6 +253,12 @@ void EditorFileDialog::_post_popup() {
else else
item_list->grab_focus(); item_list->grab_focus();
if (mode == MODE_OPEN_DIR) {
file_box->set_visible(false);
} else {
file_box->set_visible(true);
}
if (is_visible_in_tree() && get_current_file() != "") if (is_visible_in_tree() && get_current_file() != "")
_request_single_thumbnail(get_current_dir().plus_file(get_current_file())); _request_single_thumbnail(get_current_dir().plus_file(get_current_file()));
@ -1661,19 +1667,19 @@ EditorFileDialog::EditorFileDialog() {
prev_cc->add_child(preview); prev_cc->add_child(preview);
preview_vb->hide(); preview_vb->hide();
HBoxContainer *filename_hbc = memnew(HBoxContainer); file_box = memnew(HBoxContainer);
filename_hbc->add_child(memnew(Label(TTR("File:")))); file_box->add_child(memnew(Label(TTR("File:"))));
file = memnew(LineEdit); file = memnew(LineEdit);
file->set_stretch_ratio(4); file->set_stretch_ratio(4);
file->set_h_size_flags(SIZE_EXPAND_FILL); file->set_h_size_flags(SIZE_EXPAND_FILL);
filename_hbc->add_child(file); file_box->add_child(file);
filter = memnew(OptionButton); filter = memnew(OptionButton);
filter->set_stretch_ratio(3); filter->set_stretch_ratio(3);
filter->set_h_size_flags(SIZE_EXPAND_FILL); filter->set_h_size_flags(SIZE_EXPAND_FILL);
filter->set_clip_text(true); // Too many extensions overflow it. filter->set_clip_text(true); // Too many extensions overflow it.
filename_hbc->add_child(filter); file_box->add_child(filter);
filename_hbc->set_h_size_flags(SIZE_EXPAND_FILL); file_box->set_h_size_flags(SIZE_EXPAND_FILL);
item_vb->add_child(filename_hbc); item_vb->add_child(file_box);
dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES); dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
access = ACCESS_RESOURCES; access = ACCESS_RESOURCES;

3
editor/editor_file_dialog.h
View file

@ -106,10 +106,11 @@ private:
TextureRect *preview; TextureRect *preview;
VBoxContainer *preview_vb; VBoxContainer *preview_vb;
HSplitContainer *list_hb; HSplitContainer *list_hb;
HBoxContainer *file_box;
LineEdit *file; LineEdit *file;
OptionButton *filter;
AcceptDialog *mkdirerr; AcceptDialog *mkdirerr;
AcceptDialog *exterr; AcceptDialog *exterr;
OptionButton *filter;
DirAccess *dir_access; DirAccess *dir_access;
ConfirmationDialog *confirm_save; ConfirmationDialog *confirm_save;
DependencyRemoveDialog *remove_dialog; DependencyRemoveDialog *remove_dialog;

24
scene/gui/file_dialog.cpp
View file

@ -178,8 +178,12 @@ void FileDialog::_post_popup() {
set_process_unhandled_input(true); set_process_unhandled_input(true);
// For open dir mode, deselect all items on file dialog open. // For open dir mode, deselect all items on file dialog open.
if (mode == MODE_OPEN_DIR) if (mode == MODE_OPEN_DIR) {
deselect_items(); deselect_items();
file_box->set_visible(false);
} else {
file_box->set_visible(true);
}
} }
void FileDialog::_action_pressed() { void FileDialog::_action_pressed() {
@ -898,6 +902,10 @@ FileDialog::FileDialog() {
hbc->add_child(dir_up); hbc->add_child(dir_up);
dir_up->connect("pressed", this, "_go_up"); dir_up->connect("pressed", this, "_go_up");
drives = memnew(OptionButton);
hbc->add_child(drives);
drives->connect("item_selected", this, "_select_drive");
hbc->add_child(memnew(Label(RTR("Path:")))); hbc->add_child(memnew(Label(RTR("Path:"))));
dir = memnew(LineEdit); dir = memnew(LineEdit);
hbc->add_child(dir); hbc->add_child(dir);
@ -915,10 +923,6 @@ FileDialog::FileDialog() {
show_hidden->connect("toggled", this, "set_show_hidden_files"); show_hidden->connect("toggled", this, "set_show_hidden_files");
hbc->add_child(show_hidden); hbc->add_child(show_hidden);
drives = memnew(OptionButton);
hbc->add_child(drives);
drives->connect("item_selected", this, "_select_drive");
makedir = memnew(Button); makedir = memnew(Button);
makedir->set_text(RTR("Create Folder")); makedir->set_text(RTR("Create Folder"));
makedir->connect("pressed", this, "_make_dir"); makedir->connect("pressed", this, "_make_dir");
@ -929,18 +933,18 @@ FileDialog::FileDialog() {
tree->set_hide_root(true); tree->set_hide_root(true);
vbc->add_margin_child(RTR("Directories & Files:"), tree, true); vbc->add_margin_child(RTR("Directories & Files:"), tree, true);
hbc = memnew(HBoxContainer); file_box = memnew(HBoxContainer);
hbc->add_child(memnew(Label(RTR("File:")))); file_box->add_child(memnew(Label(RTR("File:"))));
file = memnew(LineEdit); file = memnew(LineEdit);
file->set_stretch_ratio(4); file->set_stretch_ratio(4);
file->set_h_size_flags(SIZE_EXPAND_FILL); file->set_h_size_flags(SIZE_EXPAND_FILL);
hbc->add_child(file); file_box->add_child(file);
filter = memnew(OptionButton); filter = memnew(OptionButton);
filter->set_stretch_ratio(3); filter->set_stretch_ratio(3);
filter->set_h_size_flags(SIZE_EXPAND_FILL); filter->set_h_size_flags(SIZE_EXPAND_FILL);
filter->set_clip_text(true); // too many extensions overflows it filter->set_clip_text(true); // too many extensions overflows it
hbc->add_child(filter); file_box->add_child(filter);
vbc->add_child(hbc); vbc->add_child(file_box);
dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES); dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
access = ACCESS_RESOURCES; access = ACCESS_RESOURCES;

3
scene/gui/file_dialog.h
View file

@ -78,10 +78,11 @@ private:
LineEdit *dir; LineEdit *dir;
OptionButton *drives; OptionButton *drives;
Tree *tree; Tree *tree;
HBoxContainer *file_box;
LineEdit *file; LineEdit *file;
OptionButton *filter;
AcceptDialog *mkdirerr; AcceptDialog *mkdirerr;
AcceptDialog *exterr; AcceptDialog *exterr;
OptionButton *filter;
DirAccess *dir_access; DirAccess *dir_access;
ConfirmationDialog *confirm_save; ConfirmationDialog *confirm_save;